From 4619901632ddb6f2881897e95aa69028c2e6632a Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 17 May 2017 13:43:07 +0000
Subject: Merge branch 'dm-scroll-to-blob-user-content' into 'master'

Scroll to anchor when blob content is loaded

See merge request !11427

Conflicts:
	app/assets/javascripts/blob/viewer/index.js
---
 app/assets/javascripts/blob/viewer/index.js | 39 +++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/blob/viewer/index.js b/app/assets/javascripts/blob/viewer/index.js
index 07d67d49aa5..fe6d02b68e2 100644
--- a/app/assets/javascripts/blob/viewer/index.js
+++ b/app/assets/javascripts/blob/viewer/index.js
@@ -115,6 +115,45 @@ export default class BlobViewer {
 
     this.toggleCopyButtonState();
 
+<<<<<<< HEAD
     this.loadViewer(newViewer);
+=======
+    BlobViewer.loadViewer(newViewer)
+    .then((viewer) => {
+      $(viewer).syntaxHighlight();
+
+      this.$fileHolder.trigger('highlight:line');
+      gl.utils.handleLocationHash();
+
+      this.toggleCopyButtonState();
+    })
+    .catch(() => new Flash('Error loading viewer'));
+  }
+
+  static loadViewer(viewerParam) {
+    const viewer = viewerParam;
+    const url = viewer.getAttribute('data-url');
+
+    return new Promise((resolve, reject) => {
+      if (!url || viewer.getAttribute('data-loaded') || viewer.getAttribute('data-loading')) {
+        resolve(viewer);
+        return;
+      }
+
+      viewer.setAttribute('data-loading', 'true');
+
+      $.ajax({
+        url,
+        dataType: 'JSON',
+      })
+      .fail(reject)
+      .done((data) => {
+        viewer.innerHTML = data.html;
+        viewer.setAttribute('data-loaded', 'true');
+
+        resolve(viewer);
+      });
+    });
+>>>>>>> b957df9... Merge branch 'dm-scroll-to-blob-user-content' into 'master'
   }
 }
-- 
cgit v1.2.1


From 16c37592835dbd62ef47a7f149a3fe391611ea91 Mon Sep 17 00:00:00 2001
From: Tim Zallmann <tzallmann@gitlab.com>
Date: Fri, 19 May 2017 14:02:18 +0200
Subject: Fixed merging conflict on the blob load viewer

---
 app/assets/javascripts/blob/viewer/index.js | 40 +----------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/blob/viewer/index.js b/app/assets/javascripts/blob/viewer/index.js
index fe6d02b68e2..28913ae4741 100644
--- a/app/assets/javascripts/blob/viewer/index.js
+++ b/app/assets/javascripts/blob/viewer/index.js
@@ -83,6 +83,7 @@ export default class BlobViewer {
       viewer.setAttribute('data-loaded', 'true');
 
       this.$fileHolder.trigger('highlight:line');
+      gl.utils.handleLocationHash();
 
       this.toggleCopyButtonState();
     });
@@ -115,45 +116,6 @@ export default class BlobViewer {
 
     this.toggleCopyButtonState();
 
-<<<<<<< HEAD
     this.loadViewer(newViewer);
-=======
-    BlobViewer.loadViewer(newViewer)
-    .then((viewer) => {
-      $(viewer).syntaxHighlight();
-
-      this.$fileHolder.trigger('highlight:line');
-      gl.utils.handleLocationHash();
-
-      this.toggleCopyButtonState();
-    })
-    .catch(() => new Flash('Error loading viewer'));
-  }
-
-  static loadViewer(viewerParam) {
-    const viewer = viewerParam;
-    const url = viewer.getAttribute('data-url');
-
-    return new Promise((resolve, reject) => {
-      if (!url || viewer.getAttribute('data-loaded') || viewer.getAttribute('data-loading')) {
-        resolve(viewer);
-        return;
-      }
-
-      viewer.setAttribute('data-loading', 'true');
-
-      $.ajax({
-        url,
-        dataType: 'JSON',
-      })
-      .fail(reject)
-      .done((data) => {
-        viewer.innerHTML = data.html;
-        viewer.setAttribute('data-loaded', 'true');
-
-        resolve(viewer);
-      });
-    });
->>>>>>> b957df9... Merge branch 'dm-scroll-to-blob-user-content' into 'master'
   }
 }
-- 
cgit v1.2.1