Changeset 368

Timestamp:

04/14/08 20:53:54 (3 months ago)

Author:

t-bone

Message:

Refs #128

• Fix list of menu IDs, for FF 2.0/3.0, and detection of which version is running.
  

Files:

• extension/tinymenu/chrome.manifest (modified) (1 diff)
• extension/tinymenu/content/tinymenu-options-ff.xul (deleted)
• extension/tinymenu/content/tinymenu-options-ff2.xul (added)
• extension/tinymenu/content/tinymenu-options-ff3.xul (added)
• extension/tinymenu/content/tinymenu-options.js (modified) (2 diffs)
• extension/tinymenu/content/tinymenu-options.xul (modified) (1 diff)
• extension/tinymenu/content/tinymenu.js (modified) (1 diff)

extension/tinymenu/chrome.manifest

@@ -6 +6 @@
-overlay chrome://messenger/content/mailWindowOverlay.xul chrome://tinymenu/content/tinymenu-tbfix.xul   application={3550f703-e582-4d05-9a08-453d09bdfdc6}
-
-
-
+
+
+
-
-locale tinymenu cs-CZ locale/cs-CZ/

extension/tinymenu/content/tinymenu-options.js

@@ +1 @@
+function loadOptions() {
+    tinymenu.initPref();
+
+    // set checkboxes
+    var r, id;
+    for (var i in tinymenu.menuIds) {
+        id=tinymenu.menuIds[i];
+        r=new RegExp('\\b'+id+'\\b');
+        document.getElementById('pref-'+id).checked=
+            (null!=r.exec(tinymenu.doNotCollapse));
+    }
+
+    // set radio
+    if ('image'==tinymenu.viewMode) {
+        document.getElementById('view_text').setAttribute('selected', false);
+        document.getElementById('view_image').setAttribute('selected', true);
+    }
+}
+
+function saveOptions() {
+    // build doNotCollapse string
+    var doNotCollapse='tinymenu';
+    var r, id;
+    for (var i in tinymenu.menuIds) {
+        id=tinymenu.menuIds[i];
+
+        if (document.getElementById('pref-'+id).checked) {
+            doNotCollapse+=' '+id;
+        }
+    }
+    tinymenu.doNotCollapse=doNotCollapse;
+
+    tinymenu.viewMode=
+        document.getElementById('view_image').getAttribute('selected')?
+        'image':'text';
+
+    // save all the bits
+    var prefs=Components.classes["@mozilla.org/preferences-service;1"]
+        .getService(Components.interfaces.nsIPrefService)
+        .getBranch("tinymenu.");
+
+    prefs.setCharPref('doNotCollapse', tinymenu.doNotCollapse);
+    prefs.setCharPref('viewMode', tinymenu.viewMode);
+
+    // will fail in default case, so silently catch
+    try {
+        if (tinymenu.iconFile &&
+            tinymenu.iconFile.QueryInterface(Components.interfaces.nsILocalFile)
+        ) {
+            prefs.setComplexValue('iconFile', Components.interfaces.nsILocalFile, tinymenu.iconFile);
+        }
+    } catch (e) {  }
+}
+
-function browseImage() {
-    // based on sample from
@@ -32 +86 @@
-}
-
-tinymenu.
+

extension/tinymenu/content/tinymenu-options.xul

@@ -14 +14 @@
-    buttons="accept, cancel"
-    persist="width height screenX screenY"
-tinymenu.
+
->
-

extension/tinymenu/content/tinymenu.js

@@ -61 +61 @@
-},
-
-loadOptions:function() {
-    tinymenu.initPref();
-
-    // set checkboxes
-    var r, id;
-    for (var i in tinymenu.menuIds) {
-        id=tinymenu.menuIds[i];
-        r=new RegExp('\\b'+id+'\\b');
-        document.getElementById('pref-'+id).checked=
-            (null!=r.exec(tinymenu.doNotCollapse));
-    }
-
-    // set radio
-    if ('image'==tinymenu.viewMode) {
-        document.getElementById('view_text').setAttribute('selected', false);
-        document.getElementById('view_image').setAttribute('selected', true);
-    }
-},
-
-saveOptions:function() {
-    // build doNotCollapse string
-    var doNotCollapse='tinymenu';
-    var r, id;
-    for (var i in tinymenu.menuIds) {
-        id=tinymenu.menuIds[i];
-
-        if (document.getElementById('pref-'+id).checked) {
-            doNotCollapse+=' '+id;
-        }
-    }
-    tinymenu.doNotCollapse=doNotCollapse;
-
-    tinymenu.viewMode=
-        document.getElementById('view_image').getAttribute('selected')?
-        'image':'text';
-
-    // save all the bits
-    var prefs=Components.classes["@mozilla.org/preferences-service;1"]
-        .getService(Components.interfaces.nsIPrefService)
-        .getBranch("tinymenu.");
-
-    prefs.setCharPref('doNotCollapse', tinymenu.doNotCollapse);
-    prefs.setCharPref('viewMode', tinymenu.viewMode);
-
-    // will fail in default case, so silently catch
-    try {
-        if (tinymenu.iconFile &&
-            tinymenu.iconFile.QueryInterface(Components.interfaces.nsILocalFile)
-        ) {
-            prefs.setComplexValue('iconFile', Components.interfaces.nsILocalFile, tinymenu.iconFile);
-        }
-    } catch (e) {  }
-},
-
-mimeForFile:function(file) {
-    var mime=Components.classes["@mozilla.org/mime;1"]