Add extensions.tabutils.menu.context_reloadEvery.list option

ithinc · ithinc · commit 4e6953a8516a · 2014-03-16T13:28:01.000+08:00
diff --git a/chrome/content/tabutils.js b/chrome/content/tabutils.js
@@ -1471,13 +1471,21 @@ tabutils._reloadEvery = function() {
   });
 
   gBrowser.updateAutoReloadPopup = function updateAutoReloadPopup(aPopup) {
+    var sepCustom = aPopup.getElementsByAttribute("anonid", "sep_custom")[0];
+    while (sepCustom.previousSibling.localName == "menuitem")
+      aPopup.removeChild(sepCustom.previousSibling);
+
+    aPopup.parentNode.getAttribute("list").split(",").forEach(function(value) {
+      if (value > 0) {
+        let item = aPopup.insertBefore(document.createElement("menuitem"), sepCustom);
+        item.value = value;
+        item.label = Label(value);
+        item.setAttribute("type", "radio");
+      }
+    });
+
     aPopup.value = gBrowser.mContextTab._reloadInterval || TU_getPref("extensions.tabutils.reloadInterval", 10);
-    aPopup.label = (function() {
-      var m = parseInt(aPopup.value / 60), s = aPopup.value % 60;
-      return (m > 1 ? m + " " + aPopup.getAttribute("minutes") : m > 0 ? m + " " + aPopup.getAttribute("minute") : "")
-           + (m > 0 && s > 0 ? " " : "")
-           + (s > 1 ? s + " " + aPopup.getAttribute("seconds") : s > 0 ? s + " " + aPopup.getAttribute("second") : "");
-    })();
+    aPopup.label = Label(aPopup.value);
 
     var itemEnable = aPopup.getElementsByAttribute("anonid", "enable")[0];
     itemEnable.setAttribute("checked", gBrowser.mContextTabs.every(function(aTab) aTab.hasAttribute("autoReload")));
@@ -1490,15 +1498,28 @@ tabutils._reloadEvery = function() {
     }
     else {
       itemCustom.setAttribute("checked", true);
-      itemCustom.setAttribute("value", aPopup.value);
     }
 
     if (itemCustom.hasAttribute("checked")) {
+      itemCustom.setAttribute("value", aPopup.value);
       itemCustom.setAttribute("label", itemCustom.getAttribute("text") + ": " + aPopup.label);
     }
     else {
       itemCustom.setAttribute("label", itemCustom.getAttribute("text") + PlacesUIUtils.ellipsis);
     }
+
+    function Label(value) {
+      let m = parseInt(value / 60), s = value % 60, result = [];
+      if (m > 0) {
+        result.push(m);
+        result.push(aPopup.getAttribute(m > 1 ? "minutes" : "minute"));
+      }
+      if (s > 0 || m == 0) {
+        result.push(s);
+        result.push(aPopup.getAttribute(s > 1 ? "seconds" : "second"));
+      }
+      return result.join(" ");
+    }
   };
 };
 
diff --git a/chrome/content/tabutils.xul b/chrome/content/tabutils.xul
@@ -146,21 +146,13 @@
         <menuitem anonid="enable" text="&reloadEvery.enable;" type="checkbox"
                   oncommand="gBrowser.autoReloadTab(gBrowser.mContextTabs);event.stopPropagation();"/>
         <menuseparator/>
-        <menuitem label="5 &seconds.label;" value="5" type="radio"/>
-        <menuitem label="10 &seconds.label;" value="10" type="radio"/>
-        <menuitem label="30 &seconds.label;" value="30" type="radio"/>
-        <menuitem label="1 &minute.label;" value="60" type="radio"/>
-        <menuitem label="2 &minutes.label;" value="120" type="radio"/>
-        <menuitem label="5 &minutes.label;" value="300" type="radio"/>
-        <menuitem label="10 &minutes.label;" value="600" type="radio"/>
-        <menuitem label="30 &minutes.label;" value="1800" type="radio"/>
-        <menuseparator/>
+        <menuseparator anonid="sep_custom"/>
         <menuitem anonid="custom" text="&reloadEvery.custom;" type="radio"
                   oncommand="var reloadInterval = {value: this.value};if (Services.prompt.prompt(null, '&reloadEvery.label;', '&reloadEvery.reloadInterval;', reloadInterval, null, {})) this.value = reloadInterval.value; else event.stopPropagation();"/>
         <menuseparator/>
-        <menuitem anonid="enableAllTabs" label="&reloadEvery.enableAllTabs;"
+        <menuitem label="&reloadEvery.enableAllTabs;"
                   oncommand="gBrowser.autoReloadTab(gBrowser.allTabs, true, null, this.parentNode.value);event.stopPropagation();"/>
-        <menuitem anonid="disableAllTabs" label="&reloadEvery.disableAllTabs;"
+        <menuitem label="&reloadEvery.disableAllTabs;"
                   oncommand="gBrowser.autoReloadTab(gBrowser.allTabs, false);event.stopPropagation();"/>
       </menupopup>
     </menu>
diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
@@ -107,6 +107,7 @@ pref("extensions.tabutils.menu.menu_tuOptions", true);
 pref("extensions.tabutils.menu.context_newTab", false);
 pref("extensions.tabutils.menu.context_duplicateTab", false);
 pref("extensions.tabutils.menu.context_reloadEvery", false);
+pref("extensions.tabutils.menu.context_reloadEvery.list", "10,30,60,120,300,600,1800");
 pref("extensions.tabutils.menu.context_moveToWindow", false);
 pref("extensions.tabutils.menu.context_mergeWindow", false);
 pref("extensions.tabutils.menu.context_mergeGroup", false);
