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

Make buffer.getCurrentWord a deprecated alias for buffer.currentWord.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-11 13:58:35 -05:00
parent d64b0b8609
commit c32aa1f81e
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
common/content/buffer.js
View File

@@ -331,21 +331,8 @@ var Buffer = Module("buffer", {
* *
* @returns {string} * @returns {string}
*/ */
getCurrentWord: function (win) { get currentWord() Buffer.currentWord(this.focusedFrame),
let selection = win.getSelection(); getCurrentWord: deprecated("buffer.currentWord", function getCurrentWord() this.currentWord),
if (selection.rangeCount == 0)
return "";
let range = selection.getRangeAt(0).cloneRange();
if (range.collapsed) {
let re = options.get("iskeyword").regexp;
Editor.extendRange(range, true, re, true);
Editor.extendRange(range, false, re, true);
}
return util.domToString(range);
},
get currentWord() this.getCurrentWord(this.focusedFrame),
/** /**
* Returns true if a scripts are allowed to focus the given input * Returns true if a scripts are allowed to focus the given input
@@ -1044,6 +1031,26 @@ var Buffer = Module("buffer", {
setZoom: deprecated("buffer.setZoom", function setZoom() buffer.setZoom.apply(buffer, arguments)), setZoom: deprecated("buffer.setZoom", function setZoom() buffer.setZoom.apply(buffer, arguments)),
bumpZoomLevel: deprecated("buffer.bumpZoomLevel", function bumpZoomLevel() buffer.bumpZoomLevel.apply(buffer, arguments)), bumpZoomLevel: deprecated("buffer.bumpZoomLevel", function bumpZoomLevel() buffer.bumpZoomLevel.apply(buffer, arguments)),
/**
* Returns the currently selected word in *win*. If the selection is
* null, it tries to guess the word that the caret is positioned in.
*
* @returns {string}
*/
currentWord: function (win) {
let selection = win.getSelection();
if (selection.rangeCount == 0)
return "";
let range = selection.getRangeAt(0).cloneRange();
if (range.collapsed) {
let re = options.get("iskeyword").regexp;
Editor.extendRange(range, true, re, true);
Editor.extendRange(range, false, re, true);
}
return util.domToString(range);
},
getDefaultNames: function getDefaultNames(node) { getDefaultNames: function getDefaultNames(node) {
let url = node.href || node.src || node.documentURI; let url = node.href || node.src || node.documentURI;
let currExt = url.replace(/^.*?(?:\.([a-z0-9]+))?$/i, "$1").toLowerCase(); let currExt = url.replace(/^.*?(?:\.([a-z0-9]+))?$/i, "$1").toLowerCase();