diff options
Diffstat (limited to 'server/sonar-web/src/main/js/apps/coding-rules')
12 files changed, 19 insertions, 19 deletions
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/facets-view.js b/server/sonar-web/src/main/js/apps/coding-rules/facets-view.js index b9c2a7f4921..cf9e8d92bc5 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/facets-view.js +++ b/server/sonar-web/src/main/js/apps/coding-rules/facets-view.js @@ -68,7 +68,7 @@ define([ return FacetsView.extend({ - getItemView: function (model) { + getChildView: function (model) { var view = viewsMapping[model.get('property')]; return view ? view : BaseFacet; } diff --git a/server/sonar-web/src/main/js/apps/coding-rules/layout.js b/server/sonar-web/src/main/js/apps/coding-rules/layout.js index 87ec56e9694..238db774707 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/layout.js +++ b/server/sonar-web/src/main/js/apps/coding-rules/layout.js @@ -23,7 +23,7 @@ define([ var $ = jQuery; - return Marionette.Layout.extend({ + return Marionette.LayoutView.extend({ template: Templates['coding-rules-layout'], regions: { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule-details-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule-details-view.js index 941cfc42912..05856342aa4 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/rule-details-view.js +++ b/server/sonar-web/src/main/js/apps/coding-rules/rule-details-view.js @@ -41,7 +41,7 @@ define([ var $ = jQuery; - return Marionette.Layout.extend({ + return Marionette.LayoutView.extend({ className: 'coding-rule-details', template: Templates['coding-rules-rule-details'], @@ -99,7 +99,7 @@ define([ this.$el.scrollParent().scrollTop(0); }, - onClose: function () { + onDestroy: function () { this.unbindShortcuts(); }, diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-creation-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-creation-view.js index 5c3829854a6..e15a1149e69 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-creation-view.js +++ b/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-creation-view.js @@ -51,7 +51,7 @@ define([ 'keydown @ui.customRuleCreationKey': 'flagKey', 'keyup @ui.customRuleCreationKey': 'flagKey', - 'click #coding-rules-custom-rule-creation-cancel': 'close', + 'click #coding-rules-custom-rule-creation-cancel': 'destroy', 'click @ui.customRuleCreationCreate': 'create', 'click @ui.customRuleCreationReactivate': 'reactivate' }); @@ -168,7 +168,7 @@ define([ } else { that.options.app.controller.showDetails(that.model); } - that.close(); + that.destroy(); }).fail(function (jqXHR) { if (jqXHR.status === 409) { that.existingRule = jqXHR.responseJSON.rule; diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-view.js index 98d9634516e..e50b7c11005 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-view.js +++ b/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-view.js @@ -45,7 +45,7 @@ define([ options = { key: that.model.id }; $.post(url, options).done(function () { that.model.collection.remove(that.model); - that.close(); + that.destroy(); }); } }); diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rules-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rules-view.js index 3785b8ed6b6..56ae2a95833 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rules-view.js +++ b/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rules-view.js @@ -25,10 +25,10 @@ define([ return Marionette.CompositeView.extend({ template: Templates['coding-rules-custom-rules'], - itemView: CustomRuleView, - itemViewContainer: '#coding-rules-detail-custom-rules', + childView: CustomRuleView, + childViewContainer: '#coding-rules-detail-custom-rules', - itemViewOptions: function () { + childViewOptions: function () { return { app: this.options.app, templateRule: this.model diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule/manual-rule-creation-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule/manual-rule-creation-view.js index 6417beb3c8a..66617fc33ed 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/rule/manual-rule-creation-view.js +++ b/server/sonar-web/src/main/js/apps/coding-rules/rule/manual-rule-creation-view.js @@ -115,7 +115,7 @@ define([ r = JSON.parse(r); } that.options.app.controller.showDetails(r.rule.key); - that.close(); + that.destroy(); }).fail(function (jqXHR) { if (jqXHR.status === 409) { that.existingRule = jqXHR.responseJSON.rule; diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule/profile-activation-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule/profile-activation-view.js index e12c4730469..a310ce97674 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/rule/profile-activation-view.js +++ b/server/sonar-web/src/main/js/apps/coding-rules/rule/profile-activation-view.js @@ -111,7 +111,7 @@ define([ 400: null } }).done(function () { - that.close(); + that.destroy(); that.trigger('profileActivated', severity, params); }).fail(function (jqXHR) { that.enableForm(); diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-filter-mixin.js b/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-filter-mixin.js index 839e1743af0..5bbe6a2d3cd 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-filter-mixin.js +++ b/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-filter-mixin.js @@ -38,7 +38,7 @@ define([ var obj = {}; obj[property] = '' + value; that.options.app.state.updateFilter(obj); - popup.close(); + popup.destroy(); }); popup.render(); } diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-meta-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-meta-view.js index 1a4cb4c3f7e..d8565818c52 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-meta-view.js +++ b/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-meta-view.js @@ -51,7 +51,7 @@ define([ }); }, - onClose: function () { + onDestroy: function () { this.$('[data-toggle="tooltip"]').tooltip('destroy'); }, diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-profiles-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-profiles-view.js index 7c3dc3df275..fc7662e5073 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-profiles-view.js +++ b/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-profiles-view.js @@ -25,10 +25,10 @@ define([ return Marionette.CompositeView.extend({ template: Templates['coding-rules-rule-profiles'], - itemView: ProfileView, - itemViewContainer: '#coding-rules-detail-quality-profiles', + childView: ProfileView, + childViewContainer: '#coding-rules-detail-quality-profiles', - itemViewOptions: function () { + childViewOptions: function () { return { app: this.options.app, rule: this.model diff --git a/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-view.js b/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-view.js index e5f1ac02eb2..e77a504fa7f 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-view.js +++ b/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-view.js @@ -26,8 +26,8 @@ define([ return WorkspaceListView.extend({ template: Templates['coding-rules-workspace-list'], - itemView: WorkspaceListItemView, - itemViewContainer: '.js-list', + childView: WorkspaceListItemView, + childViewContainer: '.js-list', emptyView: WorkspaceListEmptyView, bindShortcuts: function () { |