Browse Source

YARN-10766. [UI2] Bump moment-timezone to 0.5.33. Contributed by Andras Gyori

Szilard Nemeth 4 years ago
parent
commit
d146ab3af7

+ 1 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json

@@ -13,7 +13,7 @@
     "qunit": "1.19.0",
     "qunit": "1.19.0",
     "jquery-ui": "1.11.4",
     "jquery-ui": "1.11.4",
     "moment": "2.12.0",
     "moment": "2.12.0",
-    "moment-timezone": "0.5.1",
+    "moment-timezone": "0.5.33",
     "more-js": "0.8.2",
     "more-js": "0.8.2",
     "bootstrap": "3.3.6",
     "bootstrap": "3.3.6",
     "d3": "~3.5.6",
     "d3": "~3.5.6",

+ 4 - 0
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/environment.js

@@ -33,6 +33,10 @@ module.exports = function(environment) {
       }
       }
     },
     },
 
 
+    moment: {
+      includeTimezone: 'all'
+    },
+
     APP: DEFAULT_CONFIG,
     APP: DEFAULT_CONFIG,
     contentSecurityPolicy: {
     contentSecurityPolicy: {
       'connect-src': "* 'self'",
       'connect-src': "* 'self'",

+ 1 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js

@@ -42,7 +42,7 @@ module.exports = function(defaults) {
   app.import("bower_components/datatables/media/css/jquery.dataTables.min.css");
   app.import("bower_components/datatables/media/css/jquery.dataTables.min.css");
   app.import("bower_components/datatables/media/js/jquery.dataTables.min.js");
   app.import("bower_components/datatables/media/js/jquery.dataTables.min.js");
   app.import("bower_components/momentjs/min/moment.min.js");
   app.import("bower_components/momentjs/min/moment.min.js");
-  app.import("bower_components/moment-timezone/builds/moment-timezone-with-data-2010-2020.min.js");
+  app.import("bower_components/moment-timezone/builds/moment-timezone-with-data-10-year-range.min.js");
   app.import("bower_components/select2/dist/css/select2.min.css");
   app.import("bower_components/select2/dist/css/select2.min.css");
   app.import("bower_components/select2/dist/js/select2.min.js");
   app.import("bower_components/select2/dist/js/select2.min.js");
   app.import('bower_components/jquery-ui/jquery-ui.js');
   app.import('bower_components/jquery-ui/jquery-ui.js');