From 68620dadc7c8f21c4c1dea245e941ca43da84abb Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Thu, 13 Jan 2011 04:29:18 +1100 Subject: [PATCH] Add some missing deprecated buffer features. --- common/content/buffer.js | 12 +++++++++++- common/content/dactyl.js | 4 ++-- common/content/options.js | 24 ++++++++++++------------ common/modules/io.jsm | 2 +- common/modules/util.jsm | 4 ++-- 5 files changed, 28 insertions(+), 18 deletions(-) diff --git a/common/content/buffer.js b/common/content/buffer.js index 48e43082..55a164f0 100644 --- a/common/content/buffer.js +++ b/common/content/buffer.js @@ -1100,7 +1100,17 @@ var Buffer = Module("buffer", { dactyl.beep(); this.setZoom(Math.round(values[i] * 100), fullZoom); - } + }, + + getAllFrames: deprecated("Please use buffer.allFrames instead", function getAllFrames() buffer.getAllFrames.apply(buffer, arguments)), + scrollTop: deprecated("Please use buffer.scrollToPercent instead", function scrollTop() buffer.scrollToPercent(null, 0)), + scrollBottom: deprecated("Please use buffer.scrollToPercent instead", function scrollBottom() buffer.scrollToPercent(null, 100)), + scrollStart: deprecated("Please use buffer.scrollToPercent instead", function scrollStart() buffer.scrollToPercent(0, null)), + scrollEnd: deprecated("Please use buffer.scrollToPercent instead", function scrollEnd() buffer.scrollToPercent(100, null)), + scrollColumns: deprecated("Please use buffer.scrollHorizontal instead", function scrollColumns(cols) buffer.scrollHorizontal("columns", cols)), + scrollPages: deprecated("Please use buffer.scrollHorizontal instead", function scrollPages(pages) buffer.scrollVertical("pages", pages)), + scrollTo: deprecated("Please use Buffer.scrollTo instead", function scrollTo(x, y) content.scrollTo(x, y)), + textZoom: deprecated("Please use buffer.zoomValue and buffer.fullZoom instead", function textZoom() config.browser.markupDocumentViewer.textZoom * 100) }, { ZOOM_MIN: Class.memoize(function () prefs.get("zoom.minPercent")), ZOOM_MAX: Class.memoize(function () prefs.get("zoom.maxPercent")), diff --git a/common/content/dactyl.js b/common/content/dactyl.js index 596ec803..61cfdbd1 100644 --- a/common/content/dactyl.js +++ b/common/content/dactyl.js @@ -290,9 +290,9 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), { } }, - dump: deprecated("Use util.dump instead", + dump: deprecated("Please use util.dump instead", { get: function dump() util.closure.dump }), - dumpStack: deprecated("Use util.dumpStack instead", + dumpStack: deprecated("Please use util.dumpStack instead", { get: function dumpStack() util.closure.dumpStack }), /** diff --git a/common/content/options.js b/common/content/options.js index 19347b01..6ba6754f 100644 --- a/common/content/options.js +++ b/common/content/options.js @@ -686,18 +686,18 @@ var Options = Module("options", { this.__defineSetter__(name, function (value) { this._optionMap[name].value = value; }); }, - allPrefs: deprecated("Please use prefs.getNames", function allPrefs() prefs.getNames.apply(prefs, arguments)), - getPref: deprecated("Please use prefs.get", function getPref() prefs.get.apply(prefs, arguments)), - invertPref: deprecated("Please use prefs.invert", function invertPref() prefs.invert.apply(prefs, arguments)), - listPrefs: deprecated("Please use prefs.list", function listPrefs() { commandline.commandOutput(prefs.list.apply(prefs, arguments)); }), - observePref: deprecated("Please use prefs.observe", function observePref() prefs.observe.apply(prefs, arguments)), - popContext: deprecated("Please use prefs.popContext", function popContext() prefs.popContext.apply(prefs, arguments)), - pushContext: deprecated("Please use prefs.pushContext", function pushContext() prefs.pushContext.apply(prefs, arguments)), - resetPref: deprecated("Please use prefs.reset", function resetPref() prefs.reset.apply(prefs, arguments)), - safeResetPref: deprecated("Please use prefs.safeReset", function safeResetPref() prefs.safeReset.apply(prefs, arguments)), - safeSetPref: deprecated("Please use prefs.safeSet", function safeSetPref() prefs.safeSet.apply(prefs, arguments)), - setPref: deprecated("Please use prefs.set", function setPref() prefs.set.apply(prefs, arguments)), - withContext: deprecated("Please use prefs.withContext", function withContext() prefs.withContext.apply(prefs, arguments)), + allPrefs: deprecated("Please use prefs.getNames instead", function allPrefs() prefs.getNames.apply(prefs, arguments)), + getPref: deprecated("Please use prefs.get instead", function getPref() prefs.get.apply(prefs, arguments)), + invertPref: deprecated("Please use prefs.invert instead", function invertPref() prefs.invert.apply(prefs, arguments)), + listPrefs: deprecated("Please use prefs.list instead", function listPrefs() { commandline.commandOutput(prefs.list.apply(prefs, arguments)); }), + observePref: deprecated("Please use prefs.observe instead", function observePref() prefs.observe.apply(prefs, arguments)), + popContext: deprecated("Please use prefs.popContext instead", function popContext() prefs.popContext.apply(prefs, arguments)), + pushContext: deprecated("Please use prefs.pushContext instead", function pushContext() prefs.pushContext.apply(prefs, arguments)), + resetPref: deprecated("Please use prefs.reset instead", function resetPref() prefs.reset.apply(prefs, arguments)), + safeResetPref: deprecated("Please use prefs.safeReset instead", function safeResetPref() prefs.safeReset.apply(prefs, arguments)), + safeSetPref: deprecated("Please use prefs.safeSet instead", function safeSetPref() prefs.safeSet.apply(prefs, arguments)), + setPref: deprecated("Please use prefs.set instead", function setPref() prefs.set.apply(prefs, arguments)), + withContext: deprecated("Please use prefs.withContext instead", function withContext() prefs.withContext.apply(prefs, arguments)), /** * Returns the option with *name* in the specified *scope*. diff --git a/common/modules/io.jsm b/common/modules/io.jsm index 1cf0b637..70dfa6ba 100644 --- a/common/modules/io.jsm +++ b/common/modules/io.jsm @@ -475,7 +475,7 @@ var IO = Module("io", { /** * @property {string} The current platform's path separator. */ - PATH_SEP: deprecated("Please use File.PATH_SEP", { get: function PATH_SEP() File.PATH_SEP }) + PATH_SEP: deprecated("Please use File.PATH_SEP instead", { get: function PATH_SEP() File.PATH_SEP }) }, { init: function init(dactyl, modules, window) { modules.plugins.contexts = {}; diff --git a/common/modules/util.jsm b/common/modules/util.jsm index bd47cd9f..45997ccc 100644 --- a/common/modules/util.jsm +++ b/common/modules/util.jsm @@ -819,8 +819,8 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]), map: deprecated("Please use iter.map instead", function map(obj, fn, self) iter(obj).map(fn, self).toArray()), - writeToClipboard: deprecated("Please use dactyl.clipboardWrite", function writeToClipboard(str, verbose) util.dactyl.clipboardWrite(str, verbose)), - readFromClipboard: deprecated("Please use dactyl.clipboardRead", function readFromClipboard() util.dactyl.clipboardRead(false)), + writeToClipboard: deprecated("Please use dactyl.clipboardWrite instead", function writeToClipboard(str, verbose) util.dactyl.clipboardWrite(str, verbose)), + readFromClipboard: deprecated("Please use dactyl.clipboardRead instead", function readFromClipboard() util.dactyl.clipboardRead(false)), /** * Converts a URI string into a URI object.