You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by di...@apache.org on 2016/06/07 17:56:08 UTC

[5/5] ambari git commit: Ambari-16017: Update Moment.js to latest stable version 2.13.0 (Sangeeta Ravindran via dili)

Ambari-16017: Update Moment.js to latest stable version 2.13.0 (Sangeeta Ravindran via dili)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4e2d4aff
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4e2d4aff
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4e2d4aff

Branch: refs/heads/trunk
Commit: 4e2d4aff33ff466581b8da79ef9ce7175cc8d53f
Parents: 237715f
Author: Di Li <di...@apache.org>
Authored: Tue Jun 7 13:54:57 2016 -0400
Committer: Di Li <di...@apache.org>
Committed: Tue Jun 7 13:54:57 2016 -0400

----------------------------------------------------------------------
 ambari-web/config.coffee                        |    2 +-
 ambari-web/karma.conf.js                        |    2 +-
 ambari-web/vendor/scripts/moment.js             | 3195 -------
 ambari-web/vendor/scripts/moment.min.js         |    7 +
 .../slider/src/main/resources/ui/config.js      |    4 +-
 .../ui/vendor/scripts/common/moment.js          | 7768 ------------------
 .../ui/vendor/scripts/common/moment.min.js      |    7 +
 7 files changed, 18 insertions(+), 10967 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4e2d4aff/ambari-web/config.coffee
----------------------------------------------------------------------
diff --git a/ambari-web/config.coffee b/ambari-web/config.coffee
index 6ed0915..4a29e73 100644
--- a/ambari-web/config.coffee
+++ b/ambari-web/config.coffee
@@ -61,7 +61,7 @@ exports.config =
           'vendor/scripts/underscore.js',
           'vendor/scripts/backbone.js',
           'vendor/scripts/visualsearch.js',
-          'vendor/scripts/moment.js',
+          'vendor/scripts/moment.min.js',
           'vendor/scripts/moment-timezone-with-data-2010-2020.js',
           'vendor/scripts/workflow_visualization.js',
           'vendor/scripts/rickshaw.js',

http://git-wip-us.apache.org/repos/asf/ambari/blob/4e2d4aff/ambari-web/karma.conf.js
----------------------------------------------------------------------
diff --git a/ambari-web/karma.conf.js b/ambari-web/karma.conf.js
index b11cf76..013cc2e 100644
--- a/ambari-web/karma.conf.js
+++ b/ambari-web/karma.conf.js
@@ -78,7 +78,7 @@ module.exports = function(config) {
       'vendor/scripts/jquery.flexibleArea.js',
       'vendor/scripts/FileSaver.js',
       'vendor/scripts/Blob.js',
-      'vendor/scripts/moment.js',
+      'vendor/scripts/moment.min.js',
       'vendor/scripts/moment-timezone-with-data-2010-2020.js',
       'vendor/**/*.js',
       'app/templates/**/*.hbs',