Merge pull request #2870 from smblott-github/version-number-in-popup

Include the Vimium version number in the popup.

3 files changed, 9 insertions, 2 deletions

diff --git a/pages/options.coffee b/pages/options.coffee
index 9e95bcd3..d26154ca 100644
--- a/pages/options.coffee
+++ b/pages/options.coffee
@@ -335,6 +335,11 @@ initPopupPage = ->
     updateState()
     document.addEventListener "keyup", updateState
 
+  # Install version number.
+  manifest = chrome.runtime.getManifest()
+  $("versionNumber").textContent = manifest.version
+
+
 #
 # Initialization.
 document.addEventListener "DOMContentLoaded", ->
diff --git a/pages/options.css b/pages/options.css
index dab342a3..1ebff063 100644
--- a/pages/options.css
+++ b/pages/options.css
@@ -221,7 +221,7 @@ input.pattern, input.passKeys, .exclusionHeaderText {
   min-height: 30px;
   max-height: 30px;
 }
-#helpText {
+#helpText, #versionAndOptions {
   font-size: 12px;
 }
 #saveOptionsTableData {
diff --git a/pages/popup.html b/pages/popup.html
index 03c466d6..971ac04e 100644
--- a/pages/popup.html
+++ b/pages/popup.html
@@ -69,7 +69,9 @@
             <td id="stateLine" style="width: 99%">
               <span id="helpText">These are the rules matching this page.</span>
               <br/>
-              <a id="optionsLink" target="_blank" tabindex="99999">Options</a>
+              <span id="versionAndOptions">
+                <a id="optionsLink" target="_blank" tabindex="99999">Options</a> (version <span id="versionNumber"></span>).
+              </span>
             </td>
             <td valign="top">
               <button id="exclusionAddButton">Add Rule</button>