Mercurial Mercurial > hg > mozilla / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
34.0b4
authorWolfgang Rosenauer <wr@rosenauer.org>
Tue, 28 Oct 2014 21:56:35 +0100
changeset 784 50b18808abdc
parent 783 449ace3f3f72
child 790 6f0035130900
34.0b4 rebase firefox-kde.patch (not building yet)
MozillaFirefox/MozillaFirefox.spec file | annotate | diff | comparison | revisions
MozillaFirefox/create-tar.sh file | annotate | diff | comparison | revisions
firefox-kde.patch file | annotate | diff | comparison | revisions 
--- a/MozillaFirefox/MozillaFirefox.spec	Tue Oct 28 21:52:00 2014 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Tue Oct 28 21:56:35 2014 +0100
@@ -23,7 +23,7 @@
 %define update_channel beta
 %define mainver %major.0
 %define update_channel release
-%define releasedate 2014101000
+%define releasedate 2014102700
 
 # general build definitions
 %define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
--- a/MozillaFirefox/create-tar.sh	Tue Oct 28 21:52:00 2014 +0100
+++ b/MozillaFirefox/create-tar.sh	Tue Oct 28 21:56:35 2014 +0100
@@ -2,7 +2,7 @@
 
 CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_34_0b1_RELEASE"
+RELEASE_TAG="FIREFOX_34_0b4_RELEASE"
 VERSION="33.99"
 
 # mozilla
--- a/firefox-kde.patch	Tue Oct 28 21:52:00 2014 +0100
+++ b/firefox-kde.patch	Tue Oct 28 21:56:35 2014 +0100
@@ -2,7 +2,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1238 @@
+@@ -0,0 +1,1224 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -674,7 +674,7 @@
 +             aria-label="&navbarCmd.label;"
 +             fullscreentoolbar="true" mode="icons" customizable="true"
 +             iconsize="small"
-+             defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,loop-call-button,social-share-button,social-toolbar-item"
++             defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,social-share-button,social-toolbar-item"
 +             customizationtarget="nav-bar-customization-target"
 +             overflowable="true"
 +             overflowbutton="nav-bar-overflow-button"
@@ -717,7 +717,7 @@
 +                     ontextreverted="return this.handleRevert();"
 +                     pageproxystate="invalid"
 +                     onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
-+                     onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
++                     onblur="setTimeout(() => { document.getElementById('identity-box').style.MozUserFocus = ''; }, 0);">
 +              <box id="notification-popup-box" hidden="true" align="center">
 +                <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
@@ -729,7 +729,8 @@
 +                <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
++                <image id="bad-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
++                <image id="bad-content-unblocked-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button"/>
@@ -922,22 +923,6 @@
 +                       cui-areatype="toolbar"
 +                       aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
 +
-+        <!-- XXX Bug 1013989 will provide a label for the button -->
-+        <!-- This uses badged to be compatible with the social api code it shares.
-+             We may also want it to be badged in the future, for notification
-+             purposes. -->
-+        <toolbarbutton id="loop-call-button"
-+                       class="toolbarbutton-1 chromeclass-toolbar-additional"
-+                       persist="class"
-+                       type="badged"
-+                       removable="true"
-+                       tooltiptext="&loopCallButton.tooltip;"
-+                       oncommand="LoopUI.openCallPanel(event);"
-+                       cui-areatype="toolbar"
-+                       >
-+        </toolbarbutton>
-+
-+
 +        <toolbarbutton id="social-share-button"
 +                       class="toolbarbutton-1 chromeclass-toolbar-additional"
 +                       label="&sharePageCmd.label;"
@@ -1107,6 +1092,7 @@
 +
 +      <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
 +      <vbox id="appcontent" flex="1">
++        <notificationbox id="high-priority-global-notificationbox"/>
 +        <tabbrowser id="content"
 +                    flex="1" contenttooltip="aHTMLTooltip"
 +                    tabcontainer="tabbrowser-tabs"
mozilla