Use a single gobal ID for each chart

tttp · Oct 15, 2013 · 693168b · 693168b
1 parent 461120b
commit 693168b
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 15 deletions.
diff --git a/dc.js b/dc.js
@@ -255,7 +255,7 @@ dc.renderlet = function(_){
 };
 
 dc.instanceOfChart = function (o) {
-    return o instanceof Object && o.__dc_flag__;
+    return o instanceof Object && o.__dc_flag__ && true;
 };
 
 dc.errors = {};
@@ -691,7 +691,7 @@ Every function on base chart are also inherited available on all concrete chart
 
 **/
 dc.baseChart = function (_chart) {
-    _chart.__dc_flag__ = true;
+    _chart.__dc_flag__ = dc.utils.uniqueId();
 
     var _dimension;
     var _group;
@@ -957,7 +957,7 @@ dc.baseChart = function (_chart) {
         var a = _chart.anchor();
         if (a && a.id) return a.id;
         if (a && a.replace) return a.replace('#','');
-        return ""+dc.utils.uniqueId();
+        return "" + _chart.chartID();
     };
 
     /**
@@ -1475,6 +1475,10 @@ dc.baseChart = function (_chart) {
         return _chart;
     };
 
+    _chart.chartID = function () {
+        return _chart.__dc_flag__;
+    };
+
     return _chart;
 };
 

diff --git a/dc.min.js b/dc.min.js
diff --git a/dc.min.js.map b/dc.min.js.map
diff --git a/src/base-chart.js b/src/base-chart.js
@@ -5,7 +5,7 @@ Every function on base chart are also inherited available on all concrete chart
 
 **/
 dc.baseChart = function (_chart) {
-    _chart.__dc_flag__ = true;
+    _chart.__dc_flag__ = dc.utils.uniqueId();
 
     var _dimension;
     var _group;
@@ -271,7 +271,7 @@ dc.baseChart = function (_chart) {
         var a = _chart.anchor();
         if (a && a.id) return a.id;
         if (a && a.replace) return a.replace('#','');
-        return ""+dc.utils.uniqueId();
+        return "" + _chart.chartID();
     };
 
     /**
@@ -789,5 +789,9 @@ dc.baseChart = function (_chart) {
         return _chart;
     };
 
+    _chart.chartID = function () {
+        return _chart.__dc_flag__;
+    };
+
     return _chart;
 };
diff --git a/src/core.js b/src/core.js
@@ -234,5 +234,5 @@ dc.renderlet = function(_){
 };
 
 dc.instanceOfChart = function (o) {
-    return o instanceof Object && o.__dc_flag__;
+    return o instanceof Object && o.__dc_flag__ && true;
 };
diff --git a/test/base-chart-test.js b/test/base-chart-test.js
@@ -125,7 +125,7 @@ suite.addBatch({
                 assert.fail("Exception should have been triggered");
             } catch (e) {
                 assert.isTrue(e instanceof dc.errors.InvalidStateException);
-                assert.match(e.toString(), /Mandatory attribute chart.dimension is missing on chart\[#\d\]/);
+                assert.match(e.toString(), /Mandatory attribute chart.dimension is missing on chart\[#\d+\]/);
             }
         }
     },
@@ -149,7 +149,7 @@ suite.addBatch({
                 assert.fail("Exception should have been triggered");
             } catch (e) {
                 assert.isTrue(e instanceof dc.errors.InvalidStateException);
-                assert.match(e.toString(), /Mandatory attribute chart.group is missing on chart\[#\d\]/);
+                assert.match(e.toString(), /Mandatory attribute chart.group is missing on chart\[#\d+\]/);
             }
         }
     },

diff --git a/test/coordinate-grid-chart-test.js b/test/coordinate-grid-chart-test.js
@@ -19,7 +19,7 @@ suite.addBatch({
                 assert.fail("Exception should have been triggered");
             }catch(e){
                 assert.isTrue(e instanceof dc.errors.InvalidStateException);
-                assert.match(e.toString(), /Mandatory attribute chart.x is missing on chart\[#\d\]/);
+                assert.match(e.toString(), /Mandatory attribute chart.x is missing on chart\[#\d+\]/);
             }
         }
     },

diff --git a/web/js/dc.js b/web/js/dc.js
@@ -255,7 +255,7 @@ dc.renderlet = function(_){
 };
 
 dc.instanceOfChart = function (o) {
-    return o instanceof Object && o.__dc_flag__;
+    return o instanceof Object && o.__dc_flag__ && true;
 };
 
 dc.errors = {};
@@ -691,7 +691,7 @@ Every function on base chart are also inherited available on all concrete chart
 
 **/
 dc.baseChart = function (_chart) {
-    _chart.__dc_flag__ = true;
+    _chart.__dc_flag__ = dc.utils.uniqueId();
 
     var _dimension;
     var _group;
@@ -957,7 +957,7 @@ dc.baseChart = function (_chart) {
         var a = _chart.anchor();
         if (a && a.id) return a.id;
         if (a && a.replace) return a.replace('#','');
-        return ""+dc.utils.uniqueId();
+        return "" + _chart.chartID();
     };
 
     /**
@@ -1475,6 +1475,10 @@ dc.baseChart = function (_chart) {
         return _chart;
     };
 
+    _chart.chartID = function () {
+        return _chart.__dc_flag__;
+    };
+
     return _chart;
 };