diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2015-06-09 12:13:56 +0200 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2015-06-09 16:20:22 +0200 |
| commit | e9ac473ec7dc0433cadf3f64f5d7980e38e0b93c (patch) | |
| tree | f641493172b0f5a82b6207e1bb3c058f6f2d4914 /server/sonar-web/src/main/js/apps/groups | |
| parent | 6e85ae2bcf98c12c634e792742a72b8e02a04d33 (diff) | |
| download | sonarqube-e9ac473ec7dc0433cadf3f64f5d7980e38e0b93c.tar.gz sonarqube-e9ac473ec7dc0433cadf3f64f5d7980e38e0b93c.zip | |
upgrade backbone.marionette
Diffstat (limited to 'server/sonar-web/src/main/js/apps/groups')
8 files changed, 8 insertions, 8 deletions
diff --git a/server/sonar-web/src/main/js/apps/groups/create-view.js b/server/sonar-web/src/main/js/apps/groups/create-view.js index 8d5cfce55aa..cddde867a99 100644 --- a/server/sonar-web/src/main/js/apps/groups/create-view.js +++ b/server/sonar-web/src/main/js/apps/groups/create-view.js @@ -19,7 +19,7 @@ define([ } }).done(function () { that.collection.refresh(); - that.close(); + that.destroy(); }).fail(function (jqXHR) { that.enableForm(); that.showErrors(jqXHR.responseJSON.errors, jqXHR.responseJSON.warnings); diff --git a/server/sonar-web/src/main/js/apps/groups/delete-view.js b/server/sonar-web/src/main/js/apps/groups/delete-view.js index 05e07c0d032..85b33a632b5 100644 --- a/server/sonar-web/src/main/js/apps/groups/delete-view.js +++ b/server/sonar-web/src/main/js/apps/groups/delete-view.js @@ -22,7 +22,7 @@ define([ } }).done(function () { collection.total--; - that.close(); + that.destroy(); }).fail(function (jqXHR) { that.showErrors(jqXHR.responseJSON.errors, jqXHR.responseJSON.warnings); }); diff --git a/server/sonar-web/src/main/js/apps/groups/form-view.js b/server/sonar-web/src/main/js/apps/groups/form-view.js index e79ea6eec65..7e3c26b98ee 100644 --- a/server/sonar-web/src/main/js/apps/groups/form-view.js +++ b/server/sonar-web/src/main/js/apps/groups/form-view.js @@ -11,7 +11,7 @@ define([ this.$('[data-toggle="tooltip"]').tooltip({ container: 'body', placement: 'bottom' }); }, - onClose: function () { + onDestroy: function () { this._super(); this.$('[data-toggle="tooltip"]').tooltip('destroy'); }, diff --git a/server/sonar-web/src/main/js/apps/groups/layout.js b/server/sonar-web/src/main/js/apps/groups/layout.js index a60fb06f35f..18f6c7738d1 100644 --- a/server/sonar-web/src/main/js/apps/groups/layout.js +++ b/server/sonar-web/src/main/js/apps/groups/layout.js @@ -2,7 +2,7 @@ define([ './templates' ], function () { - return Marionette.Layout.extend({ + return Marionette.LayoutView.extend({ template: Templates['groups-layout'], regions: { diff --git a/server/sonar-web/src/main/js/apps/groups/list-item-view.js b/server/sonar-web/src/main/js/apps/groups/list-item-view.js index 43eaa5b0d24..c09af127003 100644 --- a/server/sonar-web/src/main/js/apps/groups/list-item-view.js +++ b/server/sonar-web/src/main/js/apps/groups/list-item-view.js @@ -21,7 +21,7 @@ define([ this.$('[data-toggle="tooltip"]').tooltip({ container: 'body', placement: 'bottom' }); }, - onClose: function () { + onDestroy: function () { this.$('[data-toggle="tooltip"]').tooltip('destroy'); }, diff --git a/server/sonar-web/src/main/js/apps/groups/list-view.js b/server/sonar-web/src/main/js/apps/groups/list-view.js index 138c36b7619..24878864d30 100644 --- a/server/sonar-web/src/main/js/apps/groups/list-view.js +++ b/server/sonar-web/src/main/js/apps/groups/list-view.js @@ -5,7 +5,7 @@ define([ return Marionette.CollectionView.extend({ tagName: 'ul', - itemView: ListItemView + childView: ListItemView }); }); diff --git a/server/sonar-web/src/main/js/apps/groups/update-view.js b/server/sonar-web/src/main/js/apps/groups/update-view.js index 71383a1793d..850ddb7510f 100644 --- a/server/sonar-web/src/main/js/apps/groups/update-view.js +++ b/server/sonar-web/src/main/js/apps/groups/update-view.js @@ -18,7 +18,7 @@ define([ } }).done(function () { that.collection.refresh(); - that.close(); + that.destroy(); }).fail(function (jqXHR) { that.enableForm(); that.showErrors(jqXHR.responseJSON.errors, jqXHR.responseJSON.warnings); diff --git a/server/sonar-web/src/main/js/apps/groups/users-view.js b/server/sonar-web/src/main/js/apps/groups/users-view.js index 25db7e80158..de5901fc5f1 100644 --- a/server/sonar-web/src/main/js/apps/groups/users-view.js +++ b/server/sonar-web/src/main/js/apps/groups/users-view.js @@ -33,7 +33,7 @@ define([ }); }, - onClose: function () { + onDestroy: function () { this.model.collection.refresh(); this._super(); } |