18 files changed, 16 insertions, 96 deletions
diff --git a/server/sonar-web/src/main/coffee/quality-gate/app.coffee b/server/sonar-web/src/main/coffee/quality-gate/app.coffee
index f3de49b69fe..076f0dc81ff 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/app.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/app.coffee
@@ -1,39 +1,15 @@
 requirejs.config
   baseUrl: "#{baseUrl}/js"
 
-  paths:
-    'jquery': 'third-party/jquery'
-    'backbone': 'third-party/backbone'
-    'backbone.marionette': 'third-party/backbone.marionette'
-    'handlebars': 'third-party/handlebars'
-    'moment': 'third-party/moment'
-    'select-list': 'common/select-list'
-
-  shim:
-    'backbone.marionette':
-      deps: ['backbone']
-      exports: 'Marionette'
-    'backbone':
-      exports: 'Backbone'
-    'handlebars':
-      exports: 'Handlebars'
-    'moment':
-      exports: 'moment'
-    'select-list':
-      exports: 'SelectList'
-
 
 requirejs [
-  'backbone', 'backbone.marionette', 'handlebars',
   'quality-gate/collections/quality-gates',
   'quality-gate/views/quality-gate-sidebar-list-view',
   'quality-gate/views/quality-gate-actions-view',
   'quality-gate/views/quality-gate-edit-view',
   'quality-gate/router',
-  'quality-gate/layout',
-  'common/handlebars-extensions'
+  'quality-gate/layout'
 ], (
-  Backbone, Marionette, Handlebars,
   QualityGates,
   QualityGateSidebarListItemView,
   QualityGateActionsView,
diff --git a/server/sonar-web/src/main/coffee/quality-gate/collections/conditions.coffee b/server/sonar-web/src/main/coffee/quality-gate/collections/conditions.coffee
index 8899fc14405..e9e196dbfdd 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/collections/conditions.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/collections/conditions.coffee
@@ -1,8 +1,6 @@
 define [
-  'backbone',
   'quality-gate/models/condition'
 ], (
-  Backbone,
   Condition
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/quality-gate/collections/quality-gates.coffee b/server/sonar-web/src/main/coffee/quality-gate/collections/quality-gates.coffee
index 1d1c8542481..9fbae78dd88 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/collections/quality-gates.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/collections/quality-gates.coffee
@@ -1,8 +1,6 @@
 define [
-  'backbone',
   'quality-gate/models/quality-gate'
 ], (
-  Backbone,
   QualityGate
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/quality-gate/layout.coffee b/server/sonar-web/src/main/coffee/quality-gate/layout.coffee
index 0b5941655d5..9a982cf1e02 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/layout.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/layout.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette',
   'templates/quality-gates'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
   class AppLayout extends Marionette.Layout
     className: 'navigator quality-gates-navigator'
@@ -47,4 +43,4 @@ define [
 
 
     onRender: ->
-      @updateLayout()
-\ No newline at end of file
+      @updateLayout()
diff --git a/server/sonar-web/src/main/coffee/quality-gate/models/condition.coffee b/server/sonar-web/src/main/coffee/quality-gate/models/condition.coffee
index 1fe2c634a41..58122a17fd5 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/models/condition.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/models/condition.coffee
@@ -1,8 +1,4 @@
-define [
-  'backbone'
-], (
-  Backbone
-) ->
+define ->
 
   class Condition extends Backbone.Model
 
diff --git a/server/sonar-web/src/main/coffee/quality-gate/models/quality-gate.coffee b/server/sonar-web/src/main/coffee/quality-gate/models/quality-gate.coffee
index 5acffc066e7..a80f1d9fe29 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/models/quality-gate.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/models/quality-gate.coffee
@@ -1,8 +1,4 @@
-define [
-  'backbone'
-], (
-  Backbone
-) ->
+define ->
 
   class QualityGate extends Backbone.Model
 
diff --git a/server/sonar-web/src/main/coffee/quality-gate/router.coffee b/server/sonar-web/src/main/coffee/quality-gate/router.coffee
index f21161a97bf..9bb56410f9a 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/router.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/router.coffee
@@ -1,10 +1,8 @@
 define [
-  'backbone',
   'quality-gate/models/quality-gate',
   'quality-gate/views/quality-gate-detail-view',
   'quality-gate/views/quality-gate-detail-header-view',
 ], (
-  Backbone,
   QualityGate,
   QualityGateDetailView,
   QualityGateDetailHeaderView
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-actions-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-actions-view.coffee
index 6025a3c5b3c..1272034187c 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-actions-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-actions-view.coffee
@@ -1,10 +1,7 @@
 define [
-  'backbone.marionette',
-  'templates/quality-gates'
   'quality-gate/models/quality-gate'
+  'templates/quality-gates'
 ], (
-  Marionette,
-  Templates
   QualityGate
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-condition-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-condition-view.coffee
index bf5af58c8e9..d02ab76076d 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-condition-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-condition-view.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette',
   'templates/quality-gates'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
   class QualityGateDetailConditionView extends Marionette.ItemView
     tagName: 'tr'
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-empty-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-empty-view.coffee
index 9c0362f4e6a..b641ff44445 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-empty-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-empty-view.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette',
   'templates/quality-gates'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
   class QualityGateDetailConditionsView extends Marionette.ItemView
     tagName: 'tr'
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-view.coffee
index c7d2e4dcd99..5bf81089235 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-view.coffee
@@ -1,12 +1,9 @@
 define [
-  'backbone.marionette',
-  'templates/quality-gates'
   'quality-gate/models/condition',
   'quality-gate/views/quality-gate-detail-condition-view',
   'quality-gate/views/quality-gate-detail-conditions-empty-view'
+  'templates/quality-gates'
 ], (
-  Marionette,
-  Templates
   Condition,
   QualityGateDetailConditionView,
   QualityGateDetailConditionsEmptyView,
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-header-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-header-view.coffee
index 5575f63b1b6..3bcc07e9eaf 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-header-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-header-view.coffee
@@ -1,10 +1,7 @@
 define [
-  'backbone.marionette',
-  'templates/quality-gates',
   'quality-gate/models/quality-gate'
+  'templates/quality-gates',
 ], (
-  Marionette,
-  Templates
   QualityGate
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-projects-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-projects-view.coffee
index 90b3abb9773..4a8dd3ed7eb 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-projects-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-projects-view.coffee
@@ -1,11 +1,7 @@
 define [
-  'backbone.marionette',
+  'common/select-list'
   'templates/quality-gates'
-  'select-list'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
   class QualityGateDetailProjectsView extends Marionette.ItemView
     template: Templates['quality-gate-detail-projects']
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-view.coffee
index ff2ca9c70ea..0c105d13714 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-view.coffee
@@ -1,13 +1,10 @@
 define [
-  'backbone.marionette',
-  'templates/quality-gates',
   'quality-gate/collections/conditions',
   'quality-gate/views/quality-gate-detail-header-view',
   'quality-gate/views/quality-gate-detail-conditions-view',
   'quality-gate/views/quality-gate-detail-projects-view'
+  'templates/quality-gates',
 ], (
-  Marionette,
-  Templates,
   Conditions,
   QualityGateDetailHeaderView,
   QualityGateDetailConditionsView,
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-edit-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-edit-view.coffee
index 864083804e6..81fc2f25a7e 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-edit-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-edit-view.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette',
   'templates/quality-gates'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
   class QualityGateEditView extends Marionette.ItemView
     template: Templates['quality-gate-edit']
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-empty-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-empty-view.coffee
index c828e4b72f2..272ae3e316d 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-empty-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-empty-view.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette',
   'templates/quality-gates'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
   class QualityGateSidebarListEmptyView extends Marionette.ItemView
     tagName: 'li'
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-item-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-item-view.coffee
index 70cd6d15366..d2c618fa745 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-item-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-item-view.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette',
   'templates/quality-gates'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
   class QualityGateSidebarListItemView extends Marionette.ItemView
     tagName: 'li'
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-view.coffee
index 43f92f74d27..063fd569a2c 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-view.coffee
@@ -1,9 +1,7 @@
 define [
-  'backbone.marionette',
   'quality-gate/views/quality-gate-sidebar-list-item-view',
   'quality-gate/views/quality-gate-sidebar-list-empty-view'
 ], (
-  Marionette,
   QualityGateSidebarListItemView,
   QualityGateSidebarListEmptyView,
 ) ->