From 664274f0100b2608706856b3d8cb56e7c329c533 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Wed, 30 Jul 2014 09:01:27 +0200
Subject: [PATCH] Move momentjs lib to sonar.js mainly for using inside widgets

---
 server/sonar-web/Gruntfile.coffee                      |  2 ++
 .../src/main/js/common/handlebars-extensions.js        |  6 +-----
 server/sonar-web/src/main/js/issues/app.js             | 10 +++-------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/server/sonar-web/Gruntfile.coffee b/server/sonar-web/Gruntfile.coffee
index 9fd22feb5db..f905e6201af 100644
--- a/server/sonar-web/Gruntfile.coffee
+++ b/server/sonar-web/Gruntfile.coffee
@@ -81,6 +81,7 @@ module.exports = (grunt) ->
             '<%= pkg.assets %>js/third-party/underscore.js'
             '<%= pkg.assets %>js/third-party/select2.js'
             '<%= pkg.assets %>js/third-party/keymaster.js'
+            '<%= pkg.assets %>js/third-party/moment.js'
             '<%= pkg.assets %>js/select2-jquery-ui-fix.js'
             '<%= pkg.assets %>js/widgets/base.js'
             '<%= pkg.assets %>js/widgets/widget.js'
@@ -113,6 +114,7 @@ module.exports = (grunt) ->
             '<%= pkg.assets %>js/third-party/underscore.js'
             '<%= pkg.assets %>js/third-party/select2.js'
             '<%= pkg.assets %>js/third-party/keymaster.js'
+            '<%= pkg.assets %>js/third-party/moment.js'
             '<%= pkg.assets %>js/select2-jquery-ui-fix.js'
             '<%= pkg.assets %>js/widgets/base.js'
             '<%= pkg.assets %>js/widgets/widget.js'
diff --git a/server/sonar-web/src/main/js/common/handlebars-extensions.js b/server/sonar-web/src/main/js/common/handlebars-extensions.js
index 1ef0bc46aa1..7846b606990 100644
--- a/server/sonar-web/src/main/js/common/handlebars-extensions.js
+++ b/server/sonar-web/src/main/js/common/handlebars-extensions.js
@@ -1,20 +1,16 @@
 requirejs.config({
   paths: {
-    'moment': 'third-party/moment',
     'handlebars': 'third-party/handlebars'
   },
 
   shim: {
-    'moment': {
-      exports: 'moment'
-    },
     'handlebars': {
       exports: 'Handlebars'
     }
   }
 });
 
-define(['handlebars', 'moment'], function (Handlebars, moment) {
+define(['handlebars'], function (Handlebars) {
 
   /*
    * Shortcut for templates retrieving
diff --git a/server/sonar-web/src/main/js/issues/app.js b/server/sonar-web/src/main/js/issues/app.js
index c94661b84c4..8e3e6c6a01e 100644
--- a/server/sonar-web/src/main/js/issues/app.js
+++ b/server/sonar-web/src/main/js/issues/app.js
@@ -4,8 +4,7 @@ requirejs.config({
   paths: {
     'backbone': 'third-party/backbone',
     'backbone.marionette': 'third-party/backbone.marionette',
-    'handlebars': 'third-party/handlebars',
-    'moment': 'third-party/moment'
+    'handlebars': 'third-party/handlebars'
   },
 
   shim: {
@@ -18,9 +17,6 @@ requirejs.config({
     },
     'handlebars': {
       exports: 'Handlebars'
-    },
-    'moment': {
-      exports: 'moment'
     }
   }
 
@@ -28,7 +24,7 @@ requirejs.config({
 
 requirejs(
     [
-      'backbone', 'backbone.marionette', 'handlebars', 'moment',
+      'backbone', 'backbone.marionette', 'handlebars',
       'issues/extra',
       'navigator/filters/filter-bar',
       'navigator/filters/base-filters',
@@ -44,7 +40,7 @@ requirejs(
 
       'common/handlebars-extensions'
     ],
-    function (Backbone, Marionette, Handlebars, moment, Extra, FilterBar, BaseFilters, CheckboxFilterView,
+    function (Backbone, Marionette, Handlebars, Extra, FilterBar, BaseFilters, CheckboxFilterView,
               ChoiceFilters, AjaxSelectFilters, FavoriteFilters, RangeFilters, ContextFilterView,
               ReadOnlyFilterView, ActionPlanFilterView, RuleFilterView) {
       Handlebars.registerPartial('detailInnerTemplate', jQuery('#issue-detail-inner-template').html());
-- 
2.39.5