UX Fixes for Enterprise

background.js

@@ -1,21 +1,13 @@
-
-var gh_enterprise;
+const urls = ['github.com'];
 
 function host(url) {
-    return url.trim().replace(/^(?:https?:\/\/)([^\/?#]+).*$/, '$1').toLowerCase();
+    return new URL(url).hostname;
 }
 
 chrome.tabs.onUpdated.addListener(function (tabId, changeInfo, tab) {
-  var urls = ['github.com'];
-  if (gh_enterprise) {
-    gh_enterprise = gh_enterprise.replace('https://', '');
-    gh_enterprise = gh_enterprise.replace('http://', '');
-    urls.push(gh_enterprise);
-  }
-
-  if (-1 !== urls.indexOf(host(tab.url))) {
+  if (urls.includes(host(tab.url))) {
     chrome.pageAction.show(tabId);
-    if (tab.url.indexOf('github.com') < 0) {
+    if (!tab.url.includes('github.com')) {
       chrome.tabs.insertCSS(null, {file: "pullrequest.css"});
       chrome.tabs.executeScript(null, {file: "jquery-1.9.1.min.js"});
       chrome.tabs.executeScript(null, {file: "enterprise.js"});
@@ -24,5 +16,5 @@ chrome.tabs.onUpdated.addListener(function (tabId, changeInfo, tab) {
 });
 
 chrome.storage.sync.get({url: ''}, function(items) {
-    gh_enterprise = items.url;
+    urls.push(host(items.url));
 });

enterprise.js

@@ -7,11 +7,16 @@ var repositoryName;
 var repositoryAuthor;
 var autoCollapseExpressions;
 
+function onFilesPage() {
+    return window.location.href.indexOf('files') !== -1;
+}
+
 function htmlIsInjected() {
   return $('.pretty-pull-requests-inserted').length > 0;
 }
 
 function injectHtml() {
+  if (!onFilesPage()) return;
   $('<span class="pretty-pull-requests collapse-lines">' +
         '<label><input type="checkbox" class="js-collapse-additions" checked="yes">+</label>' +
         '<label><input type="checkbox" class="js-collapse-deletions" checked="yes">-</label>' +
@@ -54,7 +59,7 @@ function getIds(path) {
 }
 
 function getId(path) {
-    var $span = $('span[title="' + path + '"]').closest('[id^=diff-]');
+    var $span = $('a[title="' + path + '"]').closest('[id^=diff-]');
     var $a = $span.prev('a[name^=diff-]');
     var id = $a.attr('name');
 
@@ -89,7 +94,7 @@ function toggleDiff(id, duration, display) {
 
     if ($a) {
         var $span = $a.next('div[id^=diff-]');
-        var $data = $span.children('.data, .image');
+        var $data = $span.children('.js-file-content');
         var $bottom = $span.children('.bottom-collapse');
 
         switch (display) {
@@ -147,16 +152,16 @@ function initDiffs() {
     autoCollapse();
 }
 
-function clickTitle() {
+function clickTitle(e) {
+    e.preventDefault();
     var path = $(this).attr('title') || this.innerText;
     var id = getId(path);
-    debugger;
 
     return toggleDiff(id);
 }
 
 function clickCollapse() {
-    var $span = $(this).prevAll('.file-header');
+    var $span = $(this).closest('.js-file-content').prev('.file-header');
     var path = $span.attr('data-path');
     var id = getId(path);
 
@@ -170,23 +175,28 @@ function autoCollapse() {
 }
 
 chrome.storage.sync.get({url: '', saveCollapsedDiffs: true, tabSwitchingEnabled: false, autoCollapseExpressions: []}, function(items) {
-    if (items.url == window.location.origin ||
+    if (items.url === window.location.origin ||
         "https://github.com" === window.location.origin) {
 
         autoCollapseExpressions = items.autoCollapseExpressions;
 
+        var interval = null;
         var injectHtmlIfNecessary = function () {
             if (!htmlIsInjected()) {
-                collectUniquePageInfo();
-                injectHtml();
-                initDiffs();
-                $body.on('click', '.user-select-contain, .js-selectable-text, .file-info .link-gray-dark', clickTitle);
-                $body.on('click', '.bottom-collapse', clickCollapse);
-                $body.on('click', '.js-collapse-additions', collapseAdditions);
-                $body.on('click', '.js-collapse-deletions', collapseDeletions);
+                if (onFilesPage()) {
+                    collectUniquePageInfo();
+                    injectHtml();
+                    initDiffs();
+                    $body.on('click', '.user-select-contain, .js-selectable-text, .file-info .link-gray-dark', clickTitle);
+                    $body.on('click', '.bottom-collapse', clickCollapse);
+                    $body.on('click', '.js-collapse-additions', collapseAdditions);
+                    $body.on('click', '.js-collapse-deletions', collapseDeletions);
+                }
+            } else {
+                clearInterval(interval);
             }
-            setTimeout(injectHtmlIfNecessary, 1000);
         };
+        interval = setInterval(injectHtmlIfNecessary, 1000);
         var $body = $('body');
         useLocalStorage = items.saveCollapsedDiffs;