Bug fix and clean up dialog

elastic · Jan 19, 2017 · c5265f7 · c5265f7
1 parent 6769459
commit c5265f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/core_plugins/kibana/public/dashboard/index.js b/src/core_plugins/kibana/public/dashboard/index.js
@@ -119,13 +119,12 @@ app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter,
 
       $scope.$watch('state.options.darkTheme', setDarkTheme);
 
-      $scope.queryEdited = () => $scope.dashboardViewMode === DashboardViewMode.EDIT && !_.isEqual($state.query, savedDashQuery);
-
       // A hashkey in the filter array will ruin our comparison, so we need to get rid of it.
       const cleanFiltersForComparison = (filters) => _.map(filters, (filter) => _.omit(filter, '$$hashKey'));
       const filterMismatch = () =>
         !_.isEqual(cleanFiltersForComparison($state.filters), cleanFiltersForComparison(savedDashFilters)) ||
         !_.isEqual($state.query, savedDashQuery);
+
       const timeMismatch = () => savedDashTimeFrom !== timefilter.time.from || savedDashTimeTo !== timefilter.time.to;
 
       const changeViewMode = (newMode) => {
@@ -153,7 +152,7 @@ app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter,
             noop,
             'Save dashboard',
             'Lose changes',
-            'Warning');
+            'Unsaved changes');
           return;
         }
 

diff --git a/src/ui/public/kbn_top_nav/kbn_top_nav.js b/src/ui/public/kbn_top_nav/kbn_top_nav.js
@@ -120,7 +120,7 @@ module.directive('kbnTopNav', function (Private) {
 
       const getTopNavConfig = () => _.get($scope, $attrs.config, []);
 
-      $scope.$watch(getTopNavConfig, initTopNavForConfigChanges);
+      $scope.$watch(getTopNavConfig, initTopNavForConfigChanges, true);
 
       initTopNavForConfigChanges(getTopNavConfig(), null);
       return $scope.kbnTopNav;