commit 6c37cf7543666d9c073de0f219b5f71289add8e2
author Andrew Bonventre <andybons@chromium.org> Thu May 12 16:15:53 2016 -0400
committer Andrew Bonventre <andybons@chromium.org> Thu May 12 16:17:09 2016 -0400
tree 55bf7525375978474a35cfd4773667737ef10b3d
parent b1921cd670771d1fd2aa2f87dd48e9b086eb0696

Minor cleanup within change view and diff view

+ Break some things out into functions in change view.
+ Move position of preferences and diff mode toggle.

Change-Id: I2deab3af58193a0bb316e86c8b577a24e9b7a166

polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js

diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
index a3d2146..106c67f 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
@@ -171,7 +171,7 @@
     },
 
     _paramsChanged: function(value) {
-      if (value.view != this.tagName.toLowerCase()) { return; }
+      if (value.view !== this.tagName.toLowerCase()) { return; }
 
       this._changeNum = value.changeNum;
       this._patchRange = {
@@ -188,29 +188,15 @@
         this._resetFileListViewState();
       }
 
-      if (!this._changeNum) {
-        return;
-      }
       this._reload().then(function() {
         this.$.messageList.topMargin = this._headerEl.offsetHeight;
 
         // Allow the message list to render before scrolling.
         this.async(function() {
-          var msgPrefix = '#message-';
-          var hash = window.location.hash;
-          if (hash.indexOf(msgPrefix) == 0) {
-            this.$.messageList.scrollToMessage(hash.substr(msgPrefix.length));
-          }
+          this._maybeScrollToMessage();
         }.bind(this), 1);
 
-        this._getLoggedIn().then(function(loggedIn) {
-          if (!loggedIn) { return; }
-
-          if (this.viewState.showReplyDialog) {
-            this.$.replyOverlay.open();
-            this.set('viewState.showReplyDialog', false);
-          }
-        }.bind(this));
+        this._maybeShowReplyDialog();
 
         this.$.jsAPI.handleEvent(this.$.jsAPI.EventType.SHOW_CHANGE, {
           change: this._change,
@@ -219,6 +205,25 @@
       }.bind(this));
     },
 
+    _maybeScrollToMessage: function() {
+      var msgPrefix = '#message-';
+      var hash = window.location.hash;
+      if (hash.indexOf(msgPrefix) === 0) {
+        this.$.messageList.scrollToMessage(hash.substr(msgPrefix.length));
+      }
+    },
+
+    _maybeShowReplyDialog: function() {
+      this._getLoggedIn().then(function(loggedIn) {
+        if (!loggedIn) { return; }
+
+        if (this.viewState.showReplyDialog) {
+          this.$.replyOverlay.open();
+          this.set('viewState.showReplyDialog', false);
+        }
+      }.bind(this));
+    },
+
     _resetFileListViewState: function() {
       this.set('viewState.selectedFileIndex', 0);
       this.set('viewState.changeNum', this._changeNum);