summaryrefslogtreecommitdiff
path: root/common/content
diff options
context:
space:
mode:
authorDoug Kearns <dougkearns@gmail.com>2010-09-24 16:19:50 +1000
committerDoug Kearns <dougkearns@gmail.com>2010-09-24 16:19:50 +1000
commit904f3cb9744d614cb2b658e21a45c6f4243fccd6 (patch)
treef659f13d277213a89646993976cc1460348c5dc6 /common/content
parenta06b571058f6cb14b708a3ef9d92480f51181a41 (diff)
downloadpentadactyl-904f3cb9744d614cb2b658e21a45c6f4243fccd6.tar.gz
More camel-casing.
isInstance -> isinstance as homage to instanceof.
Diffstat (limited to 'common/content')
-rw-r--r--common/content/buffer.js4
-rw-r--r--common/content/completion.js2
-rw-r--r--common/content/configbase.js4
-rw-r--r--common/content/dactyl.js18
-rw-r--r--common/content/events.js8
-rw-r--r--common/content/hints.js2
-rw-r--r--common/content/io.js2
-rw-r--r--common/content/tabs.js2
8 files changed, 21 insertions, 21 deletions
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", {
'<?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>\n' +
'<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">\n' +
<document xmlns={NS}
- name="plugins" title={config.appname + " Plugins"}>
+ name="plugins" title={config.appName + " Plugins"}>
<h1 tag="using-plugins">Using Plugins</h1>
<toc start="2"/>
@@ -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:<br/>{navigator.userAgent}
+ {config.appName} {dactyl.version} running on:<br/>{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,
- ["<C-z>"], "Temporarily ignore all " + config.appname + " key bindings",
+ ["<C-z>"], "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