gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-01 06:05:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix bugs and deprecate stuff.

Browse Source
This commit is contained in:
Kris Maglione
2012-12-20 19:07:28 -08:00
parent d0e53df525
commit fc4851458b
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/modules/base.jsm
View File

@@ -270,8 +270,8 @@ function deprecated(alternative, fn) {
deprecated.warn = function warn(func, name, alternative, frame) { deprecated.warn = function warn(func, name, alternative, frame) {
if (!func.seenCaller) if (!func.seenCaller)
func.seenCaller = Set([ func.seenCaller = Set([
"resource://dactyl" + JSMLoader.suffix + "/javascript.jsm", "resource://dactyl/javascript.jsm",
"resource://dactyl" + JSMLoader.suffix + "/util.jsm" "resource://dactyl/util.jsm"
]); ]);
frame = frame || Components.stack.caller.caller; frame = frame || Components.stack.caller.caller;

8
common/modules/dom.jsm
View File

@@ -11,6 +11,7 @@ defineModule("dom", {
lazyRequire("highlight", ["highlight"]); lazyRequire("highlight", ["highlight"]);
lazyRequire("messages", ["_"]); lazyRequire("messages", ["_"]);
lazyRequire("prefs", ["prefs"]);
lazyRequire("template", ["template"]); lazyRequire("template", ["template"]);
var XBL = "http://www.mozilla.org/xbl"; var XBL = "http://www.mozilla.org/xbl";
@@ -1022,6 +1023,9 @@ var DOM = Class("DOM", {
} }
for (let [k, v] in Iterator(Ci.nsIDOMKeyEvent)) { for (let [k, v] in Iterator(Ci.nsIDOMKeyEvent)) {
if (!/^DOM_VK_/.test(k))
continue;
this.code_nativeKey[v] = k.substr(4); this.code_nativeKey[v] = k.substr(4);
k = k.substr(7).toLowerCase(); k = k.substr(7).toLowerCase();
@@ -1525,9 +1529,9 @@ var DOM = Class("DOM", {
* stored here, keyed to the value thereof. * stored here, keyed to the value thereof.
* @returns {Node} * @returns {Node}
*/ */
fromXML: Class.Memoize(function () fromXML: deprecated("DOM.fromJSON", { get: function fromXML()
prefs.get("javascript.options.xml.chrome") !== false prefs.get("javascript.options.xml.chrome") !== false
&& require("dom-e4x.xml").fromXML), && require("dom-e4x").fromXML }),
fromJSON: update(function fromJSON(xml, doc, nodes, namespaces) { fromJSON: update(function fromJSON(xml, doc, nodes, namespaces) {
if (!doc) if (!doc)

5
common/modules/util.jsm
View File

@@ -89,6 +89,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
parseForm: deprecated("DOM#formData", function parseForm(elem) values(DOM(elem).formData).toArray()), parseForm: deprecated("DOM#formData", function parseForm(elem) values(DOM(elem).formData).toArray()),
scrollIntoView: deprecated("DOM#scrollIntoView", function scrollIntoView(elem, alignWithTop) DOM(elem).scrollIntoView(alignWithTop)), scrollIntoView: deprecated("DOM#scrollIntoView", function scrollIntoView(elem, alignWithTop) DOM(elem).scrollIntoView(alignWithTop)),
validateMatcher: deprecated("DOM.validateMatcher", { get: function validateMatcher() DOM.validateMatcher }), validateMatcher: deprecated("DOM.validateMatcher", { get: function validateMatcher() DOM.validateMatcher }),
xmlToDom: deprecated("DOM.fromJSON", function xmlToDom() DOM.fromXML.apply(DOM, arguments)),
map: deprecated("iter.map", function map(obj, fn, self) iter(obj).map(fn, self).toArray()), map: deprecated("iter.map", function map(obj, fn, self) iter(obj).map(fn, self).toArray()),
writeToClipboard: deprecated("dactyl.clipboardWrite", function writeToClipboard(str, verbose) util.dactyl.clipboardWrite(str, verbose)), writeToClipboard: deprecated("dactyl.clipboardWrite", function writeToClipboard(str, verbose) util.dactyl.clipboardWrite(str, verbose)),
@@ -1702,9 +1703,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
catch (e) { catch (e) {
throw e.stack ? e : Error(e); throw e.stack ? e : Error(e);
} }
}, }
xmlToDom: function () DOM.fromXML.apply(DOM, arguments)
}, { }, {
Array: array Array: array
}); });