From cc168dd5727444cceefbee668551029f35218fe4 Mon Sep 17 00:00:00 2001 From: Simon Lydell Date: Mon, 4 Jan 2016 08:29:37 +0100 Subject: [PATCH] Streamline some English text --- CHANGELOG.md | 8 ++++---- .../handy-standard-firefox-features.md | 4 ++-- documentation/styling.md | 4 ++-- extension/lib/commands.coffee | 17 +---------------- extension/locale/en-US/vimfx.properties | 4 ++-- 5 files changed, 11 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 093632f..894aadc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -163,7 +163,7 @@ - Fixed: If you customized the “esc” command before VimFx 0.6.0 it should now work as expected. -- Fixed: `` now works as expected in the address bar and in the dev tools. +- Fixed: `` now works as expected in the location bar and in the dev tools. - Fixed: Light-weight themes can no longer make VimFx’s Keyboard Shortcuts help dialog and hint markers unreadable. - Added: The [notifications\_enabled] option. @@ -318,7 +318,7 @@ - The `p` and `P` commands are now smarter regarding whether to treat the clipboard contents as a URL or a search, by working exactly like pasting in - the address bar. They also now read the selection clipboard, if available. + the location bar. They also now read the selection clipboard, if available. \#353 #382 - VimFx’s toolbar button is now properly implemented. #303 #349 #383 @@ -536,7 +536,7 @@ - Thanks to @mozillazg and @mcomella for translation contributions. - Added `gh` command that will navigate to the home page. -- Added `o` command to focus address bar. +- Added `o` command to focus location bar. - `p` and `P` will parse the contents of the clipboard. If the string in the clipboard appears to be a URL then it will navigate to this URL. Otherwise it will search for the string in the clipboard using currently selected search @@ -600,7 +600,7 @@ Alt-Shift V - ^u and ^d are removed from the command list. ^u is commonly used to show the page source code -- Opening new tab with now focuses the Address Bar +- Opening new tab with now focuses the location bar - Other small bugs nailed down. ### 0.1.1 (2012-10-27) diff --git a/documentation/handy-standard-firefox-features.md b/documentation/handy-standard-firefox-features.md index 1e60df4..b320258 100644 --- a/documentation/handy-standard-firefox-features.md +++ b/documentation/handy-standard-firefox-features.md @@ -12,9 +12,9 @@ preferred over re-implementing similar functionality. This section lists a few handy such standard features. -## The Address Bar +## The location bar -Firefox’s Address Bar is sometimes called the “Awesomebar” because it is so +Firefox’s location bar is sometimes called the “Awesomebar” because it is so powerful. Other than simply entering URLs, you can also use it to: - Search through bookmarks. diff --git a/documentation/styling.md b/documentation/styling.md index cff974a..079a932 100644 --- a/documentation/styling.md +++ b/documentation/styling.md @@ -64,8 +64,8 @@ To make the hint markers look like they did in version 0.5.x: } ``` -Making the address bar red when in ignore mode (you may substitute “ignore” with -any mode name below): +Making the location bar red when in ignore mode (you may substitute “ignore” +with any mode name below): ```css #main-window[vimfx-mode="ignore"] #urlbar { diff --git a/extension/lib/commands.coffee b/extension/lib/commands.coffee index 7239406..38a81b0 100644 --- a/extension/lib/commands.coffee +++ b/extension/lib/commands.coffee @@ -37,11 +37,10 @@ commands = {} commands.focus_location_bar = ({vim}) -> - # This function works even if the Address Bar has been removed. vim.window.focusAndSelectUrlBar() commands.focus_search_bar = ({vim, count}) -> - # The `.webSearch()` method opens a search engine in a tab if the Search Bar + # The `.webSearch()` method opens a search engine in a tab if the search bar # has been removed. Therefore we first check if it exists. if vim.window.BrowserSearch.searchBar vim.window.BrowserSearch.webSearch() @@ -62,7 +61,6 @@ commands.copy_current_url = ({vim}) -> commands.go_up_path = ({vim, count}) -> vim._run('go_up_path', {count}) -# Go up to root of the URL hierarchy. commands.go_to_root = ({vim}) -> vim._run('go_to_root') @@ -398,31 +396,25 @@ helper_follow_clickable = ({inTab, inBackground}, {vim, count = 1}) -> name = if inTab then 'follow_in_tab' else 'follow' helper_follow(name, vim, callback, count) -# Follow links, focus text inputs and click buttons with hint markers. commands.follow = helper_follow_clickable.bind(null, {inTab: false, inBackground: true}) -# Follow links in a new background tab with hint markers. commands.follow_in_tab = helper_follow_clickable.bind(null, {inTab: true, inBackground: true}) -# Follow links in a new foreground tab with hint markers. commands.follow_in_focused_tab = helper_follow_clickable.bind(null, {inTab: true, inBackground: false}) -# Follow links in a new window with hint markers. commands.follow_in_window = ({vim}) -> callback = (marker) -> vim._focusMarkerElement(marker.wrapper.elementIndex) vim.window.openLinkIn(marker.wrapper.href, 'window', {}) helper_follow('follow_in_tab', vim, callback) -# Like command_follow but multiple times. commands.follow_multiple = (args) -> args.count = Infinity commands.follow(args) -# Copy the URL or text of a markable element to the system clipboard. commands.follow_copy = ({vim}) -> callback = (marker) -> {elementIndex} = marker.wrapper @@ -433,7 +425,6 @@ commands.follow_copy = ({vim}) -> vim._run('copy_marker_element', {elementIndex, property}) helper_follow('follow_copy', vim, callback) -# Focus element with hint markers. commands.follow_focus = ({vim}) -> callback = (marker) -> vim._focusMarkerElement(marker.wrapper.elementIndex, {select: true}) @@ -489,7 +480,6 @@ commands.follow_previous = helper_follow_pattern.bind(null, 'prev') commands.follow_next = helper_follow_pattern.bind(null, 'next') -# Focus last focused or first text input. commands.focus_text_input = ({vim, count}) -> vim.markPageInteraction() vim._run('focus_text_input', {count}) @@ -511,13 +501,10 @@ helper_find = ({highlight, linksOnly = false}, {vim}) -> if highlightButton.checked != highlight highlightButton.click() -# Open the find bar, making sure that hightlighting is off. commands.find = helper_find.bind(null, {highlight: false}) -# Open the find bar, making sure that hightlighting is on. commands.find_highlight_all = helper_find.bind(null, {highlight: true}) -# Open the find bar in links only mode. commands.find_links_only = helper_find.bind(null, {linksOnly: true}) helper_find_again = (direction, {vim}) -> @@ -557,11 +544,9 @@ commands.enter_reader_view = ({vim}) -> else vim.notify(translate('notification.enter_reader_view.none')) -# Display the Help Dialog. commands.help = ({vim}) -> help.injectHelp(vim.window, vim._parent) -# Open and focus the Developer Toolbar. commands.dev = ({vim}) -> vim.window.DeveloperToolbar.show(true) # `true` to focus. diff --git a/extension/locale/en-US/vimfx.properties b/extension/locale/en-US/vimfx.properties index a0915b0..02be57b 100644 --- a/extension/locale/en-US/vimfx.properties +++ b/extension/locale/en-US/vimfx.properties @@ -7,8 +7,8 @@ help.search=Search mode.normal=Normal mode category.location=Location -mode.normal.focus_location_bar=Focus the Address Bar -mode.normal.focus_search_bar=Focus the Search Bar +mode.normal.focus_location_bar=Focus the location bar +mode.normal.focus_search_bar=Focus the search bar mode.normal.paste_and_go=Paste and go mode.normal.paste_and_go_in_tab=Paste and go in a new tab mode.normal.copy_current_url=Copy current URL -- 2.39.3