Преглед изворни кода

fixed loading of default.json

Rashid Khan пре 13 година
родитељ
комит
430bdd0343
2 измењених фајлова са 3 додато и 3 уклоњено
  1. 0 1
      js/controllers.js
  2. 3 2
      panels/dashcontrol/module.js

+ 0 - 1
js/controllers.js

@@ -20,7 +20,6 @@ angular.module('kibana.controllers', [])
 
     // Load dashboard by event 
     eventBus.register($scope,'dashboard', function(event,dashboard){
-      console.log(dashboard)
       $scope.dashboards = dashboard;
       _.defaults($scope.dashboards,_d)
     })

+ 3 - 2
panels/dashcontrol/module.js

@@ -48,6 +48,7 @@ angular.module('kibana.dashcontrol', [])
         ) {
           var dashboard = JSON.parse(localStorage['dashboard']);
           _.defaults(dashboard,_dash);
+          $scope.dash_load(JSON.stringify(dashboard))
         // No? Ok, grab default.json, its all we have now
         } else {
           $http({
@@ -56,12 +57,12 @@ angular.module('kibana.dashcontrol', [])
           }).success(function(data, status, headers, config) {
             var dashboard = data
              _.defaults(dashboard,_dash);
+             $scope.dash_load(JSON.stringify(dashboard))
           }).error(function(data, status, headers, config) {
             $scope.alert('Default dashboard missing!','Could not locate default.json','error')
           });
         }
-        // Load whatever we have
-        $scope.dash_load(dashboard)
+        
       }
     }