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

More camel-casing.

Browse Source 
isInstance -> isinstance as homage to instanceof.
This commit is contained in:
Doug Kearns
2010-09-24 16:19:50 +10:00
parent a06b571058
commit 904f3cb974
14 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/components/protocols.js
View File

@@ -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]),

4
common/content/buffer.js
View File

@@ -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;
}

2
common/content/completion.js
View File

@@ -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

4
common/content/configbase.js
View File

@@ -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;

18
common/content/dactyl.js
View File

@@ -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;
}
});

8
common/content/events.js
View File

@@ -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,

2
common/content/hints.js
View File

@@ -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();

2
common/content/io.js
View File

@@ -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;

2
common/content/tabs.js
View File

@@ -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

14
common/modules/base.jsm
View File

@@ -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 <src>]").
*
* @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);

2
common/modules/util.jsm
View File

@@ -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;

4
pentadactyl/components/dactyl.js
View File

@@ -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"
};

4
teledactyl/components/dactyl.js
View File

@@ -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"
};

4
xulmus/components/dactyl.js
View File

@@ -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"
};