1.4.6.1

[fix] 'old search': tab key navigation through suggestions [fix] 'old search': temp. workaround for SearchWP add-on [fix] 'Fx46+' & add-ons managers version number: displayed number in update category
Aris-t2 · Jan 11, 2016 · cf1a669 · cf1a669
1 parent 712d538
commit cf1a669
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 5 deletions.
diff --git a/xpi/content/addonversion_fx46.xml b/xpi/content/addonversion_fx46.xml
@@ -670,6 +670,14 @@
         ]]></body>
       </method>
 
+      <method name="_updateUpgradeInfo">
+        <body><![CDATA[
+          // Only update the version string if we're displaying the upgrade info
+          if (this.hasAttribute("upgrade") && shouldShowVersionNumber(this.mAddon))
+            this._version.value = this.mManualUpdate.version;
+        ]]></body>
+      </method>
+
       <method name="_fetchReleaseNotes">
         <parameter name="aURI"/>
         <body><![CDATA[
@@ -957,6 +965,9 @@
 
           this.mManualUpdate = aInstall;
           this._showStatus("update-available");
+		  try {
+		    this._updateUpgradeInfo();
+		  } catch(e) {}
         ]]></body>
       </method>
 

diff --git a/xpi/content/css/alt_optionswindow2.css b/xpi/content/css/alt_optionswindow2.css
@@ -103,8 +103,8 @@
 	  -moz-padding-start: 0px !important;
 	  margin-top: -35px !important;
 	  -moz-margin-start: -40px !important;
-	  -moz-margin-end: -30px !important;
-	  padding-top: 10px !important;
+	  -moz-margin-end: -36px !important;
+	  padding-top: 0px !important;
 	}
 
 	#mainPrefPane textbox {

diff --git a/xpi/content/css/linux/smallnavbutextra.css b/xpi/content/css/linux/smallnavbutextra.css
@@ -133,6 +133,14 @@
 	#main-window[defaultfxtheme="true"] #nav-bar .searchbar-textbox[focused] {
 	  border-color: Highlight !important;
 	}
+
+	/* tweaks for text/full modes */
+	#nav-bar[mode="text"] toolbarbutton .toolbarbutton-text,
+	#nav-bar[mode="full"] toolbarbutton .toolbarbutton-text {
+	  background: none !important;
+	  box-shadow: none !important;
+	  border: unset !important;
+	}
 
 	/*buttons with SVG images*/
 	#nav-bar .toolbarbutton-1[image$="svg"] .toolbarbutton-icon {

diff --git a/xpi/content/css/mac/smallnavbutextra.css b/xpi/content/css/mac/smallnavbutextra.css
@@ -191,6 +191,14 @@
 	  margin-bottom: 0px !important;
 	}
 
+	/* tweaks for text/full modes */
+	#nav-bar[mode="text"] toolbarbutton .toolbarbutton-text,
+	#nav-bar[mode="full"] toolbarbutton .toolbarbutton-text {
+	  background: none !important;
+	  box-shadow: none !important;
+	  border: unset !important;
+	}
+
 	/*buttons with SVG images*/
 	#nav-bar .toolbarbutton-1[image$="svg"] .toolbarbutton-icon {
 	  max-width: 22px !important;

diff --git a/xpi/content/css/oldsearch.css b/xpi/content/css/oldsearch.css
@@ -7,9 +7,14 @@
 	  -moz-binding: url("chrome://classic_theme_restorer/content/ctr_oldsearch.xml#searchbar") !important;
 	}
 
-	searchbar .searchbar-textbox {
+	#main-window:not([searchwp-moz-platform]) searchbar .searchbar-textbox {
 	  -moz-binding: url("chrome://classic_theme_restorer/content/ctr_oldsearch.xml#searchbar-textbox") !important;
 	}
+
+	/* SearchWP add-on support */
+	/*#main-window[searchwp-moz-platform] searchbar .searchbar-textbox {
+	  -moz-binding: url("chrome://searchwp/content/searchbox.xml#searchbox") !important;
+	}*/
 
 	.searchbar-engine-button {
 	  -moz-appearance: none !important;

diff --git a/xpi/content/css/win8/smallnavbutextra.css b/xpi/content/css/win8/smallnavbutextra.css
@@ -392,6 +392,14 @@
 	  margin-bottom: 2px !important;
 	}
 
+	/* tweaks for text/full modes */
+	#nav-bar[mode="text"] toolbarbutton .toolbarbutton-text,
+	#nav-bar[mode="full"] toolbarbutton .toolbarbutton-text {
+	  background: none !important;
+	  box-shadow: none !important;
+	  border: unset !important;
+	}
+
 	/* default badge buttons: loop/panelUI */
 	#nav-bar #PanelUI-menu-button .toolbarbutton-badge,
 	#nav-bar #PanelUI-menu-button .toolbarbutton-badge-container,

diff --git a/xpi/content/css/winaero/smallnavbutextra.css b/xpi/content/css/winaero/smallnavbutextra.css
@@ -257,7 +257,7 @@
 		}
 
 	}
-	
+
 	@media (min-resolution: 1.1dppx) {
 		#main-window[fx40plus="true"] #nav-bar toolbarbutton[cui-areatype="toolbar"] > :-moz-any(#zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button) > .toolbarbutton-icon,
 		#main-window[fx40plus="true"] #nav-bar :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button):-moz-any([cui-areatype="toolbar"],:not([cui-areatype])) > .toolbarbutton-icon,
@@ -345,6 +345,14 @@
 	  margin-bottom: 2px !important;
 	}
 
+	/* tweaks for text/full modes */
+	#nav-bar[mode="text"] toolbarbutton .toolbarbutton-text,
+	#nav-bar[mode="full"] toolbarbutton .toolbarbutton-text {
+	  background: none !important;
+	  box-shadow: none !important;
+	  border: unset !important;
+	}
+
 	/* default badge buttons: loop/panelUI */
 	#nav-bar #PanelUI-menu-button .toolbarbutton-badge,
 	#nav-bar #PanelUI-menu-button .toolbarbutton-badge-container,
@@ -455,6 +463,7 @@
 	#nav-bar #zoompage-zoomout-n image{
 	  padding:0px !important;
 	}
+
 	/* special buttons inside urlbars boxes */
 	#urlbar #notification-popup-box + box toolbarbutton,
 	#urlbar #notification-popup-box + box toolbarbutton .toolbarbutton-icon,

diff --git a/xpi/content/css/winxp/smallnavbutextra.css b/xpi/content/css/winxp/smallnavbutextra.css
@@ -284,6 +284,14 @@
 	  margin-bottom: 2px !important;
 	}
 
+	/* tweaks for text/full modes */
+	#nav-bar[mode="text"] toolbarbutton .toolbarbutton-text,
+	#nav-bar[mode="full"] toolbarbutton .toolbarbutton-text {
+	  background: none !important;
+	  box-shadow: none !important;
+	  border: unset !important;
+	}
+
 	/* default badge buttons: loop/panelUI */
 	#nav-bar #PanelUI-menu-button .toolbarbutton-badge,
 	#nav-bar #PanelUI-menu-button .toolbarbutton-badge-container,

diff --git a/xpi/content/ctr_oldsearch.xml b/xpi/content/ctr_oldsearch.xml
@@ -791,6 +791,10 @@
           if (!popup.popupOpen)
             return;
 
+          let list = document.getAnonymousElementByAttribute(popup, "anonid",
+                                                             "search-panel-one-offs");
+          if (!list) // remove this check when removing the old search UI.
+            return;
           // accel + up/down changes the default engine and shouldn't affect
           // the selection on the one-off buttons.
           if (aEvent.ctrlKey)

diff --git a/xpi/install.rdf b/xpi/install.rdf
@@ -5,7 +5,7 @@
 	<Description rdf:about="urn:mozilla:install-manifest">
 		<em:id>ClassicThemeRestorer@ArisT2Noia4dev</em:id>
 		<em:name>Classic Theme Restorer</em:name>
-		<em:version>1.4.6</em:version>
+		<em:version>1.4.6.1</em:version>
 		<em:type>2</em:type>
 		<em:multiprocessCompatible>true</em:multiprocessCompatible>