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

Deprecate dactyl.mode.

Browse Source
This commit is contained in:
Kris Maglione
2010-12-30 18:03:03 -05:00
parent 2cb3135220
commit 69b9796249
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/content/buffer.js
View File

@@ -253,7 +253,7 @@ var Buffer = Module("buffer", {
if (document.commandDispatcher.focusedWindow == webProgress.DOMWindow && this.dactylLoadCount++) if (document.commandDispatcher.focusedWindow == webProgress.DOMWindow && this.dactylLoadCount++)
util.timeout(function () { modes.reset(false); }, util.timeout(function () { modes.reset(false); },
dactyl.mode == modes.HINTS ? 500 : 0); modes.main == modes.HINTS ? 500 : 0);
} }
else if (flags & Ci.nsIWebProgressListener.STATE_STOP) { else if (flags & Ci.nsIWebProgressListener.STATE_STOP) {
// Workaround for bugs 591425 and 606877, dactyl bug #81 // Workaround for bugs 591425 and 606877, dactyl bug #81

6
common/content/dactyl.js
View File

@@ -91,8 +91,10 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
* @property {number} The current main mode. * @property {number} The current main mode.
* @see modes#mainModes * @see modes#mainModes
*/ */
get mode() modes.main, mode: Class.Property({
set mode(value) modes.main = value, get: deprecated("Please use modes.main instead", function mode() modes.main),
set: deprecated("Please use modes.main instead", function mode(val) modes.main = val),
}),
get menuItems() Dactyl.getMenuItems(), get menuItems() Dactyl.getMenuItems(),

8
common/content/editor.js
View File

@@ -703,7 +703,7 @@ var Editor = Module("editor", {
function ({ arg, count }) { function ({ arg, count }) {
let pos = editor.findCharForward(arg, Math.max(count, 1)); let pos = editor.findCharForward(arg, Math.max(count, 1));
if (pos >= 0) if (pos >= 0)
editor.moveToPosition(pos, true, dactyl.mode == modes.VISUAL); editor.moveToPosition(pos, true, modes.main == modes.VISUAL);
}, },
{ arg: true, count: true }); { arg: true, count: true });
@@ -712,7 +712,7 @@ var Editor = Module("editor", {
function ({ arg, count }) { function ({ arg, count }) {
let pos = editor.findCharBackward(arg, Math.max(count, 1)); let pos = editor.findCharBackward(arg, Math.max(count, 1));
if (pos >= 0) if (pos >= 0)
editor.moveToPosition(pos, false, dactyl.mode == modes.VISUAL); editor.moveToPosition(pos, false, modes.main == modes.VISUAL);
}, },
{ arg: true, count: true }); { arg: true, count: true });
@@ -721,7 +721,7 @@ var Editor = Module("editor", {
function ({ arg, count }) { function ({ arg, count }) {
let pos = editor.findCharForward(arg, Math.max(count, 1)); let pos = editor.findCharForward(arg, Math.max(count, 1));
if (pos >= 0) if (pos >= 0)
editor.moveToPosition(pos - 1, true, dactyl.mode == modes.VISUAL); editor.moveToPosition(pos - 1, true, modes.main == modes.VISUAL);
}, },
{ arg: true, count: true }); { arg: true, count: true });
@@ -730,7 +730,7 @@ var Editor = Module("editor", {
function ({ arg, count }) { function ({ arg, count }) {
let pos = editor.findCharBackward(arg, Math.max(count, 1)); let pos = editor.findCharBackward(arg, Math.max(count, 1));
if (pos >= 0) if (pos >= 0)
editor.moveToPosition(pos + 1, false, dactyl.mode == modes.VISUAL); editor.moveToPosition(pos + 1, false, modes.main == modes.VISUAL);
}, },
{ arg: true, count: true }); { arg: true, count: true });

8
common/content/events.js
View File

@@ -693,7 +693,7 @@ var Events = Module("events", {
* The global escape key handler. This is called in ALL modes. * The global escape key handler. This is called in ALL modes.
*/ */
onEscape: function () { onEscape: function () {
switch (dactyl.mode) { switch (modes.main) {
case modes.COMMAND_LINE: case modes.COMMAND_LINE:
case modes.INSERT: case modes.INSERT:
case modes.OUTPUT_MULTILINE: case modes.OUTPUT_MULTILINE:
@@ -784,7 +784,7 @@ var Events = Module("events", {
// Huh? --djk // Huh? --djk
onFocusChange: function onFocusChange(event) { onFocusChange: function onFocusChange(event) {
// command line has its own focus change handler // command line has its own focus change handler
if (dactyl.mode == modes.COMMAND_LINE) if (modes.main == modes.COMMAND_LINE)
return; return;
function hasHTMLDocument(win) win && win.document && win.document instanceof HTMLDocument function hasHTMLDocument(win) win && win.document && win.document instanceof HTMLDocument
@@ -1015,14 +1015,14 @@ var Events = Module("events", {
let controller = document.commandDispatcher.getControllerForCommand("cmd_copy"); let controller = document.commandDispatcher.getControllerForCommand("cmd_copy");
let couldCopy = controller && controller.isCommandEnabled("cmd_copy"); let couldCopy = controller && controller.isCommandEnabled("cmd_copy");
if (dactyl.mode == modes.VISUAL) { if (modes.main == modes.VISUAL) {
if (!couldCopy) if (!couldCopy)
modes.pop(); // Really not ideal. modes.pop(); // Really not ideal.
} }
else if (couldCopy) { else if (couldCopy) {
if (modes.main == modes.TEXT_EDIT && !options["insertmode"]) if (modes.main == modes.TEXT_EDIT && !options["insertmode"])
modes.push(modes.VISUAL); modes.push(modes.VISUAL);
else if (dactyl.mode == modes.CARET) else if (modes.main == modes.CARET)
modes.push(modes.VISUAL); modes.push(modes.VISUAL);
} }
} }