refactoring(): fixing event things

torkelo · torkelo · commit 44cf66d7ffc3 · 2016-04-07T19:23:20.000-04:00
diff --git a/package.json b/package.json
@@ -10,7 +10,6 @@
     "url": "http://github.com/grafana/grafana.git"
   },
   "devDependencies": {
-    "angular2": "2.0.0-beta.12",
     "zone.js": "^0.6.6",
     "autoprefixer": "^6.3.3",
     "es6-promise": "^3.0.2",
@@ -54,7 +53,7 @@
     "mocha": "2.3.4",
     "phantomjs-prebuilt": "^2.1.3",
     "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.2",
+    "rxjs": "5.0.0-beta.4",
     "sass-lint": "^1.5.0",
     "systemjs": "0.19.24"
   },
diff --git a/public/app/core/time_series2.ts b/public/app/core/time_series2.ts
@@ -170,7 +170,7 @@ export default class TimeSeries {
   }
 
   isMsResolutionNeeded() {
-    for (var i = 0; i<this.datapoints.length; i++) {
+    for (var i = 0; i < this.datapoints.length; i++) {
       if (this.datapoints[i][0] !== null) {
         var timestamp = this.datapoints[i][0].toString();
         if (timestamp.length === 13 && (timestamp % 1000) !== 0) {
diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js
@@ -272,7 +272,9 @@ function (angular, _, kbn) {
       }
 
       for (i = 0; i < metricNames.length; i++) {
-        var value = metricNames[i].text;
+        var item = metricNames[i];
+        var value = item.value || item.text;
+        var text = item.text || item.value;
 
         if (regex) {
           matches = regex.exec(value);
@@ -282,12 +284,11 @@ function (angular, _, kbn) {
           }
         }
 
-        options[value] = value;
+        options[value] = {text: text, value: value};
       }
 
       return _.map(_.keys(options).sort(), function(key) {
-        var option = { text: key, value: key };
-        return option;
+        return options[key];
       });
     };
 
diff --git a/public/app/headers/common.d.ts b/public/app/headers/common.d.ts
@@ -1,5 +1,4 @@
-///<reference path="../../vendor/npm/angular2/typings/es6-promise/es6-promise.d.ts" />
-///<reference path="../../vendor/npm/angular2/typings/es6-collections/es6-collections.d.ts" />
+/// <reference path="./es6-shim/es6-shim.d.ts" />
 
 declare var System: any;
 
diff --git a/public/app/headers/es6-promise/es6-promise.d.ts b/public/app/headers/es6-promise/es6-promise.d.ts
diff --git a/public/app/headers/es6-shim/es6-shim.d.ts b/public/app/headers/es6-shim/es6-shim.d.ts
@@ -1,7 +1,9 @@
+// Generated by typings
+// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/es6-shim/es6-shim.d.ts
 // Type definitions for es6-shim v0.31.2
 // Project: https://github.com/paulmillr/es6-shim
 // Definitions by: Ron Buckton <http://github.com/rbuckton>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare type PropertyKey = string | number | symbol;
 
@@ -621,7 +623,7 @@ interface WeakSetConstructor {
 
 declare var WeakSet: WeakSetConstructor;
 
-declare module Reflect {
+declare namespace Reflect {
     function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
     function construct(target: Function, argumentsList: ArrayLike<any>): any;
     function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
@@ -649,7 +651,7 @@ declare module "es6-shim" {
     var WeakMap: WeakMapConstructor;
     var WeakSet: WeakSetConstructor;
     var Promise: PromiseConstructor;
-    module Reflect {
+    namespace Reflect {
         function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
         function construct(target: Function, argumentsList: ArrayLike<any>): any;
         function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts
@@ -216,6 +216,11 @@ class GraphCtrl extends MetricsPanelCtrl {
     }
 
     series.applySeriesOverrides(this.panel.seriesOverrides);
+
+    if (seriesData.unit) {
+      this.panel.yaxes[series.yaxis-1].format = seriesData.unit;
+    }
+
     return series;
   }
 
diff --git a/public/test/core/utils/emitter_specs.ts b/public/test/core/utils/emitter_specs.ts
@@ -23,8 +23,28 @@ describe("Emitter", () => {
       expect(sub1Called).to.be(true);
       expect(sub2Called).to.be(true);
     });
-  });
 
+    it('should handle errors', () => {
+      var events = new Emitter();
+      var sub1Called = 0;
+      var sub2Called = 0;
+
+      var sub1 = events.on('test', () => {
+        sub1Called++;
+        throw "hello";
+      });
+
+      events.on('test', () => {
+        sub2Called++;
+      });
+
+      try { events.emit('test', null); } catch (_) { }
+      try { events.emit('test', null); } catch (_) {}
+
+      expect(sub1Called).to.be(1);
+      expect(sub2Called).to.be(1);
+    });
+  });
 });
 
 

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ export default class TimeSeries {`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`isMsResolutionNeeded() {`
`173`		`- for (var i = 0; i<this.datapoints.length; i++) {`
	`173`	`+ for (var i = 0; i < this.datapoints.length; i++) {`
`174`	`174`	`if (this.datapoints[i][0] !== null) {`
`175`	`175`	`var timestamp = this.datapoints[i][0].toString();`
`176`	`176`	`if (timestamp.length === 13 && (timestamp % 1000) !== 0) {`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,9 @@ function (angular, _, kbn) {`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`for (i = 0; i < metricNames.length; i++) {`
`275`		`- var value = metricNames[i].text;`
	`275`	`+ var item = metricNames[i];`
	`276`	`+ var value = item.value \|\| item.text;`
	`277`	`+ var text = item.text \|\| item.value;`
`276`	`278`
`277`	`279`	`if (regex) {`
`278`	`280`	`matches = regex.exec(value);`
`@@ -282,12 +284,11 @@ function (angular, _, kbn) {`
`282`	`284`	`}`
`283`	`285`	`}`
`284`	`286`
`285`		`- options[value] = value;`
	`287`	`+ options[value] = {text: text, value: value};`
`286`	`288`	`}`
`287`	`289`
`288`	`290`	`return _.map(_.keys(options).sort(), function(key) {`
`289`		`- var option = { text: key, value: key };`
`290`		`- return option;`
	`291`	`+ return options[key];`
`291`	`292`	`});`
`292`	`293`	`};`
`293`	`294`
Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,11 @@ class GraphCtrl extends MetricsPanelCtrl {`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`series.applySeriesOverrides(this.panel.seriesOverrides);`
	`219`	`+`
	`220`	`+ if (seriesData.unit) {`
	`221`	`+ this.panel.yaxes[series.yaxis-1].format = seriesData.unit;`
	`222`	`+ }`
	`223`	`+`
`219`	`224`	`return series;`
`220`	`225`	`}`
`221`	`226`