Remove default bootstrap, add custom bootstrap

Remove option to toggle jstree creation

options.html

@@ -20,12 +20,6 @@ <h1>Options</h1>
                             </label>
                             <input id="url" type="url" class="form-control">
                         </div>
-                        <div class="checkbox">
-                            <label>
-                                <input id="doJsTree" type="checkbox" /> Make a diff tree on pull requests?
-                            </label>
-                            <p class="help-block">If you find Prettypullrequests is slow to load on pull request pages, you can try turning this off.</p>
-                        </div>
                         <button class="btn btn-primary" id="save">Save</button>
                     </form>
                     <div id="status" class="bg-success"></div>

options.js

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

pullrequest.js

@@ -1,18 +1,60 @@
 
 var isGitHub = $("meta[property='og:site_name']").attr('content') === 'GitHub';
 
+function htmlIsInjected() {
+  return $('.collapse-lines').length !== 0;
+}
+
+function injectHtml() {
+  $('<span class="collapse-lines">' +
+        '<label><input type="checkbox" class="js-collapse-additions" checked="yes">+</label>' +
+        '<label><input type="checkbox" class="js-collapse-deletions" checked="yes">-</label>' +
+    '</span>').insertAfter('.actions, .file-actions');
+
+  $('<div class="bottom-collapse meta">Click to Collapse</div>').insertAfter('.data.highlight.blob-wrapper');
+}
+
+function collapseAdditions() {
+    if (isGitHub) {
+        $(this).closest('[id^=diff-]').find('.blob-code-addition').parent('tr').slideToggle();
+    } else {
+        $(this).closest('[id^=diff-]').find('.gi').slideToggle();
+    }
+}
+
+function collapseDeletions() {
+    if (isGitHub) {
+        $(this).closest('[id^=diff-]').find('.blob-code-deletion').parent('tr').slideToggle();
+    } else {
+        $(this).closest('[id^=diff-]').find('.gd').slideToggle();
+    }
+}
+
+function getDiffSpans(path) {
+    return $('.js-selectable-text').filter(function () {
+        return this.innerHTML.trim().match(path);
+    });
+}
+
+function collapseDiffs(path) {
+    var spans = getDiffSpans(path).closest('[id^=diff-]');
+    spans.children('.data, .image').slideUp(200);
+    spans.children('div.bottom-collapse').hide();
+}
+
+function expandDiffs(path) {
+    var spans = getDiffSpans(path).closest('[id^=diff-]');
+    spans.children('.data, .image').slideDown(200);
+    spans.children('div.bottom-collapse').show();
+}
+
 chrome.storage.sync.get({url: ''}, function(items) {
     if (items.url == window.location.origin ||
-        "https://github.com" === window.location.origin
-    ) {
-        $(
-          '<span class="collapse-lines">' +
-              '<label><input type="checkbox" class="js-collapse-additions" checked="yes">+</label>' +
-              '<label><input type="checkbox" class="js-collapse-deletions" checked="yes">-</label>' +
-          '</span>'
-        ).insertAfter('.actions, .file-actions');
+        "https://github.com" === window.location.origin) {
 
-        $('<div class="bottom-collapse meta">Click to Collapse</div>').insertAfter('.data.highlight.blob-wrapper');
+        if (!htmlIsInjected()) {
+          injectHtml();
+        }
 
         var $body = $('body');
 
@@ -61,37 +103,3 @@ chrome.storage.sync.get({url: ''}, function(items) {
         });
     }
 });
-
-function collapseAdditions() {
-    if (isGitHub) {
-        $(this).closest('[id^=diff-]').find('.blob-code-addition').parent('tr').slideToggle();
-    } else {
-        $(this).closest('[id^=diff-]').find('.gi').slideToggle();
-    }
-}
-
-function collapseDeletions() {
-    if (isGitHub) {
-        $(this).closest('[id^=diff-]').find('.blob-code-deletion').parent('tr').slideToggle();
-    } else {
-        $(this).closest('[id^=diff-]').find('.gd').slideToggle();
-    }
-}
-
-function getDiffSpans(path) {
-    return $('.js-selectable-text').filter(function () {
-        return this.innerHTML.trim().match(path);
-    });
-}
-
-function collapseDiffs(path) {
-    var spans = getDiffSpans(path).closest('[id^=diff-]');
-    spans.children('.data, .image').slideUp(200);
-    spans.children('div.bottom-collapse').hide();
-}
-
-function expandDiffs(path) {
-    var spans = getDiffSpans(path).closest('[id^=diff-]');
-    spans.children('.data, .image').slideDown(200);
-    spans.children('div.bottom-collapse').show();
-}