Allow tab switching to be optional

brentyates · Jun 10, 2015 · 2e706bc · 2e706bc
1 parent 6a28f09
commit 2e706bc
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 17 deletions.
diff --git a/options.html b/options.html
@@ -20,6 +20,11 @@ <h1>Options</h1>
                             </label>
                             <input id="url" type="url" class="form-control">
                         </div>
+                        <div class="form-group">
+                            <label>
+                                Allow backtick to switch tabs on pull requests? <input id="tabSwitchingEnabled" type="checkbox">
+                            </label>
+                        </div>
                         <button class="btn btn-primary" id="save">Save</button>
                     </form>
                     <div id="status" class="bg-success"></div>

diff --git a/options.js b/options.js
@@ -36,6 +36,7 @@
   $(document).ready(function () {
     loadItemsFromChromeStorage({
       url: '',
+      tabSwitchingEnabled: false
       // Add new items here to get them loaded and their values put in the form.
     }, setFormValues);
 
@@ -44,9 +45,11 @@
 
       var $form = $(e.currentTarget);
       var url = $form.find('#url').val();
+      var tabSwitchingEnabled = $form.find('#tabSwitchingEnabled').prop('checked');
 
       saveOptionsToChromeStorage({
         'url': url,
+        'tabSwitchingEnabled': tabSwitchingEnabled,
       }, function () {
           var status = $('#status');
           status.text('Options saved.');

diff --git a/pullrequest.js b/pullrequest.js
@@ -64,7 +64,7 @@ function moveToPreviousTab($pullRequestTabs, selectedTabIndex) {
     $pullRequestTabs[selectedTabIndex].click();
 }
 
-chrome.storage.sync.get({url: ''}, function(items) {
+chrome.storage.sync.get({url: '', tabSwitchingEnabled: false}, function(items) {
     if (items.url == window.location.origin ||
         "https://github.com" === window.location.origin) {
 
@@ -93,22 +93,24 @@ chrome.storage.sync.get({url: ''}, function(items) {
 
         $body.on('click', '.js-collapse-deletions', collapseDeletions);
 
-        $body.on('keydown', function (e) {
-            if (e.keyCode !== 192 || e.target.nodeName === 'TEXTAREA') {
-                return;
-            }
-
-            var $pullRequestTabs = $('.js-pull-request-tab');
-            var selectedTabIndex = $('.js-pull-request-tab.selected').index();
-
-            if (e.shiftKey) {
-                // Making this work like it would in other apps, where the shift
-                // key makes the cmd+tilde go backwards through the list.
-                moveToPreviousTab($pullRequestTabs, selectedTabIndex);
-            } else {
-                moveToNextTab($pullRequestTabs, selectedTabIndex);
-            }
-        });
+        if (items.tabSwitchingEnabled) {
+          $body.on('keydown', function (e) {
+              if (e.keyCode !== 192 || e.target.nodeName === 'TEXTAREA') {
+                  return;
+              }
+
+              var $pullRequestTabs = $('.js-pull-request-tab');
+              var selectedTabIndex = $('.js-pull-request-tab.selected').index();
+
+              if (e.shiftKey) {
+                  // Making this work like it would in other apps, where the shift
+                  // key makes the cmd+tilde go backwards through the list.
+                  moveToPreviousTab($pullRequestTabs, selectedTabIndex);
+              } else {
+                  moveToNextTab($pullRequestTabs, selectedTabIndex);
+              }
+          });
+        }
 
         // Actions per changed file
         chrome.runtime.onConnect.addListener(function (port) {