From f6a3b53fb5cf7c05543f9b982d033bc903ed6f13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Fri, 15 Jan 2016 11:22:54 +0100
Subject: [PATCH] fix(firefox): fixed js issue that made master build break in
 firefox

---
 public/app/core/services/dynamic_directive_srv.ts | 4 ++--
 public/app/features/annotations/query_editor.ts   | 2 +-
 public/app/features/datasources/config_view.ts    | 2 +-
 public/app/features/panel/query_editor.ts         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/app/core/services/dynamic_directive_srv.ts b/public/app/core/services/dynamic_directive_srv.ts
index d6cc8a19184..a0ee130fa87 100644
--- a/public/app/core/services/dynamic_directive_srv.ts
+++ b/public/app/core/services/dynamic_directive_srv.ts
@@ -40,9 +40,9 @@ class DynamicDirectiveSrv {
       restrict: 'E',
       scope: options.scope,
       link: (scope, elem, attrs) => {
-        if (options.watch) {
+        if (options.watchPath) {
           let childScope = null;
-          scope.$watch(options.watch, () => {
+          scope.$watch(options.watchPath, () => {
             if (childScope) {
               childScope.$destroy();
             }
diff --git a/public/app/features/annotations/query_editor.ts b/public/app/features/annotations/query_editor.ts
index 387f17e1454..4cc6416093a 100644
--- a/public/app/features/annotations/query_editor.ts
+++ b/public/app/features/annotations/query_editor.ts
@@ -9,7 +9,7 @@ function annotationsQueryEditor(dynamicDirectiveSrv) {
       annotation: "=",
       datasource: "="
     },
-    watch: "datasource.type",
+    watchPath: "datasource.type",
     directive: scope => {
       return System.import(scope.datasource.meta.module).then(function(dsModule) {
         return {
diff --git a/public/app/features/datasources/config_view.ts b/public/app/features/datasources/config_view.ts
index 8be06bbcdfd..39f593ba508 100644
--- a/public/app/features/datasources/config_view.ts
+++ b/public/app/features/datasources/config_view.ts
@@ -9,7 +9,7 @@ function dsConfigView(dynamicDirectiveSrv) {
       dsMeta: "=",
       current: "="
     },
-    watch: "dsMeta.module",
+    watchPath: "dsMeta.module",
     directive: scope => {
       return System.import(scope.dsMeta.module).then(function(dsModule) {
         return {
diff --git a/public/app/features/panel/query_editor.ts b/public/app/features/panel/query_editor.ts
index b360ad2aa79..01beceaee99 100644
--- a/public/app/features/panel/query_editor.ts
+++ b/public/app/features/panel/query_editor.ts
@@ -5,7 +5,7 @@ import angular from 'angular';
 /** @ngInject */
 function metricsQueryEditor(dynamicDirectiveSrv, datasourceSrv) {
   return dynamicDirectiveSrv.create({
-    watch: "panel.datasource",
+    watchPath: "panel.datasource",
     directive: scope => {
       let datasource = scope.target.datasource || scope.panel.datasource;
       return datasourceSrv.get(datasource).then(ds => {
@@ -29,7 +29,7 @@ function metricsQueryEditor(dynamicDirectiveSrv, datasourceSrv) {
 /** @ngInject */
 function metricsQueryOptions(dynamicDirectiveSrv, datasourceSrv) {
   return dynamicDirectiveSrv.create({
-    watch: "panel.datasource",
+    watchPath: "panel.datasource",
     directive: scope => {
       return datasourceSrv.get(scope.panel.datasource).then(ds => {
         return System.import(ds.meta.module).then(dsModule => {