Upgrade to ExtJS 3.0.3 - Released 10/11/2009

[extjs.git] / src / widgets / chart / Chart.js

diff --git a/src/widgets/chart/Chart.js b/src/widgets/chart/Chart.js
index 6015d36..078884d 100644 (file)
--- a/src/widgets/chart/Chart.js
+++ b/src/widgets/chart/Chart.js
@@ -1,5 +1,5 @@
 /*!
 /*!

- * Ext JS Library 3.0.0
+ * Ext JS Library 3.0.3

  * Copyright(c) 2006-2009 Ext JS, LLC
  * licensing@extjs.com
  * http://www.extjs.com/license
  * Copyright(c) 2006-2009 Ext JS, LLC
  * licensing@extjs.com
  * http://www.extjs.com/license


@@ -143,13 +143,14 @@
      */\r
     bindStore : function(store, initial){\r
         if(!initial && this.store){\r
      */\r
     bindStore : function(store, initial){\r
         if(!initial && this.store){\r

-            this.store.un("datachanged", this.refresh, this);\r
-            this.store.un("add", this.delayRefresh, this);\r
-            this.store.un("remove", this.delayRefresh, this);\r
-            this.store.un("update", this.delayRefresh, this);\r
-            this.store.un("clear", this.refresh, this);\r

             if(store !== this.store && this.store.autoDestroy){\r
                 this.store.destroy();\r
             if(store !== this.store && this.store.autoDestroy){\r
                 this.store.destroy();\r

+            }else{\r
+                this.store.un("datachanged", this.refresh, this);\r
+                this.store.un("add", this.delayRefresh, this);\r
+                this.store.un("remove", this.delayRefresh, this);\r
+                this.store.un("update", this.delayRefresh, this);\r
+                this.store.un("clear", this.refresh, this);\r

             }\r
         }\r
         if(store){\r
             }\r
         }\r
         if(store){\r


@@ -174,7 +175,7 @@
         this.swf.setType(this.type);\r
 \r
         if(this.chartStyle){\r
         this.swf.setType(this.type);\r
 \r
         if(this.chartStyle){\r

-            this.setStyles(Ext.apply(this.extraStyle || {}, this.chartStyle));\r
+            this.setStyles(Ext.apply({}, this.extraStyle, this.chartStyle));\r

         }\r
 \r
         if(this.categoryNames){\r
         }\r
 \r
         if(this.categoryNames){\r


@@ -256,7 +257,11 @@
     \r
     onDestroy: function(){\r
         Ext.chart.Chart.superclass.onDestroy.call(this);\r
     \r
     onDestroy: function(){\r
         Ext.chart.Chart.superclass.onDestroy.call(this);\r

-        delete window[this.tipFnName];\r
+        this.bindStore(null);\r
+        var tip = this.tipFnName;\r
+        if(!Ext.isEmpty(tip)){\r
+            delete window[tip];\r
+        }\r

     }\r
 });\r
 Ext.reg('chart', Ext.chart.Chart);\r
     }\r
 });\r
 Ext.reg('chart', Ext.chart.Chart);\r