From 904f3cb9744d614cb2b658e21a45c6f4243fccd6 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Fri, 24 Sep 2010 16:19:50 +1000 Subject: [PATCH] More camel-casing. isInstance -> isinstance as homage to instanceof. --- common/components/protocols.js | 2 +- common/content/buffer.js | 4 ++-- common/content/completion.js | 2 +- common/content/configbase.js | 4 ++-- common/content/dactyl.js | 18 +++++++++--------- common/content/events.js | 8 ++++---- common/content/hints.js | 2 +- common/content/io.js | 2 +- common/content/tabs.js | 2 +- common/modules/base.jsm | 14 +++++++------- common/modules/util.jsm | 2 +- pentadactyl/components/dactyl.js | 4 ++-- teledactyl/components/dactyl.js | 4 ++-- xulmus/components/dactyl.js | 4 ++-- 14 files changed, 36 insertions(+), 36 deletions(-) diff --git a/common/components/protocols.js b/common/components/protocols.js index 5f346eb4..03d75422 100644 --- a/common/components/protocols.js +++ b/common/components/protocols.js @@ -164,7 +164,7 @@ AboutHandler.prototype = { classID: Components.ID("81495d80-89ee-4c36-a88d-ea7c4e5ac63f"), - contractID: "@mozilla.org/network/protocol/about;1?what=" + Dactyl.prototype.appname, + contractID: "@mozilla.org/network/protocol/about;1?what=" + Dactyl.prototype.appName, QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]), diff --git a/common/content/buffer.js b/common/content/buffer.js index ced26b1f..3765f7b0 100644 --- a/common/content/buffer.js +++ b/common/content/buffer.js @@ -500,7 +500,7 @@ const Buffer = Module("buffer", { let win = elem.ownerDocument && elem.ownerDocument.defaultView || elem; win.dactylFocusAllowed = true; - if (isInstance(elem, [HTMLFrameElement, HTMLIFrameElement])) + if (isinstance(elem, [HTMLFrameElement, HTMLIFrameElement])) elem.contentWindow.focus(); else if (elem instanceof HTMLInputElement && elem.type == "file") { Buffer.openUploadPrompt(elem); @@ -592,7 +592,7 @@ const Buffer = Module("buffer", { let offsetX = 1; let offsetY = 1; - if (isInstance(elem, [HTMLFrameElement, HTMLIFrameElement])) { + if (isinstance(elem, [HTMLFrameElement, HTMLIFrameElement])) { buffer.focusElement(elem); return; } diff --git a/common/content/completion.js b/common/content/completion.js index 36ba59d2..d8f6d1d3 100644 --- a/common/content/completion.js +++ b/common/content/completion.js @@ -321,7 +321,7 @@ const CompletionContext = Class("CompletionContext", { yield ["result", quote ? function () quote[0] + quote[1](this.text) + quote[2] : function () this.text]; }; - for (let i in iterall(this.keys, result(this.quote))) { + for (let i in iterAll(this.keys, result(this.quote))) { let [k, v] = i; if (typeof v == "string" && /^[.[]/.test(v)) // This is only allowed to be a simple accessor, and shouldn't diff --git a/common/content/configbase.js b/common/content/configbase.js index f49cd3f5..07473baa 100644 --- a/common/content/configbase.js +++ b/common/content/configbase.js @@ -13,8 +13,8 @@ const ConfigBase = Class(ModuleBase, { */ init: function () { this.name = services.get("dactyl:").name; - this.idname = services.get("dactyl:").idname; - this.appname = services.get("dactyl:").appname; + this.idName = services.get("dactyl:").idName; + this.appName = services.get("dactyl:").appName; this.host = services.get("dactyl:").host; highlight.styleableChrome = this.styleableChrome; diff --git a/common/content/dactyl.js b/common/content/dactyl.js index ab54687f..7a77679d 100644 --- a/common/content/dactyl.js +++ b/common/content/dactyl.js @@ -252,11 +252,11 @@ const Dactyl = Module("dactyl", { echoerr: function echoerr(str, flags) { flags |= commandline.APPEND_TO_MESSAGES; - if (isInstance(str, ["Error", "Exception"])) + if (isinstance(str, ["Error", "Exception"])) dactyl.reportError(str); if (typeof str == "object" && "echoerr" in str) str = str.echoerr; - else if (isInstance(str, ["Error"])) + else if (isinstance(str, ["Error"])) str = str.fileName + ":" + str.lineNumber + ": " + str; if (options["errorbells"]) @@ -552,7 +552,7 @@ const Dactyl = Module("dactyl", { '\n' + '\n' + + name="plugins" title={config.appName + " Plugins"}>

Using Plugins

@@ -1371,7 +1371,7 @@ const Dactyl = Module("dactyl", { { argCount: "0" }); commands.add(["dia[log]"], - "Open a " + config.appname + " dialog", + "Open a " + config.appName + " dialog", function (args) { let dialog = args[0]; @@ -1761,7 +1761,7 @@ const Dactyl = Module("dactyl", { }); commands.add(["res[tart]"], - "Force " + config.appname + " to restart", + "Force " + config.appName + " to restart", function () { dactyl.restart(); }, { argCount: "0" }); @@ -1913,7 +1913,7 @@ const Dactyl = Module("dactyl", { dactyl.open("about:"); else commandline.commandOutput(<> - {config.appname} {dactyl.version} running on:
{navigator.userAgent} + {config.appName} {dactyl.version} running on:
{navigator.userAgent} ); }, { argCount: "0", @@ -2025,7 +2025,7 @@ const Dactyl = Module("dactyl", { // finally, read the RC file and source plugins // make sourcing asynchronous, otherwise commands that open new tabs won't work util.timeout(function () { - let init = services.get("environment").get(config.idname + "_INIT"); + let init = services.get("environment").get(config.idName + "_INIT"); let rcFile = io.getRCFile("~"); try { @@ -2040,7 +2040,7 @@ const Dactyl = Module("dactyl", { else { if (rcFile) { io.source(rcFile.path, true); - services.get("environment").set("MY_" + config.idname + "RC", rcFile.path); + services.get("environment").set("MY_" + config.idName + "RC", rcFile.path); } else dactyl.log("No user RC file found", 3); @@ -2089,7 +2089,7 @@ const Dactyl = Module("dactyl", { }, 0); statusline.update(); - dactyl.log(config.appname + " fully initialized", 0); + dactyl.log(config.appName + " fully initialized", 0); dactyl.initialized = true; } }); diff --git a/common/content/events.js b/common/content/events.js index 0678cfc6..b1e92a00 100644 --- a/common/content/events.js +++ b/common/content/events.js @@ -741,7 +741,7 @@ const Events = Module("events", { let win = elem.ownerDocument && elem.ownerDocument.defaultView || elem; if (Events.isContentNode(elem) && !buffer.focusAllowed(win) - && isInstance(elem, [HTMLInputElement, HTMLSelectElement, HTMLTextAreaElement])) + && isinstance(elem, [HTMLInputElement, HTMLSelectElement, HTMLTextAreaElement])) elem.blur(); }, @@ -773,7 +773,7 @@ const Events = Module("events", { return; } - if(isInstance(elem, [HTMLEmbedElement, HTMLEmbedElement])) { + if(isinstance(elem, [HTMLEmbedElement, HTMLEmbedElement])) { dactyl.mode = modes.EMBED; return; } @@ -1118,7 +1118,7 @@ const Events = Module("events", { isInputElemFocused: function () { let elem = dactyl.focus; return elem instanceof HTMLInputElement && set.has(Events.editableInputs, elem.type) || - isInstance(elem, [HTMLIsIndexElement, HTMLEmbedElement, + isinstance(elem, [HTMLIsIndexElement, HTMLEmbedElement, HTMLObjectElement, HTMLTextAreaElement]); } }, { @@ -1173,7 +1173,7 @@ const Events = Module("events", { function () { document.commandDispatcher.rewindFocus(); }); mappings.add(modes.all, - [""], "Temporarily ignore all " + config.appname + " key bindings", + [""], "Temporarily ignore all " + config.appName + " key bindings", function () { modes.passAllKeys = true; }); mappings.add(modes.all, diff --git a/common/content/hints.js b/common/content/hints.js index c48c3bb3..c5e1d085 100644 --- a/common/content/hints.js +++ b/common/content/hints.js @@ -260,7 +260,7 @@ const Hints = Module("hints", { if (computedStyle.visibility != "visible" || computedStyle.display == "none") continue; - if (isInstance(elem, [HTMLInputElement, HTMLSelectElement, HTMLTextAreaElement])) + if (isinstance(elem, [HTMLInputElement, HTMLSelectElement, HTMLTextAreaElement])) [hint.text, hint.showText] = this._getInputHint(elem, doc); else hint.text = elem.textContent.toLowerCase(); diff --git a/common/content/io.js b/common/content/io.js index c2e1c624..1a15b77a 100644 --- a/common/content/io.js +++ b/common/content/io.js @@ -508,7 +508,7 @@ lookup: * variable. */ get runtimePath() { - const rtpvar = config.idname + "_RUNTIME"; + const rtpvar = config.idName + "_RUNTIME"; let rtp = services.get("environment").get(rtpvar); if (!rtp) { rtp = "~/" + (dactyl.has("WINNT") ? "" : ".") + config.name; diff --git a/common/content/tabs.js b/common/content/tabs.js index 59c1e1c6..ac0465e0 100644 --- a/common/content/tabs.js +++ b/common/content/tabs.js @@ -712,7 +712,7 @@ const Tabs = Module("tabs", { }); commands.add(["quita[ll]", "qa[ll]"], - "Quit " + config.appname, + "Quit " + config.appName, function (args) { dactyl.quit(false, args.bang); }, { argCount: "0", bang: true diff --git a/common/modules/base.jsm b/common/modules/base.jsm index 94e6c21a..a3bd51cf 100644 --- a/common/modules/base.jsm +++ b/common/modules/base.jsm @@ -142,7 +142,7 @@ defineModule("base", { "Struct", "StructBase", "Timer", "UTF8", "XPCOMUtils", "array", "call", "callable", "curry", "debuggerProperties", "defineModule", "endModule", "extend", "forEach", "isArray", "isGenerator", - "isInstance", "isObject", "isString", "isSubclass", "iter", "iterall", + "isinstance", "isObject", "isString", "isSubclass", "iter", "iterAll", "keys", "memoize", "properties", "requiresMainThread", "set", "update", "values" ], @@ -241,7 +241,7 @@ function forEach(iter, fn, self) { * * @returns {Generator} */ -function iterall() { +function iterAll() { for (let i = 0; i < arguments.length; i++) for (let j in Iterator(arguments[i])) yield j; @@ -341,7 +341,7 @@ set.remove = function (set, key) { * @returns {Generator} */ function iter(obj) { - if (isInstance(obj, [Ci.nsIDOMHTMLCollection, Ci.nsIDOMNodeList])) + if (isinstance(obj, [Ci.nsIDOMHTMLCollection, Ci.nsIDOMNodeList])) return array.iteritems(obj); if (obj instanceof Ci.nsIDOMNamedNodeMap) return (function () { @@ -392,14 +392,14 @@ function isSubclass(targ, src) { * returns true if targ is an instance of any element of src. If src is * the object form of a primitive type, returns true if targ is a * non-boxed version of the type, i.e., if (typeof targ == "string"), - * isInstance(targ, String) is true. Finally, if src is a string, + * isinstance(targ, String) is true. Finally, if src is a string, * returns true if ({}.toString.call(targ) == "[object ]"). * * @param {object} targ The object to check. * @param {object|string|[object|string]} src The types to check targ against. * @returns {boolean} */ -function isInstance(targ, src) { +function isinstance(targ, src) { const types = { boolean: Boolean, string: String, @@ -645,7 +645,7 @@ function Class() { configurable: true, get: function () { function closure(fn) function () fn.apply(self, arguments); - for (let k in iterall(properties(this), + for (let k in iterAll(properties(this), properties(this, true))) if (!this.__lookupGetter__(k) && callable(this[k])) closure[k] = closure(self[k]); @@ -890,7 +890,7 @@ function UTF8(str) { */ const array = Class("array", Array, { init: function (ary) { - if (isInstance(ary, ["Iterator", "Generator"])) + if (isinstance(ary, ["Iterator", "Generator"])) ary = [k for (k in ary)]; else if (ary.length) ary = Array.slice(ary); diff --git a/common/modules/util.jsm b/common/modules/util.jsm index 8417fea5..84c87afc 100644 --- a/common/modules/util.jsm +++ b/common/modules/util.jsm @@ -581,7 +581,7 @@ const Util = Module("Util", { // window.content often does not want to be queried with "var i in object" try { - let hasValue = !("__iterator__" in object || isInstance(object, ["Generator", "Iterator"])); + let hasValue = !("__iterator__" in object || isinstance(object, ["Generator", "Iterator"])); if (object.dactyl && object.modules && object.modules.modules == object.modules) { object = Iterator(object); hasValue = false; diff --git a/pentadactyl/components/dactyl.js b/pentadactyl/components/dactyl.js index 31106c49..b4c5b421 100644 --- a/pentadactyl/components/dactyl.js +++ b/pentadactyl/components/dactyl.js @@ -18,9 +18,9 @@ Dactyl.prototype = { classDescription: "Dactyl component base definitions", QueryInterface: XPCOMUtils.generateQI([]), - appname: "Pentadactyl", + appName: "Pentadactyl", name: "pentadactyl", - idname: "PENTADACTYL", + idName: "PENTADACTYL", host: "Firefox" }; diff --git a/teledactyl/components/dactyl.js b/teledactyl/components/dactyl.js index b80d5739..ec6532ba 100644 --- a/teledactyl/components/dactyl.js +++ b/teledactyl/components/dactyl.js @@ -18,9 +18,9 @@ Dactyl.prototype = { classDescription: "Dactyl component base definitions", QueryInterface: XPCOMUtils.generateQI([]), - appname: "Teledactyl", + appName: "Teledactyl", name: "teledactyl", - idname: "TELEDACTYL", + idName: "TELEDACTYL", host: "Thunderbird" }; diff --git a/xulmus/components/dactyl.js b/xulmus/components/dactyl.js index ed963dcc..82bfaf77 100644 --- a/xulmus/components/dactyl.js +++ b/xulmus/components/dactyl.js @@ -18,9 +18,9 @@ Dactyl.prototype = { classDescription: "Dactyl component base definitions", QueryInterface: XPCOMUtils.generateQI([]), - appname: "Xulmus", + appName: "Xulmus", name: "xulmus", - idname: "XULMUS", + idName: "XULMUS", host: "Songbird" };