Merge branch…

Merge branch '26825-diff-unfolding-within-merge-request-changes-tab-triggers-two-ajax-requests' into 'master' Resolve diff unfolding redundant ajax request Closes #26825 See merge request !8630

Merge branch…
b9c57808 · Jacob Schatz · d5a9e934 · 7c29f03e · b9c57808
Commit b9c57808 authored Feb 03, 2017 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

diff.js.es6 app/assets/javascripts/diff.js.es6 +7 -4

No files found.
--- a/app/assets/javascripts/diff.js.es6
+++ b/app/assets/javascripts/diff.js.es6
@@ -4,6 +4,7 @@

 (() => {
  const UNFOLD_COUNT = 20;
+  let isBound = false;

  class Diff {
    constructor() {
@@ -17,10 +18,12 @@
        $('.content-wrapper .container-fluid').removeClass('container-limited');
      }

-      $(document)
-        .off('click', '.js-unfold, .diff-line-num a')
-        .on('click', '.js-unfold', this.handleClickUnfold.bind(this))
-        .on('click', '.diff-line-num a', this.handleClickLineNum.bind(this));
+      if (!isBound) {
+        $(document)
+          .on('click', '.js-unfold', this.handleClickUnfold.bind(this))
+          .on('click', '.diff-line-num a', this.handleClickLineNum.bind(this));
+        isBound = true;
+      }

      this.openAnchoredDiff();
    }