From 486ba68a42e2ba7b96a7a14b0ae34aca7ac7e780 Mon Sep 17 00:00:00 2001
From: Jez Ng
Date: Sun, 19 Aug 2012 00:50:45 -0700
Subject: Convert options.js -> options/options.coffee.
---
Cakefile | 2 +-
manifest.json | 2 +-
options.html | 227 -------------------------------------------------
options.js | 112 ------------------------
options/options.coffee | 90 ++++++++++++++++++++
options/options.html | 227 +++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 319 insertions(+), 341 deletions(-)
delete mode 100644 options.html
delete mode 100644 options.js
create mode 100644 options/options.coffee
create mode 100644 options/options.html
diff --git a/Cakefile b/Cakefile
index e1434d24..6e7893cf 100644
--- a/Cakefile
+++ b/Cakefile
@@ -8,7 +8,7 @@ spawn_with_opts = (proc_name, opts) ->
opt_array.push "--#{key}=#{value}"
spawn proc_name, opt_array
-src_directories = ["tests", "background_scripts", "content_scripts", "lib"]
+src_directories = ["tests", "background_scripts", "content_scripts", "lib", "options"]
task "build", "compile all coffeescript files to javascript", ->
coffee = spawn "coffee", ["-c"].concat(src_directories)
diff --git a/manifest.json b/manifest.json
index 5c451700..4c3f3199 100644
--- a/manifest.json
+++ b/manifest.json
@@ -16,7 +16,7 @@
"background_scripts/main.js"
]
},
- "options_page": "options.html",
+ "options_page": "options/options.html",
"permissions": [
"tabs",
"bookmarks",
diff --git a/options.html b/options.html
deleted file mode 100644
index 730c9bff..00000000
--- a/options.html
+++ /dev/null
@@ -1,227 +0,0 @@
-
-
- Vimium Options
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Vimium - Options
-
-
- | Scroll step size |
-
- px
- |
-
-
-
- Excluded URLs
-
-
- e.g. http*://mail.google.com/*
- This will disable Vimium on Gmail.
- Enter one URL per line.
-
- |
-
-
- |
- Advanced options »
- |
-
-
- Custom key
mappings |
-
-
-
-
- Enter commands to remap your keys. Available commands:
-
- map j scrollDown
- unmap j
- unmapAll
- " this is a comment
- # this is also a comment
-
- Show available commands.
-
- |
-
-
- Characters used
for link hints |
-
-
-
- The characters placed next to each link after typing "F" to enter link hinting mode.
-
- |
-
-
- | CSS for link hints |
-
-
-
- The CSS used to style the characters next to each link hint.
- Note: these styles are used in addition to and take precedence over Vimium's
- default styles.
-
- |
-
-
- |
-
-
-
- After typing "F" to enter link hinting mode, this option lets you type the text of a link
- to select it.
-
- |
-
-
- |
-
-
-
- The Heads-Up Display appears when typing into text boxes.
-
- |
-
-
- | Previous Patterns |
-
-
-
- Vimium will match against these patterns when using the "navigate to the previous page"
- command.
-
- |
-
-
- | Next Patterns |
-
-
-
- Vimium will match against these patterns when using the "navigate to the next page" command.
-
- |
-
-
-
-
-
-
-
-
-
-
-
- To view all available shortcuts, type ? to show the Vimium help dialog.
-
-
-
diff --git a/options.js b/options.js
deleted file mode 100644
index bc624882..00000000
--- a/options.js
+++ /dev/null
@@ -1,112 +0,0 @@
-$ = function(id) { return document.getElementById(id); };
-var bgSettings = chrome.extension.getBackgroundPage().Settings;
-
-var editableFields = ["scrollStepSize", "excludedUrls", "linkHintCharacters", "userDefinedLinkHintCss",
- "keyMappings", "filterLinkHints", "previousPatterns", "nextPatterns", "hideHud"];
-
-var canBeEmptyFields = ["excludedUrls", "keyMappings", "userDefinedLinkHintCss"];
-
-var postSaveHooks = {
- keyMappings: function (value) {
- commands = chrome.extension.getBackgroundPage().Commands;
- commands.clearKeyMappingsAndSetDefaults();
- commands.parseCustomKeyMappings(value);
- chrome.extension.getBackgroundPage().refreshCompletionKeysAfterMappingSave();
- }
-};
-
-document.addEventListener("DOMContentLoaded", function() {
- populateOptions();
-
- for (var i = 0; i < editableFields.length; i++) {
- $(editableFields[i]).addEventListener("keyup", onOptionKeyup, false);
- $(editableFields[i]).addEventListener("change", enableSaveButton, false);
- $(editableFields[i]).addEventListener("change", onDataLoaded, false);
- }
-
- $("advancedOptions").addEventListener("click", openAdvancedOptions, false);
- $("showCommands").addEventListener("click", function () {
- showHelpDialog(
- chrome.extension.getBackgroundPage().helpDialogHtml(true, true, "Command Listing"), frameId);
- }, false);
-
- document.getElementById("restoreSettings").addEventListener("click", restoreToDefaults);
- document.getElementById("saveOptions").addEventListener("click", saveOptions);
-});
-
-function onOptionKeyup(event) {
- if (event.target.getAttribute("type") !== "checkbox" &&
- event.target.getAttribute("savedValue") != event.target.value)
- enableSaveButton();
-}
-
-function onDataLoaded() {
- $("linkHintCharacters").readOnly = $("filterLinkHints").checked;
-}
-
-function enableSaveButton() { $("saveOptions").removeAttribute("disabled"); }
-
-// Saves options to localStorage.
-function saveOptions() {
- // If the value is unchanged from the default, delete the preference from localStorage; this gives us
- // the freedom to change the defaults in the future.
- for (var i = 0; i < editableFields.length; i++) {
- var fieldName = editableFields[i];
- var field = $(fieldName);
-
- var fieldValue;
- if (field.getAttribute("type") == "checkbox") {
- fieldValue = field.checked;
- } else {
- fieldValue = field.value.trim();
- field.value = fieldValue;
- }
-
- // If it's empty and not a field that we allow to be empty, restore to the default value
- if (!fieldValue && canBeEmptyFields.indexOf(fieldName) == -1) {
- bgSettings.clear(fieldName);
- fieldValue = bgSettings.get(fieldName);
- } else
- bgSettings.set(fieldName, fieldValue);
-
- $(fieldName).value = fieldValue;
- $(fieldName).setAttribute("savedValue", fieldValue);
-
- if (postSaveHooks[fieldName]) { postSaveHooks[fieldName](fieldValue); }
- }
- $("saveOptions").disabled = true;
-}
-
-// Restores select box state to saved value from localStorage.
-function populateOptions() {
- for (var i = 0; i < editableFields.length; i++) {
- var val = bgSettings.get(editableFields[i]) || "";
- setFieldValue($(editableFields[i]), val);
- }
- onDataLoaded();
-}
-
-function restoreToDefaults() {
- for (var i = 0; i < editableFields.length; i++) {
- var val = bgSettings.defaults[editableFields[i]] || "";
- setFieldValue($(editableFields[i]), val);
- }
- onDataLoaded();
- enableSaveButton();
-}
-
-function setFieldValue(field, value) {
- if (field.getAttribute('type') == 'checkbox')
- field.checked = value;
- else {
- field.value = value;
- field.setAttribute("savedValue", value);
- }
-}
-
-function openAdvancedOptions(event) {
- var elements = document.getElementsByClassName("advancedOption");
- for (var i = 0; i < elements.length; i++)
- elements[i].style.display = (elements[i].style.display == "table-row") ? "none" : "table-row";
- event.preventDefault();
-}
diff --git a/options/options.coffee b/options/options.coffee
new file mode 100644
index 00000000..6300dbcd
--- /dev/null
+++ b/options/options.coffee
@@ -0,0 +1,90 @@
+$ = (id) -> document.getElementById id
+
+bgSettings = chrome.extension.getBackgroundPage().Settings
+
+editableFields = ["scrollStepSize", "excludedUrls", "linkHintCharacters", "userDefinedLinkHintCss",
+ "keyMappings", "filterLinkHints", "previousPatterns", "nextPatterns", "hideHud"]
+
+canBeEmptyFields = ["excludedUrls", "keyMappings", "userDefinedLinkHintCss"]
+
+postSaveHooks = keyMappings: (value) ->
+ commands = chrome.extension.getBackgroundPage().Commands
+ commands.clearKeyMappingsAndSetDefaults()
+ commands.parseCustomKeyMappings value
+ chrome.extension.getBackgroundPage().refreshCompletionKeysAfterMappingSave()
+
+document.addEventListener "DOMContentLoaded", ->
+ populateOptions()
+
+ for field in editableFields
+ $(field).addEventListener "keyup", onOptionKeyup, false
+ $(field).addEventListener "change", enableSaveButton, false
+ $(field).addEventListener "change", onDataLoaded, false
+
+ $("advancedOptions").addEventListener "click", openAdvancedOptions, false
+ $("showCommands").addEventListener "click", (->
+ showHelpDialog chrome.extension.getBackgroundPage().helpDialogHtml(true, true, "Command Listing"), frameId
+ ), false
+ document.getElementById("restoreSettings").addEventListener "click", restoreToDefaults
+ document.getElementById("saveOptions").addEventListener "click", saveOptions
+
+onOptionKeyup = (event) ->
+ if (event.target.getAttribute("type") isnt "checkbox" and
+ event.target.getAttribute("savedValue") isnt event.target.value)
+ enableSaveButton()
+
+onDataLoaded = ->
+ $("linkHintCharacters").readOnly = $("filterLinkHints").checked
+
+enableSaveButton = ->
+ $("saveOptions").removeAttribute "disabled"
+
+# Saves options to localStorage.
+saveOptions = ->
+
+ # If the value is unchanged from the default, delete the preference from localStorage; this gives us
+ # the freedom to change the defaults in the future.
+ for fieldName in editableFields
+ field = $(fieldName)
+ if field.getAttribute("type") is "checkbox"
+ fieldValue = field.checked
+ else
+ fieldValue = field.value.trim()
+ field.value = fieldValue
+
+ # If it's empty and not a field that we allow to be empty, restore to the default value
+ if not fieldValue and canBeEmptyFields.indexOf(fieldName) is -1
+ bgSettings.clear fieldName
+ fieldValue = bgSettings.get(fieldName)
+ else
+ bgSettings.set fieldName, fieldValue
+ $(fieldName).value = fieldValue
+ $(fieldName).setAttribute "savedValue", fieldValue
+ postSaveHooks[fieldName] fieldValue if postSaveHooks[fieldName]
+
+ $("saveOptions").disabled = true
+
+# Restores select box state to saved value from localStorage.
+populateOptions = ->
+ for field in editableFields
+ val = bgSettings.get(field) or ""
+ setFieldValue $(field), val
+ onDataLoaded()
+
+restoreToDefaults = ->
+ for field in editableFields
+ val = bgSettings.defaults[field] or ""
+ setFieldValue $(field), val
+ onDataLoaded()
+ enableSaveButton()
+
+setFieldValue = (field, value) ->
+ unless field.getAttribute("type") is "checkbox"
+ field.value = value
+ field.setAttribute "savedValue", value
+
+openAdvancedOptions = (event) ->
+ elements = document.getElementsByClassName("advancedOption")
+ for element in elements
+ element.style.display = (if (element.style.display is "table-row") then "none" else "table-row")
+ event.preventDefault()
diff --git a/options/options.html b/options/options.html
new file mode 100644
index 00000000..93a402fb
--- /dev/null
+++ b/options/options.html
@@ -0,0 +1,227 @@
+
+
+ Vimium Options
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Vimium - Options
+
+
+ | Scroll step size |
+
+ px
+ |
+
+
+
+ Excluded URLs
+
+
+ e.g. http*://mail.google.com/*
+ This will disable Vimium on Gmail.
+ Enter one URL per line.
+
+ |
+
+
+ |
+ Advanced options »
+ |
+
+
+ Custom key
mappings |
+
+
+
+
+ Enter commands to remap your keys. Available commands:
+
+ map j scrollDown
+ unmap j
+ unmapAll
+ " this is a comment
+ # this is also a comment
+
+ Show available commands.
+
+ |
+
+
+ Characters used
for link hints |
+
+
+
+ The characters placed next to each link after typing "F" to enter link hinting mode.
+
+ |
+
+
+ | CSS for link hints |
+
+
+
+ The CSS used to style the characters next to each link hint.
+ Note: these styles are used in addition to and take precedence over Vimium's
+ default styles.
+
+ |
+
+
+ |
+
+
+
+ After typing "F" to enter link hinting mode, this option lets you type the text of a link
+ to select it.
+
+ |
+
+
+ |
+
+
+
+ The Heads-Up Display appears when typing into text boxes.
+
+ |
+
+
+ | Previous Patterns |
+
+
+
+ Vimium will match against these patterns when using the "navigate to the previous page"
+ command.
+
+ |
+
+
+ | Next Patterns |
+
+
+
+ Vimium will match against these patterns when using the "navigate to the next page" command.
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+ To view all available shortcuts, type ? to show the Vimium help dialog.
+
+
+
--
cgit v1.2.3