Temporary Reversion of contributions by @alexbt

This commit temporarily reverts the contributions
made by @alexbt between Jan 25, 2017 and Oct 11, 2017.

Reason: to merge the significant refactoring of the codebase
made in: benbernard#9

The contributions made by @alexbt will be
restored on top of the refactoring commits.

The following is a list of the
commits that have been reverted:

df04f70 Bump version
11677eb Merge pull request benbernard#8 from alexbt/fix-empty-unresolved
45a7834 Track unresolved comments with Map
999adab Merge pull request benbernard#7 from alexbt/unresolved-files-bottom
30068dd Add unresolved comments at bottom of files tab
f822008 Update version number
5af02ab Merge pull request benbernard#6 from alexbt/options-style
ee5528a Merge pull request benbernard#5 from alexbt/files-tab
82a1975 Merge pull request benbernard#4 from alexbt/unresolved-bottom
64bcd6a Use chrome style options page
519c5e2 Display unresolved comments at the bottom
42fe47c Load thread comments from the 'files' tab

Author: arjun-menon

manifest.json

@@ -3,7 +3,7 @@
 
   "name": "Github Comment Tracker",
   "description": "Tracks resolved / unresolved state of comments on github pull requests",
-  "version": "1.1.6",
+  "version": "1.1.8",
 
   "permissions": [
     "https://github.com/",
@@ -16,5 +16,9 @@
     "css": ["main.css"]
   }],
 
-  "options_page": "options.html"
+  "options_page": "options.html",
+  "options_ui": {
+    "chrome_style": true,
+    "page": "options.html"
+  }
 }

tracker.js

@@ -6,6 +6,7 @@
 // Other file forwarders
 var Parse;
 var waitForKeyElements;
+var unresolvedCommentsMap = {};
 
 var findAllThreads = function () {
   var threads = [];
@@ -32,6 +33,14 @@ var findAllThreads = function () {
     }
   });
 
+  $('#files .review-comment').each(function () {
+    threads.push({
+      id: this.id,
+      comments: $(this),
+      lastCommentId: this.id,
+    });
+  });
+
   return threads;
 };
 
@@ -134,7 +143,16 @@ var updateMergeButton = function () {
     }
   } else {
     if (!allThreadsResolved()) {
-      $('.merge-message').before(
+
+      //map to array of values
+      var unresolvedCommentsArray = []
+      for (var key in unresolvedCommentsMap) {
+        if (unresolvedCommentsMap.hasOwnProperty(key)) {
+          unresolvedCommentsArray.push(unresolvedCommentsMap[key])
+        }
+      }
+
+      var commentStatus =
         '<div class="branch-action-item comment-track-status">' +
         '    <div class="branch-action-item-icon completeness-indicator completeness-indicator-problem">' +
         '      <svg aria-hidden="true" class="octicon octicon-alert" height="16" role="img" version="1.1" viewBox="0 0 16 16" width="16"><path d="M15.72 12.5l-6.85-11.98C8.69 0.21 8.36 0.02 8 0.02s-0.69 0.19-0.87 0.5l-6.85 11.98c-0.18 0.31-0.18 0.69 0 1C0.47 13.81 0.8 14 1.15 14h13.7c0.36 0 0.69-0.19 0.86-0.5S15.89 12.81 15.72 12.5zM9 12H7V10h2V12zM9 9H7V5h2V9z"></path></svg>' +
@@ -143,8 +161,14 @@ var updateMergeButton = function () {
         '      <span class="status-meta">' +
         '        See above for red unresolved comments' +
         '      </span>' +
-        '  </div>'
-      );
+        '      <lu><li>' + unresolvedCommentsArray.join('</li><li>') + "</li></lu>" +
+        '  </div>';
+
+      //discussions tab
+      $('.merge-message').before(commentStatus);
+
+      //files tab
+      $('#files').after(commentStatus);
     }
   }
 };
@@ -175,6 +199,7 @@ var makeButton = function (elem, threadInfo) {
   if ($elem.find(actionSelector).length === 0) {
     actionSelector = '.timeline-comment-actions';
   }
+  delete unresolvedCommentsMap[threadInfo.id];
 
   var string;
   if (threadInfo.resolved) {
@@ -196,6 +221,11 @@ var makeButton = function (elem, threadInfo) {
     string = '<span class="octicon comment-track-action comment-track-resolve"></span>';
     $elem.find(actionSelector).prepend(string);
 
+    var content = $elem.find(actionSelector)[0].innerText.trim();
+    if (content != "") {
+      unresolvedCommentsMap[threadInfo.id] = content;
+    }
+
     $elem.find('.comment-track-resolve').on('click', function (event) {
       event.preventDefault();
       var tracker = threadInfo.tracker || new CommentTracker();