diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2015-09-15 10:51:56 +0200 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2015-09-15 10:51:56 +0200 |
| commit | 52903276bb805ed85d098ff9160f4e547c50c0a1 (patch) | |
| tree | 5eb3e75b48a4e703f116583fab17b0bbcfe52a3c /server/sonar-web | |
| parent | b8c759cc3d00365bc88e1d9a9d7695caca32bd09 (diff) | |
| download | sonarqube-52903276bb805ed85d098ff9160f4e547c50c0a1.tar.gz sonarqube-52903276bb805ed85d098ff9160f4e547c50c0a1.zip | |
SONAR-6160 Show a notification when user reaches the last issue / rule
Diffstat (limited to 'server/sonar-web')
4 files changed, 16 insertions, 6 deletions
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/templates/coding-rules-workspace-list.hbs b/server/sonar-web/src/main/js/apps/coding-rules/templates/coding-rules-workspace-list.hbs index 37421cb75c2..a4020b26627 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/templates/coding-rules-workspace-list.hbs +++ b/server/sonar-web/src/main/js/apps/coding-rules/templates/coding-rules-workspace-list.hbs @@ -1,5 +1,6 @@ <div class="js-list"></div> -<div class="search-navigator-workspace-list-more js-more"> - <i class="spinner"></i> +<div class="search-navigator-workspace-list-more"> + <span class="js-more"><i class="spinner"></i></span> + <div class="js-last-element-reached bordered-top note"> <br>{{t 'the_end'}}</div> </div> diff --git a/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-list.hbs b/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-list.hbs index 37421cb75c2..a4020b26627 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-list.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-list.hbs @@ -1,5 +1,6 @@ <div class="js-list"></div> -<div class="search-navigator-workspace-list-more js-more"> - <i class="spinner"></i> +<div class="search-navigator-workspace-list-more"> + <span class="js-more"><i class="spinner"></i></span> + <div class="js-last-element-reached bordered-top note"> <br>{{t 'the_end'}}</div> </div> diff --git a/server/sonar-web/src/main/js/components/navigator/workspace-list-view.js b/server/sonar-web/src/main/js/components/navigator/workspace-list-view.js index a9c1831c835..90092b1bb02 100644 --- a/server/sonar-web/src/main/js/components/navigator/workspace-list-view.js +++ b/server/sonar-web/src/main/js/components/navigator/workspace-list-view.js @@ -24,7 +24,8 @@ define(function () { return Marionette.CompositeView.extend({ ui: { - loadMore: '.js-more' + loadMore: '.js-more', + lastElementReached: '.js-last-element-reached' }, childViewOptions: function () { @@ -49,8 +50,14 @@ define(function () { this.unbindShortcuts(); }, + onRender: function () { + this.toggleLoadMore(); + }, + toggleLoadMore: function () { - this.ui.loadMore.toggle(!this.options.app.state.get('maxResultsReached')); + var maxResultsReached = this.options.app.state.get('maxResultsReached'); + this.ui.loadMore.toggle(!maxResultsReached); + this.ui.lastElementReached.toggle(maxResultsReached); }, bindScrollEvents: function () { diff --git a/server/sonar-web/src/main/less/components/search-navigator.less b/server/sonar-web/src/main/less/components/search-navigator.less index 957c1180fbb..1f15099c2fe 100644 --- a/server/sonar-web/src/main/less/components/search-navigator.less +++ b/server/sonar-web/src/main/less/components/search-navigator.less @@ -511,6 +511,7 @@ .search-navigator-workspace-list-more { margin-top: 10px; + margin-bottom: 10px; padding: 5px 10px; text-align: center; } |