SONAR-7373 drop loading of code by scrolling

diff --git a/server/sonar-web/src/main/js/components/source-viewer/main.js b/server/sonar-web/src/main/js/components/source-viewer/main.js
index 672378ca6289ad81775e2b3f8678faae0b6050a3..aef8716c1013e26c020138f119105efbcc7e166f 100644 (file)
--- a/server/sonar-web/src/main/js/components/source-viewer/main.js
+++ b/server/sonar-web/src/main/js/components/source-viewer/main.js
@@ -71,7 +71,9 @@ export default Marionette.LayoutView.extend({
       'click .source-line-with-issues': 'onLineIssuesClick',
       'click .source-line-number[data-line-number]': 'onLineNumberClick',
       'mouseenter .source-line-filtered .source-line-filtered-container': 'showFilteredTooltip',
-      'mouseleave .source-line-filtered .source-line-filtered-container': 'hideFilteredTooltip'
+      'mouseleave .source-line-filtered .source-line-filtered-container': 'hideFilteredTooltip',
+      'click @ui.sourceBeforeSpinner': 'loadSourceBefore',
+      'click @ui.sourceAfterSpinner': 'loadSourceAfter'
     };
   },
 
@@ -83,8 +85,6 @@ export default Marionette.LayoutView.extend({
     this.listenTo(this.issues, 'change:severity', this.onIssuesSeverityChange);
     this.listenTo(this.issues, 'locations', this.toggleIssueLocations);
     this.issueViews = [];
-    this.loadSourceBeforeThrottled = _.throttle(this.loadSourceBefore, 1000);
-    this.loadSourceAfterThrottled = _.throttle(this.loadSourceAfter, 1000);
     this.highlightedLine = null;
     this.listenTo(this, 'loaded', this.onLoaded);
   },
@@ -545,37 +545,15 @@ export default Marionette.LayoutView.extend({
   },
 
   bindScrollEvents () {
-    const that = this;
-    let p = this.$el.scrollParent();
-    if (p.is(document) || p.is('body')) {
-      p = $(window);
-    }
-    p.on('scroll.source-viewer', function () {
-      that.onScroll();
-    });
+    // no op
   },
 
   unbindScrollEvents () {
-    let p = this.$el.scrollParent();
-    if (p.is(document) || p.is('body')) {
-      p = $(window);
-    }
-    p.off('scroll.source-viewer');
+    // no op
   },
 
   onScroll () {
-    let p = this.$el.scrollParent();
-    if (p.is(document) || p.is('body')) {
-      p = $(window);
-    }
-    const pTopOffset = p.offset() != null ? p.offset().top : 0;
-    const pPosition = p.scrollTop() + pTopOffset;
-    if (this.model.get('hasSourceBefore') && (pPosition <= this.ui.sourceBeforeSpinner.offset().top)) {
-      this.loadSourceBeforeThrottled();
-    }
-    if (this.model.get('hasSourceAfter') && (pPosition + p.height() >= this.ui.sourceAfterSpinner.offset().top)) {
-      return this.loadSourceAfterThrottled();
-    }
+    // no op
   },
 
   scrollToLine (line) {
@@ -622,8 +600,11 @@ export default Marionette.LayoutView.extend({
     return this;
   },
 
-  loadSourceBefore () {
+  loadSourceBefore (e) {
+    e.preventDefault();
     this.unbindScrollEvents();
+    this.$('.js-component-viewer-loading-before').removeClass('hidden');
+    this.$('.js-component-viewer-source-before').addClass('hidden');
     const that = this;
     let source = this.model.get('source');
     const firstLine = _.first(source).line;
@@ -668,8 +649,11 @@ export default Marionette.LayoutView.extend({
     });
   },
 
-  loadSourceAfter () {
+  loadSourceAfter (e) {
+    e.preventDefault();
     this.unbindScrollEvents();
+    this.$('.js-component-viewer-loading-after').removeClass('hidden');
+    this.$('.js-component-viewer-source-after').addClass('hidden');
     const that = this;
     let source = this.model.get('source');
     const lastLine = _.last(source).line;

diff --git a/server/sonar-web/src/main/js/components/source-viewer/templates/source-viewer.hbs b/server/sonar-web/src/main/js/components/source-viewer/templates/source-viewer.hbs
index 570a91ce1679fa31ca839953169becb73b46a860..15b738886335e0caf51952607ed039a7aba51962 100644 (file)
--- a/server/sonar-web/src/main/js/components/source-viewer/templates/source-viewer.hbs
+++ b/server/sonar-web/src/main/js/components/source-viewer/templates/source-viewer.hbs
@@ -6,8 +6,13 @@
 
     {{#if hasSourceBefore}}
       <div class="source-viewer-more-code">
-        <i class="spinner js-component-viewer-source-before"></i>
-        <span class="note spacer-left">{{t 'source_viewer.loading_more_code'}}</span>
+        <button class="js-component-viewer-source-before">
+          {{t 'source_viewer.load_more_code'}}
+        </button>
+        <div class="js-component-viewer-loading-before hidden">
+          <i class="spinner"></i>
+          <span class="note spacer-left">{{t 'source_viewer.loading_more_code'}}</span>
+        </div>
       </div>
     {{/if}}
 
@@ -90,8 +95,13 @@
 
     {{#if hasSourceAfter}}
       <div class="source-viewer-more-code">
-        <i class="spinner js-component-viewer-source-after"></i>
-        <span class="note spacer-left">{{t 'source_viewer.loading_more_code'}}</span>
+        <button class="js-component-viewer-source-after">
+          {{t 'source_viewer.load_more_code'}}
+        </button>
+        <div class="js-component-viewer-loading-after hidden">
+          <i class="spinner"></i>
+          <span class="note spacer-left">{{t 'source_viewer.loading_more_code'}}</span>
+        </div>
       </div>
     {{/if}}
 

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 1ccda3b5ea03bf194bb74eed093ad58ca6d20ff7..93024997017b49ad1a9b7a58642fce63d5557c1f 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2985,6 +2985,7 @@ source_viewer.tooltip.it.partially-covered=Partially covered by integration test
 source_viewer.tooltip.it.uncovered=Not covered by integration tests.
 source_viewer.tooltip.new_code=New {0}.
 
+source_viewer.load_more_code=Load More Code
 source_viewer.loading_more_code=Loading More Code...