Changeset 208

Timestamp:

12/26/06 11:30:01 (2 years ago)

Author:

t-bone

Message:

Refs #8

• Detect whether running in Firefox 1.x or 2.x and display the appropriate label. ("Go" became "History".)

Location:

extension/tinymenu

Files:

• content/tinymenu-options-ff.xul (deleted)
• content/tinymenu-options-ff1.xul (added)
• content/tinymenu-options-ff2.xul (added)
• content/tinymenu-options.js (modified) (1 diff)
• install.rdf (modified) (1 diff)

extension/tinymenu/content/tinymenu-options.js

@@ -5 +5 @@
     var appInfo=Components.classes["@mozilla.org/xre/app-info;1"]
         .getService(Components.interfaces.nsIXULAppInfo);
-    
+    dump('Detected app id: '+appInfo.ID+'\n');
+    dump('n: '+navigator+'\n');
+    for (i in navigator) { dump(i+': '+navigator[i]+'\n'); }
+
     if (FIREFOX_ID==appInfo.ID) {
         // firefox
-        document.loadOverlay('chrome://tinymenu/content/tinymenu-options-ff.xul', overlayObserver); 
 
+        // the label changed, so show the proper one
+        var versionChecker=Components
+            .classes["@mozilla.org/xpcom/version-comparator;1"]
+            .getService(Components.interfaces.nsIVersionComparator);
+        if (versionChecker.compare(appInfo.version, "2.0") >= 0) {
+            document.loadOverlay('chrome://tinymenu/content/tinymenu-options-ff2.xul', overlayObserver);
+        } else {
+            document.loadOverlay('chrome://tinymenu/content/tinymenu-options-ff1.xul', overlayObserver);
+        }
+        
+        // the label changed, but not the ID, so always these IDs for firefox
         tinymenu.menuIds=[
             'file-menu', 'edit-menu', 'view-menu', 'go-menu',

extension/tinymenu/install.rdf

@@ -4 +4 @@
         <em:id>{d33c2f7c-b1e6-4d46-ab0e-be1f6d05c904}</em:id>
         <em:name>Tiny Menu</em:name>
-        <em:version>1.4</em:version>
+        <em:version>1.4.1</em:version>
         <em:description>Replace the standard menu bar with a tiny menu popup.</em:description>
         <em:creator>Anthony Lieuallen</em:creator>