Merge pull request #7806 from jbudz/moment-locale

Fix moment deprecation, move dow config
elastic · Jul 25, 2016 · 27c3836 · 27c3836
2 parents 377f23c + d3187d0
commit 27c3836
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/core_plugins/kibana/public/kibana.js b/src/core_plugins/kibana/public/kibana.js
@@ -35,10 +35,16 @@ chrome
   });
 
   config.watch('dateFormat:tz', setDefaultTimezone, $scope);
+  config.watch('dateFormat:dow', setStartDayOfWeek, $scope);
 
   function setDefaultTimezone(tz) {
     moment.tz.setDefault(tz);
   }
+
+  function setStartDayOfWeek(day) {
+    const dow = moment.weekdays().indexOf(day);
+    moment.updateLocale(moment.locale(), { week: { dow } });
+  }
 });
 
 modules.get('kibana').run(Notifier.pullMessageFromUrl);
diff --git a/src/ui/public/timepicker/kbn_global_timepicker.js b/src/ui/public/timepicker/kbn_global_timepicker.js
@@ -19,12 +19,6 @@ UiModules
   return {
     template: toggleHtml,
     link: ($scope, $el, attrs) => {
-      config.bindToScope($scope, 'dateFormat:dow', 'dateFormat_dow');
-      $scope.$watch('dateFormat_dow', function (day) {
-        const dow = moment.weekdays().indexOf(day);
-        moment.locale(moment.locale(), { week: { dow } });
-      });
-
       listenForUpdates($rootScope);
 
       $rootScope.timefilter = timefilter;