gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 07:58:00 +01:00
Code Issues Projects Releases Wiki Activity

Remove some redundant version-specific code.

Browse Source
This commit is contained in:
Doug Kearns
2014-02-08 00:05:35 +11:00
parent c8b430cd8f
commit 789b44209c
8 changed files with 54 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/content/commandline.js
View File

@@ -263,16 +263,6 @@ var CommandWidgets = Class("CommandWidgets", {
} }
[this.commandbar.container, this.statusbar.container].forEach(check); [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) if (this.initialized && loaded.mow && mow.visible)
mow.resize(false); mow.resize(false);
}, },

4
common/content/dactyl.js
View File

@@ -1367,10 +1367,6 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
styles.system.add("taboptions", "chrome://*", styles.system.add("taboptions", "chrome://*",
classes.length ? classes.join(",") + "{ display: none; }" : ""); 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) if (config.tabbrowser.tabContainer._positionPinnedTabs)
config.tabbrowser.tabContainer._positionPinnedTabs(); config.tabbrowser.tabContainer._positionPinnedTabs();
}, },

42
common/content/tabs.js
View File

@@ -73,28 +73,26 @@ var Tabs = Module("tabs", {
updateTabCount: function updateTabCount() { updateTabCount: function updateTabCount() {
for (let [i, tab] in Iterator(this.visibleTabs)) { for (let [i, tab] in Iterator(this.visibleTabs)) {
if (dactyl.has("Gecko2")) { let node = function node(class_) document.getAnonymousElementByAttribute(tab, "class", class_);
let node = function node(class_) document.getAnonymousElementByAttribute(tab, "class", class_); if (!node("dactyl-tab-number")) {
if (!node("dactyl-tab-number")) { let img = node("tab-icon-image");
let img = node("tab-icon-image"); if (img) {
if (img) { let dom = DOM([
let dom = DOM([ ["xul:hbox", { highlight: "tab-number" },
["xul:hbox", { highlight: "tab-number" }, ["xul:label", { key: "icon", align: "center", highlight: "TabIconNumber",
["xul:label", { key: "icon", align: "center", highlight: "TabIconNumber", class: "dactyl-tab-icon-number" }]],
class: "dactyl-tab-icon-number" }]], ["xul:hbox", { highlight: "tab-number" },
["xul:hbox", { highlight: "tab-number" }, ["html:div", { key: "label", highlight: "TabNumber",
["html:div", { key: "label", highlight: "TabNumber", class: "dactyl-tab-number" }]]],
class: "dactyl-tab-number" }]]], document).appendTo(img.parentNode);
document).appendTo(img.parentNode);
update(tab, { update(tab, {
get dactylOrdinal() Number(dom.nodes.icon.value), get dactylOrdinal() Number(dom.nodes.icon.value),
set dactylOrdinal(i) { set dactylOrdinal(i) {
dom.nodes.icon.value = dom.nodes.label.textContent = i; dom.nodes.icon.value = dom.nodes.label.textContent = i;
this.setAttribute("dactylOrdinal", i); this.setAttribute("dactylOrdinal", i);
} }
}); });
}
} }
} }
tab.dactylOrdinal = i + 1; tab.dactylOrdinal = i + 1;
@@ -1224,7 +1222,7 @@ var Tabs = Module("tabs", {
tabs.tabStyle.enabled = false; tabs.tabStyle.enabled = false;
} }
if (value !== "multitab" || !dactyl.has("Gecko2")) if (value !== "multitab")
if (tabs.xulTabs) if (tabs.xulTabs)
tabs.xulTabs.visible = value !== "never"; tabs.xulTabs.visible = value !== "never";
else else

1
common/modules/addons.jsm
View File

@@ -110,7 +110,6 @@ var actions = {
name: "extr[ehash]", name: "extr[ehash]",
description: "Reload an extension", description: "Reload an extension",
action: function (addon) { action: function (addon) {
util.assert(config.haveGecko("2b"), _("command.notUseful", config.host));
util.flushCache(); util.flushCache();
util.timeout(function () { util.timeout(function () {
addon.userDisabled = true; addon.userDisabled = true;

41
common/modules/base.jsm
View File

@@ -734,33 +734,20 @@ function Class(...args) {
if (callable(args[0])) if (callable(args[0]))
superclass = args.shift(); superclass = args.shift();
if (loaded.config && (config.haveGecko("5.*", "6.0") || config.haveGecko("6.*"))) // Bug 657418. var Constructor = eval(String.replace('\n\
var Constructor = function Constructor() { (function constructor(PARAMS) { \n\
var self = Object.create(Constructor.prototype); var self = Object.create(Constructor.prototype); \n\
self.instance = self; self.instance = self; \n\
self.globalInstance = self; self.globalInstance = self; \n\
\n\
if ("_metaInit_" in self && self._metaInit_) if ("_metaInit_" in self && self._metaInit_) \n\
self._metaInit_.apply(self, arguments); self._metaInit_.apply(self, arguments); \n\
\n\
var res = self.init.apply(self, arguments); var res = self.init.apply(self, arguments); \n\
return res !== undefined ? res : self; return res !== undefined ? res : self; \n\
}; })',
else "constructor", (name || superclass.className).replace(/\W/g, "_"))
var Constructor = eval(String.replace('\n\ .replace("PARAMS", /^function .*?\((.*?)\)/.exec(args[0] && args[0].init || Class.prototype.init)[1]
(function constructor(PARAMS) { \n\
var self = Object.create(Constructor.prototype); \n\
self.instance = self; \n\
self.globalInstance = self; \n\
\n\
if ("_metaInit_" in self && self._metaInit_) \n\
self._metaInit_.apply(self, arguments); \n\
\n\
var res = self.init.apply(self, arguments); \n\
return res !== undefined ? res : self; \n\
})',
"constructor", (name || superclass.className).replace(/\W/g, "_"))
.replace("PARAMS", /^function .*?\((.*?)\)/.exec(args[0] && args[0].init || Class.prototype.init)[1]
.replace(/\b(self|res|Constructor)\b/g, "$1_"))); .replace(/\b(self|res|Constructor)\b/g, "$1_")));
Constructor.className = name || superclass.className || superclass.name; Constructor.className = name || superclass.className || superclass.name;

10
common/modules/buffer.jsm
View File

@@ -78,12 +78,8 @@ var Buffer = Module("Buffer", {
* callback is not provided. * callback is not provided.
*/ */
getPref: function getPref(pref, callback) { getPref: function getPref(pref, callback) {
// God damn it. services.contentPrefs.getPref(this.uri, pref,
if (config.haveGecko("19.0a1")) sanitizer.getContext(this.win), callback);
services.contentPrefs.getPref(this.uri, pref,
sanitizer.getContext(this.win), callback);
else
services.contentPrefs.getPref(this.uri, pref, callback);
}, },
/** /**
@@ -525,8 +521,6 @@ var Buffer = Module("Buffer", {
}; };
DOM(elem).mousedown(params).mouseup(params); DOM(elem).mousedown(params).mouseup(params);
if (!config.haveGecko("2b"))
DOM(elem).click(params);
let sel = util.selectionController(win); let sel = util.selectionController(win);
sel.getSelection(sel.SELECTION_FOCUS_REGION).collapseToStart(); sel.getSelection(sel.SELECTION_FOCUS_REGION).collapseToStart();

13
common/modules/config.jsm
View File

@@ -51,8 +51,6 @@ var ConfigBase = Class("ConfigBase", {
this.loadConfig(); this.loadConfig();
this.features.push = deprecated("Set.add", function push(feature) Set.add(this, feature)); this.features.push = deprecated("Set.add", function push(feature) Set.add(this, feature));
if (this.haveGecko("2b"))
Set.add(this.features, "Gecko2");
JSMLoader.registerFactory(JSMLoader.Factory(AboutHandler)); JSMLoader.registerFactory(JSMLoader.Factory(AboutHandler));
JSMLoader.registerFactory(JSMLoader.Factory( JSMLoader.registerFactory(JSMLoader.Factory(
@@ -160,17 +158,6 @@ var ConfigBase = Class("ConfigBase", {
highlight.loadCSS(this.helpCSS.replace(/__MSG_(.*?)__/g, highlight.loadCSS(this.helpCSS.replace(/__MSG_(.*?)__/g,
(m0, m1) => _(m1))); (m0, m1) => _(m1)));
if (!this.haveGecko("2b"))
highlight.loadCSS(literal(/*
!TabNumber font-weight: bold; margin: 0px; padding-right: .8ex;
!TabIconNumber {
font-weight: bold;
color: white;
text-align: center;
text-shadow: black -1px 0 1px, black 0 1px 1px, black 1px 0 1px, black 0 -1px 1px;
}
*/));
let hl = highlight.set("Find", ""); let hl = highlight.set("Find", "");
hl.onChange = function () { hl.onChange = function () {
function hex(val) ("#" + util.regexp.iterate(/\d+/g, val) function hex(val) ("#" + util.regexp.iterate(/\d+/g, val)

48
common/modules/dom.jsm
View File

@@ -1354,38 +1354,26 @@ var DOM = Class("DOM", {
* @param {Node} target The DOM node to which to dispatch the event. * @param {Node} target The DOM node to which to dispatch the event.
* @param {Event} event The event to dispatch. * @param {Event} event The event to dispatch.
*/ */
dispatch: Class.Memoize(function () dispatch: function dispatch(target, event, extra) {
config.haveGecko("2b") try {
? function dispatch(target, event, extra) { this.feedingEvent = extra;
try {
this.feedingEvent = extra;
if (target instanceof Ci.nsIDOMElement) if (target instanceof Ci.nsIDOMElement)
// This causes a crash on Gecko<2.0, it seems. return (target.ownerDocument || target.document || target).defaultView
return (target.ownerDocument || target.document || target).defaultView .QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils)
.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils) .dispatchDOMEventViaPresShell(target, event, true);
.dispatchDOMEventViaPresShell(target, event, true); else {
else { target.dispatchEvent(event);
target.dispatchEvent(event); return !event.defaultPrevented;
return !event.defaultPrevented;
}
}
catch (e) {
util.reportError(e);
}
finally {
this.feedingEvent = null;
}
} }
: function dispatch(target, event, extra) { }
try { catch (e) {
this.feedingEvent = extra; util.reportError(e);
target.dispatchEvent(update(event, extra)); }
} finally {
finally { this.feedingEvent = null;
this.feedingEvent = null; }
} }
})
}), }),
createContents: Class.Memoize(() => services.has("dactyl") && services.dactyl.createContents createContents: Class.Memoize(() => services.has("dactyl") && services.dactyl.createContents