From 9e531ca343599ad1d1550c3288cd7001d044d551 Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Sun, 25 Oct 2009 13:43:25 -0400 Subject: [PATCH] Fix Xulmus, etc. --HG-- branch : xslt --- common/content/bookmarks.js | 1 - common/content/commands.js | 2 +- common/content/completion.js | 13 +++++++------ common/content/editor.js | 5 +---- common/content/help.xsl | 29 +++++++++++++++------------- common/content/liberator.js | 4 ++-- common/content/style.js | 7 +++---- common/locale/en-US/autocommands.xml | 19 ++++++------------ common/locale/en-US/marks.xml | 2 +- common/locale/en-US/starting.xml | 15 +++++++++----- common/locale/en-US/styling.xml | 8 ++++---- vimperator/locale/en-US/intro.xml | 3 +-- xulmus/locale/en-US/gui.xml | 4 ++-- xulmus/locale/en-US/intro.xml | 23 +++++++++++----------- 14 files changed, 66 insertions(+), 69 deletions(-) diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js index f076bee8..6b927273 100644 --- a/common/content/bookmarks.js +++ b/common/content/bookmarks.js @@ -702,7 +702,6 @@ function Bookmarks() //{{{ // if the search also requires a postData, [url, postData] is returned getSearchURL: function getSearchURL(text, useDefsearch) { - let url = null; let searchString = (useDefsearch ? options["defsearch"] + " " : "") + text; // we need to make sure our custom alias have been set, even if the user diff --git a/common/content/commands.js b/common/content/commands.js index 3a736060..fdb92c75 100644 --- a/common/content/commands.js +++ b/common/content/commands.js @@ -1193,7 +1193,7 @@ function Commands() //{{{ let [, prefix, junk] = context.filter.match(/^(:*\d*)\w*(.?)/) || []; context.advance(prefix.length); if (!junk) - return context.fork("", 0, this, "command"); + return void context.fork("", 0, this, "command"); // dynamically get completions as specified with the command's completer function let command = commands.get(cmd); diff --git a/common/content/completion.js b/common/content/completion.js index 269d7e75..376838a1 100644 --- a/common/content/completion.js +++ b/common/content/completion.js @@ -185,6 +185,7 @@ function CompletionContext(editor, name, offset) //{{{ this.getKey = function (item, key) (typeof self.keys[key] == "function") ? self.keys[key].call(this, item.item) : key in self.keys ? item.item[self.keys[key]] : item.item[key]; + return this; } CompletionContext.Sort = { @@ -453,13 +454,13 @@ CompletionContext.prototype = { let filter = fixCase(this.filter); if (this.anchored) { - function compare(text, s) text.substr(0, s.length) == s; + var compare = function compare(text, s) text.substr(0, s.length) == s; substrings = util.map(util.range(filter.length, text.length + 1), function (end) text.substring(0, end)); } else { - function compare(text, s) text.indexOf(s) >= 0; + var compare = function compare(text, s) text.indexOf(s) >= 0; substrings = []; let start = 0; let idx; @@ -1156,12 +1157,12 @@ function Completion() //{{{ // Yes. If the [ starts at the beginning of a logical // statement, we're in an array literal, and we're done. if (get(-3, 0, STATEMENTS) == get(-2)[OFFSET]) - return; + return null; // Beginning of the statement upto the opening [ let obj = getObj(-3, get(-2)[OFFSET]); - return complete.call(this, obj, getKey(), null, string, last); + return void complete.call(this, obj, getKey(), null, string, last); } // Is this a function call? @@ -1211,7 +1212,7 @@ function Completion() //{{{ }; obj[0][1] += "." + func + "(... [" + args.length + "]"; - return complete.call(this, obj, key, compl, string, last); + return void complete.call(this, obj, key, compl, string, last); } // In a string that's not an obj key or a function arg. @@ -1246,7 +1247,7 @@ function Completion() //{{{ { // FIXME var o = top[OFFSET]; top[OFFSET] = offset; - return complete.call(this, obj, key); + return void complete.call(this, obj, key); } finally { diff --git a/common/content/editor.js b/common/content/editor.js index 45c8bebf..fe0c26dc 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -178,10 +178,7 @@ function Editor() //{{{ { let matches = args.string.match(RegExp("^\\s*($|" + abbrevmatch + ")(?:\\s*$|\\s+(.*))")); if (!matches) - { - liberator.echoerr("E474: Invalid argument"); - return false; - } + return void liberator.echoerr("E474: Invalid argument"); let [, lhs, rhs] = matches; if (rhs) editor.addAbbreviation(mode, lhs, rhs); diff --git a/common/content/help.xsl b/common/content/help.xsl index 08ffae61..5763d4e3 100644 --- a/common/content/help.xsl +++ b/common/content/help.xsl @@ -31,11 +31,11 @@ - + - + @@ -48,7 +48,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -103,28 +103,28 @@ - + - + - + - + @@ -132,11 +132,11 @@ - + - + @@ -151,12 +151,12 @@ - + - + @@ -184,11 +184,14 @@ - + + + + diff --git a/common/content/liberator.js b/common/content/liberator.js index 5f004568..6daf3c58 100644 --- a/common/content/liberator.js +++ b/common/content/liberator.js @@ -215,7 +215,7 @@ const liberator = (function () //{{{ options.add(["helpfile", "hf"], "Name of the main help file", - "string", "intro"); + "string", "intro.html"); options.add(["loadplugins", "lpl"], "Load plugin scripts when starting up", @@ -1389,7 +1389,7 @@ const liberator = (function () //{{{ { let helpFile = options["helpfile"]; if (config.helpFiles.indexOf(helpFile) != -1) - liberator.open("liberator://help/" + helpFile, { from: "help" }); + liberator.open("liberator://help/" + helpFile.replace(/\.html$/, ""), { from: "help" }); else liberator.echomsg("Sorry, help file " + helpFile.quote() + " not found"); return; diff --git a/common/content/style.js b/common/content/style.js index 3edce8da..a70e6446 100644 --- a/common/content/style.js +++ b/common/content/style.js @@ -176,11 +176,10 @@ Highlights.prototype.CSS = * display: table-row; + HelpTabRow,liberator|dl>tr display: table-row; HelpTag,liberator|tag display: inline-block; color: #527BBD; margin-left: 1ex; font-size: 8pt; font-weight: bold; HelpTags,liberator|tags display: block; float: right; clear: right; @@ -277,7 +276,7 @@ function Highlights(name, store) this.selector = function (class) { let [, hl, rest] = class.match(/^(\w*)(.*)/); - let class = "[liberator|highlight~=" + hl + "]" + class = "[liberator|highlight~=" + hl + "]" if (highlight[hl] && highlight[hl].class != class) class = highlight[hl].selector; return class + rest; diff --git a/common/locale/en-US/autocommands.xml b/common/locale/en-US/autocommands.xml index c4ad438f..9a8dc927 100644 --- a/common/locale/en-US/autocommands.xml +++ b/common/locale/en-US/autocommands.xml @@ -43,7 +43,7 @@
-

pat is a regular expression, use .* if you want to match all URLs.

+

pat is a regular expression, use .* if you want to match all URLs.

This differs from Vim which uses a glob rather than a regex for pat. @@ -78,27 +78,20 @@

Enable passthrough mode on all Google sites:

-

- :autocmd LocationChange .* js modes.passAllKeys = /google\.com/.test(buffer.URL) -

+:autocmd LocationChange .* js modes.passAllKeys = /google\.com/.test(buffer.URL) -

Enable passthrough mode on *some* Google sites:

+

Enable passthrough mode on some Google sites:

-

- :autocmd LocationChange .* js modes.passAllKeys = /(www|mail)\.google\.com/.test(buffer.URL) -

+:autocmd LocationChange .* js modes.passAllKeys = /(www|mail)\.google\.com/.test(buffer.URL)

Set the filetype to mail when editing email at Gmail:

-

+ :autocmd LocationChange .* :set editor=gvim -f -

- -

:autocmd LocationChange mail\\.google\\.com :set editor=gvim -f -c 'set ft=mail' -

+ diff --git a/common/locale/en-US/marks.xml b/common/locale/en-US/marks.xml index 084cc64b..1579263a 100644 --- a/common/locale/en-US/marks.xml +++ b/common/locale/en-US/marks.xml @@ -96,7 +96,7 @@ :delbm[arks]!

- Delete a bookmark. Deletes *all* bookmarks which match the url. If + Delete a bookmark. Deletes all bookmarks which match the url. If omitted, url defaults to the URL of the current buffer. Use key on a string to complete the URL which you want to delete.

diff --git a/common/locale/en-US/starting.xml b/common/locale/en-US/starting.xml index f2c7b522..0602fe1f 100644 --- a/common/locale/en-US/starting.xml +++ b/common/locale/en-US/starting.xml @@ -100,7 +100,7 @@
  • All directories in runtimepath are searched for a "plugin" subdirectory and all yet unloaded plugins are loaded. - For each plugin directory, all *.{js,vimp} files (including + For each plugin directory, all *.{js,vimp} files (including those in further subdirectories) are sourced alphabetically. No plugins will be sourced if: @@ -117,10 +117,15 @@ The user's ~ (i.e., "home") directory is determined as follows: -* On Unix and Mac, the environment variable $HOME is used. -* On Windows, &liberator.appname; checks for the existence of %HOME%, then -%USERPROFILE%, and then %HOMEDRIVE%%HOMEPATH%. It uses the first one -it finds. +
      +
    • On Unix and Mac, the environment variable $HOME is used.
      • +
    • + On Windows, &liberator.appname; checks for the existence of + %HOME%, then %USERPROFILE%, and then + %HOMEDRIVE%%HOMEPATH%. It uses the first one it + finds. +
      • +

    Saving settings

    diff --git a/common/locale/en-US/styling.xml b/common/locale/en-US/styling.xml index 2890a315..ef9db969 100644 --- a/common/locale/en-US/styling.xml +++ b/common/locale/en-US/styling.xml @@ -142,9 +142,9 @@

    - If name (short option: *-n*) is provided, any existing style with the same + If name (short option: -n) is provided, any existing style with the same name is overridden, and the style may later be deleted using name. If - *-append* (short option: *-a*) is provided along with *-name*, css and + -append (short option: -a) is provided along with -name, css and filter are appended to its current value.

    @@ -165,9 +165,9 @@

      -
    • -name: The name provided to :style (short option: *-n*)
      • +
    • -name: The name provided to :style (short option: -n)
    • -index: For unnamed styles, the index listed by :style - (short option: *-i*)
      • + (short option: -i)
    diff --git a/vimperator/locale/en-US/intro.xml b/vimperator/locale/en-US/intro.xml index 16a2af04..7c9db8b4 100644 --- a/vimperator/locale/en-US/intro.xml +++ b/vimperator/locale/en-US/intro.xml @@ -53,11 +53,10 @@ web browser, as key bindings differ according to which mode you are in. who already did):

    -
    + -

    diff --git a/xulmus/locale/en-US/gui.xml b/xulmus/locale/en-US/gui.xml index fb7ab79e..2c36d13e 100644 --- a/xulmus/locale/en-US/gui.xml +++ b/xulmus/locale/en-US/gui.xml @@ -8,7 +8,7 @@ xmlns:html="http://www.w3.org/1999/xhtml">

    -
    about
    About &liberator.hostapp;
    +
    about
    About &liberator.host;
    addons
    Manage Add-ons
    checkupdates
    Check for updates
    cleardata
    Clear private data
    @@ -21,7 +21,7 @@
    openfile
    Open the file selector dialog
    pagesource
    View page source
    places
    Places Organizer: Manage your bookmarks and history
    -
    preferences
    Show &liberator.hostapp; preferences dialog
    +
    preferences
    Show &liberator.host; preferences dialog
    printsetup
    Setup the page size and orientation before printing
    print
    Show print dialog
    saveframe
    Save frame to disk
    diff --git a/xulmus/locale/en-US/intro.xml b/xulmus/locale/en-US/intro.xml index 8d58b802..efb71702 100644 --- a/xulmus/locale/en-US/intro.xml +++ b/xulmus/locale/en-US/intro.xml @@ -4,8 +4,8 @@ @@ -14,14 +14,15 @@

    Introduction

    &liberator.appname; -is a free media player add-on for &liberator.hostapp;, which +is a free media player add-on for &liberator.host;, which combines the best features of the CMus -music player and the http://www.vim.org[Vim] text editor. +music player and the +Vim +text editor. -|warning| + - To provide the most authentic CMus/Vim experience, the &liberator.hostapp; toolbar + To provide the most authentic CMus/Vim experience, the &liberator.host; toolbar is hidden. If you really need it, type: :set guioptions+=T to get it back. If you don't like &liberator.appname; at all, you can uninstall it by typing @@ -33,7 +34,7 @@ music player and the http://www.vim.org[Vim] text editor. author donation

    &liberator.appname; was written by - mailto:prathyushthota@gmail.com[Prathyush Thota]. If you + Prathyush Thota. If you appreciate my work on &liberator.appname; and want to encourage me working on it more, you can either send me greetings, patches or make a donation: @@ -41,11 +42,11 @@ music player and the http://www.vim.org[Vim] text editor.

    -
    + -
    +

    Of course as a believer in free open source software, only make @@ -73,7 +74,7 @@ music player and the http://www.vim.org[Vim] text editor.

  • Repeating commands: Using macros to repeat recurring workflows.
  • Automatic commands: Automatically executing code on certain events.
  • Printing: Printing pages.
    • -
  • &liberator.appname;'s GUI: Accessing &liberator.hostapp; menus, dialogs and the display panels.
    • +
  • &liberator.appname;'s GUI: Accessing &liberator.host; menus, dialogs and the display panels.
  • Styling the GUI and web pages: Changing the styling of content pages and &liberator.appname; itself.
  • Error and informational messages: A description of messages and error messages.
  • Developer information: How to write docs or plugins.
    • @@ -97,7 +98,7 @@ music player and the http://www.vim.org[Vim] text editor.
  • Vim-like statusline with a Wget-like progress bar
  • Minimal GUI (easily hide useless menubar and toolbar with :set guioptions=)
  • Ability to :source JavaScript files, and to use a [a]~/.xulmusrc[a] file with syntax highlighting if you install http://code.google.com/p/vimperator-labs/issues/detail?id=50[xulmus.vim]
    • -
  • Easy quick searches (:open foo will search for "foo" in google, :open ebay terminator will search for "terminator" on ebay) with support for &liberator.hostapp; keyword bookmarks and search engines
    • +
  • Easy quick searches (:open foo will search for "foo" in google, :open ebay terminator will search for "terminator" on ebay) with support for &liberator.host; keyword bookmarks and search engines
  • Count supported for many commands (3 will go back 3 pages)
  • Beep on errors
  • Marks support (ma to set mark a on a web page, 'a to go there)