Torkel Ödegaard 11 лет назад
Родитель
Сommit
7b3df02640

+ 11 - 0
src/app/controllers/dashLoader.js

@@ -22,6 +22,17 @@ function (angular, _, moment, config) {
       $scope.onAppEvent('zoom-out', function() {
         $scope.zoom(2);
       });
+
+      var count = 0;
+      $scope.$watch(function() {
+        console.log(1);
+        count++;
+      }, function(n, o) {
+      });
+
+      setTimeout(function() {
+       console.log("Total count:" + count);
+      }, 4000);
     };
 
     $scope.set_default = function() {

+ 1 - 11
src/app/directives/grafanaSimplePanel.js

@@ -60,18 +60,8 @@ function (angular, _) {
             loadController(name);
           });
 
-          if(attr.panel) {
-            $scope.$watch(attr.panel, function (panel) {
-              // If the panel attribute is specified, create a new scope. This ruins configuration
-              // so don't do it with anything that needs to use editor.html
-              if(!_.isUndefined(panel)) {
-                $scope = $scope.$new();
-                $scope.panel = angular.fromJson(panel);
-              }
-            });
-          }
         }
       };
     });
 
-});
+});

+ 1 - 1
src/app/panels/text/module.js

@@ -88,7 +88,7 @@ function (angular, app, _, require) {
       }
 
       if(!$scope.$$phase) {
-        $scope.$apply();
+        $scope.$digest();
       }
     };