From e9ac473ec7dc0433cadf3f64f5d7980e38e0b93c Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Tue, 9 Jun 2015 12:13:56 +0200
Subject: upgrade backbone.marionette

---
 server/sonar-web/src/main/js/apps/metrics/create-view.js    | 2 +-
 server/sonar-web/src/main/js/apps/metrics/delete-view.js    | 2 +-
 server/sonar-web/src/main/js/apps/metrics/form-view.js      | 2 +-
 server/sonar-web/src/main/js/apps/metrics/layout.js         | 2 +-
 server/sonar-web/src/main/js/apps/metrics/list-item-view.js | 2 +-
 server/sonar-web/src/main/js/apps/metrics/list-view.js      | 4 ++--
 server/sonar-web/src/main/js/apps/metrics/update-view.js    | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'server/sonar-web/src/main/js/apps/metrics')

diff --git a/server/sonar-web/src/main/js/apps/metrics/create-view.js b/server/sonar-web/src/main/js/apps/metrics/create-view.js
index 0db9fa70f11..5be34dac1ec 100644
--- a/server/sonar-web/src/main/js/apps/metrics/create-view.js
+++ b/server/sonar-web/src/main/js/apps/metrics/create-view.js
@@ -22,7 +22,7 @@ define([
         }
       }).done(function () {
         that.collection.refresh();
-        that.close();
+        that.destroy();
       }).fail(function (jqXHR) {
         that.enableForm();
         that.showErrors([{ msg: jqXHR.responseJSON.err_msg }]);
diff --git a/server/sonar-web/src/main/js/apps/metrics/delete-view.js b/server/sonar-web/src/main/js/apps/metrics/delete-view.js
index 0acc3c055a9..8719b9fdb3a 100644
--- a/server/sonar-web/src/main/js/apps/metrics/delete-view.js
+++ b/server/sonar-web/src/main/js/apps/metrics/delete-view.js
@@ -22,7 +22,7 @@ define([
         }
       }).done(function () {
         collection.refresh();
-        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/metrics/form-view.js b/server/sonar-web/src/main/js/apps/metrics/form-view.js
index 77b5f2a54a5..03e66f715b6 100644
--- a/server/sonar-web/src/main/js/apps/metrics/form-view.js
+++ b/server/sonar-web/src/main/js/apps/metrics/form-view.js
@@ -35,7 +35,7 @@ define([
       this.$('#create-metric-type').select2({ width: '250px' });
     },
 
-    onClose: function () {
+    onDestroy: function () {
       this._super();
       this.$('[data-toggle="tooltip"]').tooltip('destroy');
     },
diff --git a/server/sonar-web/src/main/js/apps/metrics/layout.js b/server/sonar-web/src/main/js/apps/metrics/layout.js
index 812212a42fa..9575307d96f 100644
--- a/server/sonar-web/src/main/js/apps/metrics/layout.js
+++ b/server/sonar-web/src/main/js/apps/metrics/layout.js
@@ -2,7 +2,7 @@ define([
   './templates'
 ], function () {
 
-  return Marionette.Layout.extend({
+  return Marionette.LayoutView.extend({
     template: Templates['metrics-layout'],
 
     regions: {
diff --git a/server/sonar-web/src/main/js/apps/metrics/list-item-view.js b/server/sonar-web/src/main/js/apps/metrics/list-item-view.js
index 6328aea11d5..c6989e3b7b3 100644
--- a/server/sonar-web/src/main/js/apps/metrics/list-item-view.js
+++ b/server/sonar-web/src/main/js/apps/metrics/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/metrics/list-view.js b/server/sonar-web/src/main/js/apps/metrics/list-view.js
index 27060bbe7d4..b015c65d966 100644
--- a/server/sonar-web/src/main/js/apps/metrics/list-view.js
+++ b/server/sonar-web/src/main/js/apps/metrics/list-view.js
@@ -5,9 +5,9 @@ define([
 
   return Marionette.CollectionView.extend({
     tagName: 'ul',
-    itemView: ListItemView,
+    childView: ListItemView,
 
-    itemViewOptions: function () {
+    childViewOptions: function () {
       return {
         types: this.options.types,
         domains: this.options.domains
diff --git a/server/sonar-web/src/main/js/apps/metrics/update-view.js b/server/sonar-web/src/main/js/apps/metrics/update-view.js
index c4edec81a8d..3dfea4a584e 100644
--- a/server/sonar-web/src/main/js/apps/metrics/update-view.js
+++ b/server/sonar-web/src/main/js/apps/metrics/update-view.js
@@ -21,7 +21,7 @@ define([
         }
       }).done(function () {
         that.collection.refresh();
-        that.close();
+        that.destroy();
       }).fail(function (jqXHR) {
         that.enableForm();
         that.showErrors(jqXHR.responseJSON.errors, jqXHR.responseJSON.warnings);
-- 
cgit v1.2.3