gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-06 12:55:45 +01:00
Code Issues Projects Releases Wiki Activity

Make 'stal' a string option.

Browse Source
This commit is contained in:
Kris Maglione
2010-12-29 15:03:34 -05:00
parent 7a0c7dacbe
commit d2c8d0112f
5 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/content/tabs.js
View File

@@ -961,24 +961,24 @@ var Tabs = Module("tabs", {
options: function () {
options.add(["showtabline", "stal"],
"Define when the tab bar is visible",
"number", config.defaults["showtabline"],
"string", config.defaults["showtabline"],
{
setter: function (value) {
if (value == 0)
if (value === "never")
tabs.tabStyle.enabled = true;
else {
prefs.safeSet("browser.tabs.autoHide", value == 1,
prefs.safeSet("browser.tabs.autoHide", value === "multitab",
"See 'showtabline' option.");
tabs.tabStyle.enabled = false;
}
if (value != 1 || !dactyl.has("Gecko2"))
if (value !== "multitab" || !dactyl.has("Gecko2"))
config.tabStrip.collapsed = false;
return value;
},
completer: function (context) [
["0", "Never show tab bar"],
["1", "Show tab bar only if more than one tab is open"],
["2", "Always show tab bar"]
["never", "Never show tab bar"],
["multitab", "Show tab bar when there are multiple tabs"],
["always", "Always show tab bar"]
]
});

16
common/locale/en-US/options.xml
View File

@@ -1382,6 +1382,22 @@
<item>
<tags>'stal' 'showtabline'</tags>
<spec>'showtabline' 'stal'</spec>
<type>string</type>
<default>always</default>
<description>
<p>Define when the tab bar is visible.</p>
<dl>
<dt>always</dt> <dd>Always show tab bar</dd>
<dt>multitab</dt> <dd>Show tab bar when there are multiple tabs</dd>
<dt>never</dt> <dd>Never show tab bar</dd>
</dl>
</description>
</item>
</item>
<type>number</type>
<default>2</default>
<description>

12
common/modules/base.jsm
View File

@@ -16,11 +16,15 @@ if (!JSMLoader)
for each (let prop in Object.getOwnPropertyNames(global))
try {
if (!set.has(this.builtin, prop) &&
[this, set].indexOf(Object.getOwnPropertyDescriptor(global, prop).value) < 0)
delete global[prop];
if (!(prop in this.builtin) &&
[this, set].indexOf(Object.getOwnPropertyDescriptor(global, prop).value) < 0 &&
!global.__lookupGetter__(prop))
global[prop] = null;
}
catch (e) {
dump("Deleting property " + prop + " on " + url + ":\n " + e + "\n");
Components.utils.reportError(e);
}
catch (e) {}
Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
.getService(Components.interfaces.mozIJSSubScriptLoader)