diff options
Diffstat (limited to 'server/sonar-web/src/main/js/components')
9 files changed, 13 insertions, 40 deletions
diff --git a/server/sonar-web/src/main/js/components/issue/manual-issue-view.js b/server/sonar-web/src/main/js/components/issue/manual-issue-view.js index cf198aebd4e..d5f7279f747 100644 --- a/server/sonar-web/src/main/js/components/issue/manual-issue-view.js +++ b/server/sonar-web/src/main/js/components/issue/manual-issue-view.js @@ -70,7 +70,7 @@ export default Marionette.ItemView.extend({ }, serializeData: function () { - return _.extend(this._super(), { + return _.extend(Marionette.ItemView.prototype.serializeData.apply(this, arguments), { rules: _.sortBy(this.rules, 'name') }); } diff --git a/server/sonar-web/src/main/js/components/issue/templates/comment-form.hbs b/server/sonar-web/src/main/js/components/issue/templates/comment-form.hbs index 1ceccfa5bdc..d88b8a7da8d 100644 --- a/server/sonar-web/src/main/js/components/issue/templates/comment-form.hbs +++ b/server/sonar-web/src/main/js/components/issue/templates/comment-form.hbs @@ -12,7 +12,7 @@ <a class="js-issue-comment-cancel">{{t 'cancel'}}</a> </div> - <div class="issue-comment-form-tips">{{> '_markdown-tips' }}</div> + <div class="issue-comment-form-tips">{{> ../../common/templates/_markdown-tips }}</div> </div> <div class="bubble-popup-arrow"></div> diff --git a/server/sonar-web/src/main/js/components/issue/views/assign-form-view.js b/server/sonar-web/src/main/js/components/issue/views/assign-form-view.js index 76f1ea1eb1a..2535d2d9671 100644 --- a/server/sonar-web/src/main/js/components/issue/views/assign-form-view.js +++ b/server/sonar-web/src/main/js/components/issue/views/assign-form-view.js @@ -17,7 +17,7 @@ export default ActionOptionsView.extend({ }, initialize: function () { - this._super(); + ActionOptionsView.prototype.initialize.apply(this, arguments); this.assignees = null; this.debouncedSearch = _.debounce(this.search, 250); }, @@ -32,7 +32,7 @@ export default ActionOptionsView.extend({ onRender: function () { var that = this; - this._super(); + ActionOptionsView.prototype.onRender.apply(this, arguments); this.renderTags(); setTimeout(function () { that.$('input').focus(); @@ -55,7 +55,7 @@ export default ActionOptionsView.extend({ var assignee = $(e.currentTarget).data('value'), assigneeName = $(e.currentTarget).data('text'); this.submit(assignee, assigneeName); - return this._super(e); + return ActionOptionsView.prototype.selectOption.apply(this, arguments); }, submit: function (assignee) { diff --git a/server/sonar-web/src/main/js/components/navigator/templates/metric-filter.hbs b/server/sonar-web/src/main/js/components/navigator/templates/metric-filter.hbs index ae19cec0a7b..2da85df1c86 100644 --- a/server/sonar-web/src/main/js/components/navigator/templates/metric-filter.hbs +++ b/server/sonar-web/src/main/js/components/navigator/templates/metric-filter.hbs @@ -2,7 +2,7 @@ <select name="metric"> <option></option> {{#each groupedMetrics}} - <optgroup label="{{domain}}"> + <optgroup label="{{this.domain}}"> {{#each metrics}} <option value="{{name}}">{{short_name}}</option> {{/each}} diff --git a/server/sonar-web/src/main/js/components/source-viewer/helpers/code-with-issue-locations-helper.js b/server/sonar-web/src/main/js/components/source-viewer/helpers/code-with-issue-locations-helper.js index 417f98663a5..1cd0cae05c5 100644 --- a/server/sonar-web/src/main/js/components/source-viewer/helpers/code-with-issue-locations-helper.js +++ b/server/sonar-web/src/main/js/components/source-viewer/helpers/code-with-issue-locations-helper.js @@ -1,5 +1,4 @@ import _ from 'underscore'; -import Handlebars from 'hbsfy/runtime'; /** * Intersect two ranges @@ -114,14 +113,6 @@ function doTheStuff (code, issueLocations, optionalClassName) { } -/** - * Handlebars helper to highlight issue locations in the source code - */ -Handlebars.registerHelper('codeWithIssueLocations', function (code, issueLocations) { - return doTheStuff(code, issueLocations); -}); - - export default doTheStuff; 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 27b9af66d37..a6112d76a23 100644 --- a/server/sonar-web/src/main/js/components/source-viewer/main.js +++ b/server/sonar-web/src/main/js/components/source-viewer/main.js @@ -14,7 +14,6 @@ import LineActionsPopupView from './popups/line-actions-popup'; import highlightLocations from './helpers/code-with-issue-locations-helper'; import Template from './templates/source-viewer.hbs'; import IssueLocationTemplate from './templates/source-viewer-issue-location.hbs'; -import './partials'; var HIGHLIGHTED_ROW_CLASS = 'source-line-highlighted'; diff --git a/server/sonar-web/src/main/js/components/source-viewer/partials.js b/server/sonar-web/src/main/js/components/source-viewer/partials.js deleted file mode 100644 index 83597498a67..00000000000 --- a/server/sonar-web/src/main/js/components/source-viewer/partials.js +++ /dev/null @@ -1,16 +0,0 @@ -import Handlebars from 'hbsfy/runtime'; -import AllMeasuresPartial from './templates/measures/_source-viewer-measures-all.hbs'; -import CoveragePartial from './templates/measures/_source-viewer-measures-coverage.hbs'; -import DuplicationsPartial from './templates/measures/_source-viewer-measures-duplications.hbs'; -import IssuesPartial from './templates/measures/_source-viewer-measures-issues.hbs'; -import LinesPartial from './templates/measures/_source-viewer-measures-lines.hbs'; -import TestCasesPartial from './templates/measures/_source-viewer-measures-test-cases.hbs'; -import TestsPartial from './templates/measures/_source-viewer-measures-tests.hbs'; - -Handlebars.registerPartial('_source-viewer-measures-all', AllMeasuresPartial); -Handlebars.registerPartial('_source-viewer-measures-coverage', CoveragePartial); -Handlebars.registerPartial('_source-viewer-measures-duplications', DuplicationsPartial); -Handlebars.registerPartial('_source-viewer-measures-issues', IssuesPartial); -Handlebars.registerPartial('_source-viewer-measures-lines', LinesPartial); -Handlebars.registerPartial('_source-viewer-measures-test-cases', TestCasesPartial); -Handlebars.registerPartial('_source-viewer-measures-tests', TestsPartial); diff --git a/server/sonar-web/src/main/js/components/source-viewer/templates/source-viewer-measures.hbs b/server/sonar-web/src/main/js/components/source-viewer/templates/source-viewer-measures.hbs index 0a2288ceca2..a9dff3243e6 100644 --- a/server/sonar-web/src/main/js/components/source-viewer/templates/source-viewer-measures.hbs +++ b/server/sonar-web/src/main/js/components/source-viewer/templates/source-viewer-measures.hbs @@ -23,34 +23,34 @@ <div class="source-viewer-measures"> <div class="source-viewer-measures-section"> <div class="source-viewer-measures-card"> - {{> '_source-viewer-measures-lines'}} + {{> 'measures/_source-viewer-measures-lines'}} </div> </div> <div class="source-viewer-measures-section"> - {{> '_source-viewer-measures-issues'}} + {{> 'measures/_source-viewer-measures-issues'}} </div> {{#any measures.coverage measures.it_coverage}} <div class="source-viewer-measures-section"> <div class="source-viewer-measures-card"> - {{> '_source-viewer-measures-coverage'}} + {{> 'measures/_source-viewer-measures-coverage'}} </div> </div> {{/any}} <div class="source-viewer-measures-section"> - {{> '_source-viewer-measures-duplications'}} + {{> 'measures/_source-viewer-measures-duplications'}} </div> </div> {{else}} <div class="source-viewer-measures"> <div class="source-viewer-measures-section"> - {{> '_source-viewer-measures-tests'}} + {{> 'measures/_source-viewer-measures-tests'}} </div> </div> <div class="source-viewer-measures"> - {{> '_source-viewer-measures-test-cases'}} + {{> 'measures/_source-viewer-measures-test-cases'}} </div> {{/unless}} @@ -59,7 +59,7 @@ <a class="js-show-all-measures">{{t 'component_viewer.show_all_measures'}}</a> <div class="source-viewer-measures source-viewer-measures-secondary js-all-measures hidden"> - {{> '_source-viewer-measures-all'}} + {{> 'measures/_source-viewer-measures-all'}} </div> </div> diff --git a/server/sonar-web/src/main/js/components/workspace/main.js b/server/sonar-web/src/main/js/components/workspace/main.js index 6ae1dd2c3b4..4076b9f6872 100644 --- a/server/sonar-web/src/main/js/components/workspace/main.js +++ b/server/sonar-web/src/main/js/components/workspace/main.js @@ -5,7 +5,6 @@ import Items from './models/items'; import ItemsView from './views/items-view'; import ViewerView from './views/viewer-view'; import RuleView from './views/rule-view'; -import '../../helpers/handlebars-helpers'; var instance = null, |