diff --git a/common/content/abbreviations.js b/common/content/abbreviations.js index ca714341..98fee9c4 100644 --- a/common/content/abbreviations.js +++ b/common/content/abbreviations.js @@ -13,7 +13,7 @@ * inserted expansion string. * * Abbreviations have a left-hand side (LHS) whose text is replaced by that of - * the right-hand side (RHS) when triggered by an input mode expansion key. + * the right-hand side (RHS) when triggered by an Input mode expansion key. * E.g. an abbreviation with a LHS of "gop" and RHS of "Grand Old Party" will * replace the former with the latter. * diff --git a/common/content/commandline.js b/common/content/commandline.js index e33e3627..806d3b70 100644 --- a/common/content/commandline.js +++ b/common/content/commandline.js @@ -1432,7 +1432,7 @@ var CommandLine = Module("commandline", { mappings: function init_mappings() { mappings.add([modes.COMMAND], - [":"], "Enter command-line mode", + [":"], "Enter Command Line mode", function () { CommandExMode().open(""); }); mappings.add([modes.INPUT_MULTILINE], diff --git a/common/content/editor.js b/common/content/editor.js index 6067c760..86892e41 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -669,14 +669,14 @@ var Editor = Module("editor", { function () Events.PASS); mappings.add([modes.INSERT], - ["", ""], "Expand insert mode abbreviation", + ["", ""], "Expand Insert mode abbreviation", function () { editor.expandAbbreviation(modes.INSERT); return Events.PASS_THROUGH; }); mappings.add([modes.INSERT], - ["", ""], "Expand insert mode abbreviation", + ["", ""], "Expand Insert mode abbreviation", function () { editor.expandAbbreviation(modes.INSERT); }); // text edit mode diff --git a/common/content/hints.js b/common/content/hints.js index f6cf97cc..84ec41a4 100644 --- a/common/content/hints.js +++ b/common/content/hints.js @@ -396,7 +396,7 @@ var HintSession = Class("HintSession", CommandMode, { }, /** - * Handle a hint mode event. + * Handle a hints mode event. * * @param {Event} event The event to handle. */ @@ -774,7 +774,7 @@ var Hints = Module("hints", { hintSession: Modes.boundProperty(), /** - * Creates a new hint mode. + * Creates a new hints mode. * * @param {string} mode The letter that identifies this mode. * @param {string} prompt The description to display to the user @@ -1245,7 +1245,7 @@ var Hints = Module("hints", { }); options.add(["hinttags", "ht"], - "XPath or CSS selector strings of hintable elements for hint mode", + "XPath or CSS selector strings of hintable elements for Hints mode", "stringlist", "input:not([type=hidden]),a[href],area,iframe,textarea,button,select," + "[onclick],[onmouseover],[onmousedown],[onmouseup],[oncommand]," + "[tabindex],[role=link],[role=button],[contenteditable=true]", diff --git a/common/content/mappings.js b/common/content/mappings.js index 1e7fe8e8..8253729b 100644 --- a/common/content/mappings.js +++ b/common/content/mappings.js @@ -691,7 +691,7 @@ var Mappings = Module("mappings", { if (mode.char && !commands.get(mode.char + "map", true)) addMapCommands(mode.char, [m.mask for (m in modes.mainModes) if (m.char == mode.char)], - [mode.name]); + mode.displayName); let args = { getMode: function (args) findMode(args["-mode"]), diff --git a/common/locale/en-US/autocommands.xml b/common/locale/en-US/autocommands.xml index cf4830d5..b2719c05 100644 --- a/common/locale/en-US/autocommands.xml +++ b/common/locale/en-US/autocommands.xml @@ -89,11 +89,11 @@

Examples

-

Enable passthrough mode on all Google sites:

+

Enable Pass Through mode on all Google sites:

:autocmd LocationChange google.com :normal! -

Enable passthrough mode on some Google sites:

+

Enable Pass Through mode on some Google sites:

:autocmd LocationChange ^https?://(www|mail)\.google\.com/ :normal! diff --git a/common/locale/en-US/cmdline.xml b/common/locale/en-US/cmdline.xml index 0ad33329..b44c8bb3 100644 --- a/common/locale/en-US/cmdline.xml +++ b/common/locale/en-US/cmdline.xml @@ -9,11 +9,11 @@ xmlns="&xmlns.dactyl;" xmlns:html="&xmlns.html;"> -

Command-line mode

+

Command Line mode

- &dactyl.appName;'s command-line mode is perhaps its most + &dactyl.appName;'s Command Line mode is perhaps its most powerful interface. In this mode, the command input bar at the bottom of the window is given the keyboard focus for any of a variety of required inputs. In addition to access to almost @@ -27,9 +27,9 @@

Included among the several command-line modes are Ex command - mode (the standard mode for entering commands), find mode (for - searching the current page), prompt mode (for selecting files, - confirming actions), and hint mode (for selecting links and + mode (the standard mode for entering commands), Find mode (for + searching the current page), Prompt mode (for selecting files, + confirming actions), and Hints mode (for selecting links and other items on a page).

@@ -60,7 +60,7 @@ ]]> <C-c> -

Quit Command-line mode without executing.

+

Quit Command Line mode without executing.

 diff --git a/common/locale/en-US/faq.xml b/common/locale/en-US/faq.xml index ecc3becd..c0fa16d9 100644 --- a/common/locale/en-US/faq.xml +++ b/common/locale/en-US/faq.xml @@ -148,7 +148,7 @@ precommit = python:common/contrib/fix_symlinks.py:fix_symlinks See the passkeys option to automatically pass specific keys on sites of your choosing, or autocmd-examples to - automatically enter PASS THROUGH mode for certain websites. + automatically enter Pass Through mode for certain websites.

Why doesn't my modes.passAllKeys autocmd work anymore?

diff --git a/common/locale/en-US/hints.xml b/common/locale/en-US/hints.xml index 223ac401..c207911b 100644 --- a/common/locale/en-US/hints.xml +++ b/common/locale/en-US/hints.xml @@ -14,7 +14,7 @@

Hints are an easy way to interact with web pages without using - your mouse. In hint mode, &dactyl.appName; highlights and + your mouse. In Hints mode, &dactyl.appName; highlights and numbers all clickable elements. The elements can be selected either by typing their numbers, or typing parts of their text to narrow them down. While the default action is to click the @@ -38,7 +38,7 @@ their text to narrow down the result. When an element has been selected, it is automatically clicked and hint mode ends. Additionally, the following keys have - special meanings in hint mode: + special meanings in Hints mode:

@@ -53,7 +53,7 @@ value of hintkeys) as ordinary text
-
Exits hint mode without selecting an element
+
Exits Hints mode without selecting an element
@@ -80,12 +80,12 @@ ;modehint

- Start an extended hint mode. Extended hints are exactly like + Start an extended Hints mode. Extended hints are exactly like quick-hints, except that each sub-mode highlights a more specialized set of elements, and performs a unique action on the selected link. Because of the panoply of extended hint modes available, after pressing ;, pressing brings - up the completion list with each hint mode and its description. + up the completion list with each hints mode and its description.

mode may be one of:

@@ -129,7 +129,7 @@ g;modehint

- Start an extended hint mode and stay there until + Start an extended hints mode and stay there until is pressed. Like ;, except that after a hint is selected, hints remain visible so that another one can be selected with the same action as the diff --git a/common/locale/en-US/map.xml b/common/locale/en-US/map.xml index 26495b36..69b64959 100644 --- a/common/locale/en-US/map.xml +++ b/common/locale/en-US/map.xml @@ -26,9 +26,9 @@

Key mappings are the most basic means &dactyl.appName; provides for altering the actions of key presses. Each key mapping is - associated with a mode, such as insert, - normal, or - command-line, and only + associated with a mode, such as Insert, + Normal, or + Command Line, and only has effect when that mode is active. Although each mode has a full suite of internal mappings, they may be easily augmented, altered, or removed with the :map command and its @@ -54,17 +54,17 @@

n
Normal mode: When browsing normally
v
Visual mode: When selecting text with the cursor keys
i
Insert mode: When interacting with text fields on a website
-
t
TextEdit mode: When editing text fields in Vim-like NORMAL mode
-
c
Command-line mode: When typing into the &dactyl.appName; command line
+
t
Text Edit mode: When editing text fields in Vim-like Normal mode
+
c
Command Line mode: When typing into the &dactyl.appName; command line

The ordinary :map and :noremap commands - add mappings for normal and visual mode. In order to map key + add mappings for Normal and Visual mode. In order to map key bindings in a different mode, any of the mapping commands may be prefixed with one of the above letters. For instance, - :imap creates a new key mapping in insert mode, while - :cunmap removes a key mapping from command-line mode. + :imap creates a new key mapping in Insert mode, while + :cunmap removes a key mapping from Command Line mode. Other modes can be specified using the -modes option described below.

@@ -78,8 +78,8 @@

The following tree represents all of the modes understood by dactyl. Mappings for a mode also apply to its children and - descendants. So a mapping in the BASE mode, for instance, is - also active in NORMAL and EX mode. + descendants. So a mapping in the Base mode, for instance, is + also active in Normal and Ex mode.

&modes.tree; @@ -125,7 +125,7 @@
:vmap :vnoremap :vunmap
Visual mode
:imap :inoremap :iunmap
Insert mode
:tmap :tnoremap :tunmap
Text Edit mode
-
:cmap :cnoremap :cunmap
Command-line mode
+
:cmap :cnoremap :cunmap
Command Line mode
@@ -470,9 +470,9 @@ :cabbreviate

- Abbreviate a key sequence for Command-line mode. Same as + Abbreviate a key sequence for Command Line mode. Same as :abbreviate, but for - command-line mode only. + Command Line mode only.

@@ -485,7 +485,7 @@

Abbreviate a key sequence for Insert mode. Same as - :abbreviate, but for insert mode only. + :abbreviate, but for Insert mode only.

@@ -505,9 +505,9 @@ :cunabbreviate!

- Remove abbreviation(s) for Command-line mode. Same as + Remove abbreviation(s) for Command Line mode. Same as :unabbreviate, but for - command-line mode only. + Command Line mode only.

diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml index bcda4afb..146a6b94 100644 --- a/common/locale/en-US/options.xml +++ b/common/locale/en-US/options.xml @@ -972,7 +972,7 @@

- TextEdit mode can be entered with from Insert mode. + Text Edit mode can be entered with from Insert mode.

diff --git a/common/locale/en-US/privacy.xml b/common/locale/en-US/privacy.xml index 06bcdc2c..7782ff99 100644 --- a/common/locale/en-US/privacy.xml +++ b/common/locale/en-US/privacy.xml @@ -21,7 +21,7 @@ sensitive data.

-

Private mode browsing

+

Private browsing

&dactyl.appName; fully supports &dactyl.host;'s private browsing mode. diff --git a/common/locale/en-US/various.xml b/common/locale/en-US/various.xml index 76a4f116..39d80dc0 100644 --- a/common/locale/en-US/various.xml +++ b/common/locale/en-US/various.xml @@ -262,7 +262,7 @@

Start Caret mode. This mode resembles the Vim's Normal mode where the text cursor is visible on the web page. The v key - enters visual mode, where text is selected as the cursor moves. + enters Visual mode, where text is selected as the cursor moves.

diff --git a/common/modules/javascript.jsm b/common/modules/javascript.jsm index 2c215b8a..90202f0c 100644 --- a/common/modules/javascript.jsm +++ b/common/modules/javascript.jsm @@ -701,7 +701,7 @@ var JavaScript = Module("javascript", { modes.addMode("REPL", { description: "JavaScript Read Eval Print Loop", bases: [modes.COMMAND_LINE], - displayName: "REPL" + displayName: Class.memoize(function () this.name) }); }, commandline: function initCommandLine(dactyl, modules, window) { diff --git a/common/tests/functional/dactyl.jsm b/common/tests/functional/dactyl.jsm index 9b2a20e7..5f7bda5a 100644 --- a/common/tests/functional/dactyl.jsm +++ b/common/tests/functional/dactyl.jsm @@ -301,7 +301,7 @@ Controller.prototype = { }), /** - * Returns dactyl to normal mode. + * Returns dactyl to Normal mode. */ setNormalMode: wrapAssertNoErrors(function () { // XXX: Normal mode test @@ -313,9 +313,9 @@ Controller.prototype = { utils.assert("dactyl.setNormalMode", this.modules.modes.stack.length == 1, "Failed to return to Normal mode"); - this.assertMessageWindowOpen(false, "Returning to normal mode: Multi-line output not closed"); - this.assertMessageLine(function (msg) !msg, "Returning to normal mode: Message not cleared"); - }, "Returning to normal mode"), + this.assertMessageWindowOpen(false, "Returning to Normal mode: Multi-line output not closed"); + this.assertMessageLine(function (msg) !msg, "Returning to Normal mode: Message not cleared"); + }, "Returning to Normal mode"), /** * Returns dactyl to Ex mode. diff --git a/melodactyl/locale/en-US/intro.xml b/melodactyl/locale/en-US/intro.xml index 7e498914..e2d3c361 100644 --- a/melodactyl/locale/en-US/intro.xml +++ b/melodactyl/locale/en-US/intro.xml @@ -41,7 +41,7 @@ etc.)
  • - Command-line mode: + Command Line mode: Command-line editing.
  • diff --git a/pentadactyl/NEWS b/pentadactyl/NEWS index c8e58fba..93bffeea 100644 --- a/pentadactyl/NEWS +++ b/pentadactyl/NEWS @@ -48,8 +48,8 @@ quotes, i.e., 'fo\o''bar' ⇒ fo\o'bar [b1] • The command line is now hidden by default. Added c, C, and M to 'guioptions'. [b4] - • Hint mode improvements, including: - - Added g; continued extended hint mode, which allows + • Hints mode improvements, including: + - Added g; continued extended hints mode, which allows selecting multiple hints. Removed ;F. [b1] - Hints are now updated after scrolling and window resizing. [b3] - ;s now prompts for a filename on the command-line rather diff --git a/pentadactyl/content/config.js b/pentadactyl/content/config.js index 0bba7a36..6c52b2ca 100644 --- a/pentadactyl/content/config.js +++ b/pentadactyl/content/config.js @@ -117,7 +117,7 @@ var Config = Module("config", ConfigBase, { LocationChange: "Triggered when changing tabs or when navigation to a new location", PageLoadPre: "Triggered after a page load is initiated", PageLoad: "Triggered when a page gets (re)loaded/opened", - PrivateMode: "Triggered when private mode is activated or deactivated", + PrivateMode: "Triggered when private browsing mode is activated or deactivated", Sanitize: "Triggered when a sanitizeable item is cleared", ShellCmdPost: "Triggered after executing a shell command with :!cmd", Enter: "Triggered after Firefox starts", diff --git a/pentadactyl/locale/en-US/autocommands.xml b/pentadactyl/locale/en-US/autocommands.xml index 878f3217..d2aa0ce4 100644 --- a/pentadactyl/locale/en-US/autocommands.xml +++ b/pentadactyl/locale/en-US/autocommands.xml @@ -18,7 +18,7 @@
    LocationChange
    Triggered when changing tabs or when navigating to a new location
    PageLoadPre
    Triggered after a page load is initiated
    PageLoad
    Triggered when a page gets (re)loaded/opened
    -
    PrivateMode
    Triggered when private mode is activated or deactivated
    +
    PrivateMode
    Triggered when private browsing mode is activated or deactivated
    Sanitize
    Triggered when private data are sanitized
    ShellCmdPost
    Triggered after executing a shell command with :!cmd
    Enter
    Triggered after &dactyl.host; starts
    diff --git a/pentadactyl/locale/en-US/intro.xml b/pentadactyl/locale/en-US/intro.xml index 2061c0e3..2f3b1d9c 100644 --- a/pentadactyl/locale/en-US/intro.xml +++ b/pentadactyl/locale/en-US/intro.xml @@ -35,7 +35,7 @@ etc.)
  • - Command-line mode: + Command Line mode: Command-line editing.
  • diff --git a/pentadactyl/locale/en-US/tutorial.xml b/pentadactyl/locale/en-US/tutorial.xml index 4ab27d64..1a88ee55 100644 --- a/pentadactyl/locale/en-US/tutorial.xml +++ b/pentadactyl/locale/en-US/tutorial.xml @@ -47,7 +47,7 @@ &dactyl.appName;'s power, like Vim's, comes from its modal interface. Keys have different meanings depending on which mode the browser is in. &dactyl.appName; has several modes, but the 2 most important are Normal mode and - Command-line mode. + Command Line mode.

    @@ -56,13 +56,13 @@

    - The other core mode of &dactyl.appName;, Command-line mode, can be entered from + The other core mode of &dactyl.appName;, Command Line mode, can be entered from Normal mode by typing a : (colon). You will frequently see &dactyl.appName; commands start with a :, indicating that what follows is a command.

    - To return to Normal mode from Command-line mode, type . Pressing + To return to Normal mode from Command Line mode, type . Pressing will also return you to Normal mode from most other modes in &dactyl.appName;.

    @@ -229,19 +229,19 @@

    - The most common hint mode is called quick-hints. - To activate QuickHint mode, press either f or F. The lower-case - f will open the resulting link in the current tab, while the upper-case - F will open it in a new tab. + To activate Hints mode, press either f or F. The lower-case + f will open the resulting link in the current tab, while the + upper-case F will open it in a new tab.

    To test it, try this link: &dactyl.appName; Homepage. - Activate QuickHint mode with f or F to highlight all currently + Activate Hints mode with f or F to highlight all currently visible links. Then start typing the text of the link. The link should be - uniquely identified soon, and &dactyl.appName; will open it. Once you're done, - remember to use (History Back) or d (Delete Buffer) - to return here, depending on which key you used to activate QuickHint mode. + uniquely identified soon, and &dactyl.appName; will open it. Once you're + done, remember to use (History Back) or d + (Delete Buffer) to return here, depending on which key you used to + activate Hints mode.

    Common issues

    diff --git a/teledactyl/locale/en-US/intro.xml b/teledactyl/locale/en-US/intro.xml index 4f111d51..328fb1cd 100644 --- a/teledactyl/locale/en-US/intro.xml +++ b/teledactyl/locale/en-US/intro.xml @@ -35,7 +35,7 @@ etc.)
  • - Command-line mode: + Command Line mode: Command-line editing.