diff options
Diffstat (limited to 'common/content')
| -rw-r--r-- | common/content/commandline.js | 10 | ||||
| -rw-r--r-- | common/content/dactyl.js | 4 | ||||
| -rw-r--r-- | common/content/tabs.js | 44 |
3 files changed, 21 insertions, 37 deletions
diff --git a/common/content/commandline.js b/common/content/commandline.js index de8d9c3c..59197c39 100644 --- a/common/content/commandline.js +++ b/common/content/commandline.js @@ -263,16 +263,6 @@ var CommandWidgets = Class("CommandWidgets", { } [this.commandbar.container, this.statusbar.container].forEach(check); - // Work around a redrawing bug. - if (changed && config.haveGecko("16", "20")) { - util.delay(function () { - // Urgh. - statusline.statusBar.style.paddingRight = "1px"; - DOM(statusline.statusBar).rect; // Force reflow. - statusline.statusBar.style.paddingRight = ""; - }, 0); - } - if (this.initialized && loaded.mow && mow.visible) mow.resize(false); }, diff --git a/common/content/dactyl.js b/common/content/dactyl.js index 6ad9e553..26248dd9 100644 --- a/common/content/dactyl.js +++ b/common/content/dactyl.js @@ -1367,10 +1367,6 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), { styles.system.add("taboptions", "chrome://*", classes.length ? classes.join(",") + "{ display: none; }" : ""); - if (!dactyl.has("Gecko2")) { - tabs.tabBinding.enabled = Array.some(opts, k => k in this.opts); - tabs.updateTabCount(); - } if (config.tabbrowser.tabContainer._positionPinnedTabs) config.tabbrowser.tabContainer._positionPinnedTabs(); }, diff --git a/common/content/tabs.js b/common/content/tabs.js index a7f038e3..5c7e3e06 100644 --- a/common/content/tabs.js +++ b/common/content/tabs.js @@ -73,28 +73,26 @@ var Tabs = Module("tabs", { updateTabCount: function updateTabCount() { for (let [i, tab] in Iterator(this.visibleTabs)) { - if (dactyl.has("Gecko2")) { - let node = function node(class_) document.getAnonymousElementByAttribute(tab, "class", class_); - if (!node("dactyl-tab-number")) { - let img = node("tab-icon-image"); - if (img) { - let dom = DOM([ - ["xul:hbox", { highlight: "tab-number" }, - ["xul:label", { key: "icon", align: "center", highlight: "TabIconNumber", - class: "dactyl-tab-icon-number" }]], - ["xul:hbox", { highlight: "tab-number" }, - ["html:div", { key: "label", highlight: "TabNumber", - class: "dactyl-tab-number" }]]], - document).appendTo(img.parentNode); - - update(tab, { - get dactylOrdinal() Number(dom.nodes.icon.value), - set dactylOrdinal(i) { - dom.nodes.icon.value = dom.nodes.label.textContent = i; - this.setAttribute("dactylOrdinal", i); - } - }); - } + let node = function node(class_) document.getAnonymousElementByAttribute(tab, "class", class_); + if (!node("dactyl-tab-number")) { + let img = node("tab-icon-image"); + if (img) { + let dom = DOM([ + ["xul:hbox", { highlight: "tab-number" }, + ["xul:label", { key: "icon", align: "center", highlight: "TabIconNumber", + class: "dactyl-tab-icon-number" }]], + ["xul:hbox", { highlight: "tab-number" }, + ["html:div", { key: "label", highlight: "TabNumber", + class: "dactyl-tab-number" }]]], + document).appendTo(img.parentNode); + + update(tab, { + get dactylOrdinal() Number(dom.nodes.icon.value), + set dactylOrdinal(i) { + dom.nodes.icon.value = dom.nodes.label.textContent = i; + this.setAttribute("dactylOrdinal", i); + } + }); } } tab.dactylOrdinal = i + 1; @@ -1224,7 +1222,7 @@ var Tabs = Module("tabs", { tabs.tabStyle.enabled = false; } - if (value !== "multitab" || !dactyl.has("Gecko2")) + if (value !== "multitab") if (tabs.xulTabs) tabs.xulTabs.visible = value !== "never"; else |