diff options
| author | mike-work | 2014-05-07 23:57:56 +0100 | 
|---|---|---|
| committer | mike-work | 2014-05-29 02:42:51 +0100 | 
| commit | a18ad484f2fdc0019c15d94405c915f8bfe6d76f (patch) | |
| tree | 3a8667096504d09b85ac0cd1cf4135763c95e375 /pages | |
| parent | 1aa7ba3a5810742d14edfb738120b70f4a0f7619 (diff) | |
| download | vimium-a18ad484f2fdc0019c15d94405c915f8bfe6d76f.tar.bz2 | |
Adding in search engines feature to fix #1009
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/options.coffee | 4 | ||||
| -rw-r--r-- | pages/options.html | 27 | 
2 files changed, 28 insertions, 3 deletions
diff --git a/pages/options.coffee b/pages/options.coffee index 34696f68..d73d8f15 100644 --- a/pages/options.coffee +++ b/pages/options.coffee @@ -4,9 +4,9 @@ bgSettings = chrome.extension.getBackgroundPage().Settings  editableFields = [ "scrollStepSize", "excludedUrls", "linkHintCharacters", "linkHintNumbers",    "userDefinedLinkHintCss", "keyMappings", "filterLinkHints", "previousPatterns", -  "nextPatterns", "hideHud", "regexFindMode", "searchUrl"] +  "nextPatterns", "hideHud", "regexFindMode", "searchUrl", "searchEngines"] -canBeEmptyFields = ["excludedUrls", "keyMappings", "userDefinedLinkHintCss"] +canBeEmptyFields = ["excludedUrls", "keyMappings", "userDefinedLinkHintCss", "searchEngines"]  document.addEventListener "DOMContentLoaded", ->    populateOptions() diff --git a/pages/options.html b/pages/options.html index 8c7c007a..5450a774 100644 --- a/pages/options.html +++ b/pages/options.html @@ -122,6 +122,10 @@          width: 100%;          min-height: 135px;        } +      textarea#searchEngines { +        width: 100%; +        min-height: 135px; +      }        input#previousPatterns, input#nextPatterns {          width: 100%;        } @@ -330,12 +334,33 @@ unmapAll              <td verticalAlign="top">                  <div class="help">                    <div class="example"> -                    Set which search engine is used when searching from the Vomnibar (examples: "http://duckduckgo.com/?q=", "http://www.google.com/search?q="). +                    Set which search engine is used when searching from the Vomnibar (examples: "http://duckduckgo.com/?q=").                    </div>                  </div>                  <input id="searchUrl" type="text" />              </td>            </tr> +          <tr> +            <td class="caption">Search Engines</td> +            <td verticalAlign="top"> +                <div class="help"> +                  <div class="example"> +                      Allow customised search engines the format is `token: http://address.com/q?=%s` +                      <br/> +                      token must not contain a colon. +                      <br/> +                      comments are allowed and start with '#' +                      <br/> +                      all `%s` will be replaced with the query string +                      <br/> +                      for a list of default and extra search engines please see <a href="https://gist.github.com/mhauserr/1918ecd63393a9cb23c4">here</a> +                      <br/> +                      to subsequently search for something just type token follewed by your search terms +                  </div> +                </div> +                <textarea id="searchEngines"></textarea> +            </td> +          </tr>          </tbody>        </table>  | 
