v3.2.0 Official Highmaps support

ChangeLog

@@ -1,3 +1,8 @@
+ver 3.2.0
+- Included Highmaps Desktop Demo (ExtJs 4)
+- Actually work with Highmaps now
+- Removed console log in Highmaps
+
 ver 3.1.0
 - Support ExtJs 5
 - All demos now refer to ExtJs CDN

Chart/ux/Highcharts.js

@@ -2,7 +2,7 @@
  * @author 
  * Joe Kuan <[email protected]>
  *
- * version 3.1.0
+ * version 3.2.0
  *
  * <!-- You are not permitted to remove the author section (above) from this file. -->
  *
@@ -188,7 +188,7 @@ Ext.define("Chart.ux.Highcharts", {
          * @static
          * Version string of the current Highcharts extension
          */
-        version: '3.1.0',
+        version: '3.2.0',
 
         /***
          * @property {Object} sencha

Chart/ux/Highcharts/MapSerie.js

@@ -139,7 +139,7 @@ Ext.define('Chart.ux.Highcharts.MapSerie', {
         // We need to bind the load map to reflect any change to the map
         if (this.updateMap && this.store) {
             var handler = this.store.on('load', function(store) {
-                console.log("call store load handler to getData()");
+                // console.log("call store load handler to getData()");
                 var data = this.getData();
                 var highmaps = this.getMap();
                 Ext.each(highmaps.chart.series, function(series) {
@@ -234,12 +234,12 @@ Ext.define('Chart.ux.Highcharts.MapSerie', {
         var items = this.store && this.store.data.items;
         var data = [];
 
-        Ext.isArray(items) && console.log("Call getMapSeriesData. Size " + items.length);
+        // Ext.isArray(items) && console.log("Call getMapSeriesData. Size " + items.length);
         Ext.each(items, function(record, index) {
             data.push(this.getData(record));
         }, this);           
 
-        console.log("Finish getMapSeriesData. Size " + data.length);
+        // console.log("Finish getMapSeriesData. Size " + data.length);
         return data;
     },
 
@@ -292,8 +292,8 @@ Ext.define('Chart.ux.Highcharts.MapSerie', {
         this.mdsLoaded = true;
         this.mssLoaded = true;
 
-        console.log("MapSerie addSeriesAfterLoad");
-        console.log(highmaps);
+        // console.log("MapSerie addSeriesAfterLoad");
+        // console.log(highmaps);
 
         var createLoadHandler = function(loadedVar) {
             return function() {
@@ -315,7 +315,7 @@ Ext.define('Chart.ux.Highcharts.MapSerie', {
         // have finished
         if (this.mapDataStore) {
             this.mdsLoaded = false;
-            console.log("Call mds store load method");
+            // console.log("Call mds store load method");
             this.mapDataStore.load({
                 scope: this,
                 callback: createLoadHandler("mdsLoaded")
@@ -324,14 +324,14 @@ Ext.define('Chart.ux.Highcharts.MapSerie', {
 
         if (this.store) {
             this.mssLoaded = false;
-            console.log("Call mss store load method");
+            // console.log("Call mss store load method");
             this.store.load({
                 scope: this,
                 callback: createLoadHandler("mssLoaded")
             });
         } else {
             // Just simply add 
-            console.log("No store - simply call highmaps.addSeries");
+            // console.log("No store - simply call highmaps.addSeries");
             this.dataReady = true;
             highmaps.drawMapWhenReady();
         }
@@ -376,8 +376,7 @@ Ext.define('Chart.ux.Highcharts.MapSerie', {
         if (Ext.isArray(this.joinBy)) {
             this.dataCodeField = this.joinBy[1];
             this.mapCodeField = this.joinBy[0];
-            console.log("mapCodeField: " + this.mapCodeField + ", dataCodeField: " +
-                        this.dataCodeField);
+            // console.log("mapCodeField: " + this.mapCodeField + ", dataCodeField: " + this.dataCodeField);
         } else {
             this.dataCodeField = this.joinBy;
             this.mapCodeField = this.joinBy;

Chart/ux/Highmaps.js

@@ -2,11 +2,11 @@
  * @author 
  * Joe Kuan <[email protected]>
  *
- * version 3.0.0
+ * version 3.2.0
  *
  * <!-- You are not permitted to remove the author section (above) from this file. -->
  *
- * Documentation last updated: 12 March 2014
+ * Documentation last updated: 22 Sept 2014
  *
  * A much improved & ported from ExtJs 3 Highchart adapter. 
  *
@@ -434,7 +434,7 @@ Ext.define("Chart.ux.Highmaps", {
 
         append = (append === null || append === true) ? true : false;
 
-	console.log("Map addSeries - append " + append);
+	// console.log("Map addSeries - append " + append);
 
 	var HC = Chart.ux.Highcharts;
         // Sencha Touch uses config to access properties
@@ -590,7 +590,7 @@ Ext.define("Chart.ux.Highmaps", {
 	    }
 	});
 
-	console.log(readyToDraw + " -- " + _this.ddDataReady);
+	// console.log(readyToDraw + " -- " + _this.ddDataReady);
 	if (!readyToDraw || !_this.ddDataReady) {
 	    return false;
 	}
@@ -640,7 +640,7 @@ Ext.define("Chart.ux.Highmaps", {
         } else if (this.rendered) {
             // Create the chart from fresh
 	    this.log("call Highcharts.Map (2)");
-	    console.log(_this.chartConfig);
+	    // console.log(_this.chartConfig);
             this.chart = new Highcharts.Map(config, this.afterChartRendered);
 	    this.fireEvent('mapReady', this);
         }

README.md

@@ -1,10 +1,15 @@
-This is the HighCharts extension for Sencha ExtJS 4/5 and Touch 2.
+This is the Highcharts extension for Sencha ExtJS 4/5 and Touch 2.
 
 The tutorial and API documentations can be found in the docs/ directory or you can view it [online][1]
 
 Here are the online demos for [ExtJs 4][2], [ExtJs 5][4] and [Touch 2][3]
 
+The extension also supports Highmaps for Sencha ExtJS 4. Here are the [demo][5] and [API doc][6]
+
 [1]: http://joekuan.org/demos/Highcharts_Sencha/docs/#!/api/Chart.ux.Highcharts
 [2]: http://joekuan.org/demos/Highcharts_Sencha/desktop
 [3]: http://joekuan.org/demos/Highcharts_Sencha/mobile
 [4]: http://joekuan.org/demos/Highcharts_Sencha/desktop.extjs5
+[5]: http://joekuan.org/demos/Highcharts_Sencha/highmaps_demo.extjs4
+[6]: http://joekuan.org/demos/Highcharts_Sencha/docs/#!/api/Chart.ux.Highmaps
+

docs/index.html

@@ -72,7 +72,7 @@ <h3>ux</h3>
 
 
 
-  <div id='footer-content' style='display: none'>Generated on Sun 14 Sep 2014 13:59:03 by <a href='https://github.com/senchalabs/jsduck'>JSDuck</a> 5.3.4.</div>
+  <div id='footer-content' style='display: none'>Generated on Sun 21 Sep 2014 23:58:19 by <a href='https://github.com/senchalabs/jsduck'>JSDuck</a> 5.3.4.</div>
 
 
 

docs/source/Highcharts.html

@@ -19,7 +19,7 @@
 </span> * @author 
  * Joe Kuan &lt;[email protected]&gt;
  *
- * version 3.1.0
+ * version 3.2.0
  *
  * &lt;!-- You are not permitted to remove the author section (above) from this file. --&gt;
  *
@@ -205,7 +205,7 @@
 </span>         * @static
          * Version string of the current Highcharts extension
          */
-        version: &#39;3.1.0&#39;,
+        version: &#39;3.2.0&#39;,
 
 <span id='Chart-ux-Highcharts-static-property-sencha'>        /***
 </span>         * @property {Object} sencha

docs/source/Highmaps.html

@@ -19,11 +19,11 @@
 </span> * @author 
  * Joe Kuan &lt;[email protected]&gt;
  *
- * version 3.0.0
+ * version 3.2.0
  *
  * &lt;!-- You are not permitted to remove the author section (above) from this file. --&gt;
  *
- * Documentation last updated: 12 March 2014
+ * Documentation last updated: 22 Sept 2014
  *
  * A much improved &amp; ported from ExtJs 3 Highchart adapter. 
  *
@@ -451,7 +451,7 @@
 
         append = (append === null || append === true) ? true : false;
 
-	console.log(&quot;Map addSeries - append &quot; + append);
+	// console.log(&quot;Map addSeries - append &quot; + append);
 
 	var HC = Chart.ux.Highcharts;
         // Sencha Touch uses config to access properties
@@ -607,7 +607,7 @@
 	    }
 	});
 
-	console.log(readyToDraw + &quot; -- &quot; + _this.ddDataReady);
+	// console.log(readyToDraw + &quot; -- &quot; + _this.ddDataReady);
 	if (!readyToDraw || !_this.ddDataReady) {
 	    return false;
 	}
@@ -657,7 +657,7 @@
         } else if (this.rendered) {
             // Create the chart from fresh
 	    this.log(&quot;call Highcharts.Map (2)&quot;);
-	    console.log(_this.chartConfig);
+	    // console.log(_this.chartConfig);
             this.chart = new Highcharts.Map(config, this.afterChartRendered);
 	    this.fireEvent(&#39;mapReady&#39;, this);
         }

highmaps_demo.extjs4/Chart

@@ -0,0 +1 @@
+../Chart

highmaps_demo.extjs4/Readme.md

@@ -0,0 +1,34 @@
+# Demo/app
+
+This folder contains the javascript files for the application.
+
+# Demo/resources
+
+This folder contains static resources (typically an `"images"` folder as well).
+
+# Demo/overrides
+
+This folder contains override classes. All overrides in this folder will be 
+automatically included in application builds if the target class of the override
+is loaded.
+
+# Demo/sass/etc
+
+This folder contains misc. support code for sass builds (global functions, 
+mixins, etc.)
+
+# Demo/sass/src
+
+This folder contains sass files defining css rules corresponding to classes
+included in the application's javascript code build.  By default, files in this 
+folder are mapped to the application's root namespace, 'Demo'. The
+namespace to which files in this directory are matched is controlled by the
+app.sass.namespace property in Demo/.sencha/app/sencha.cfg. 
+
+# Demo/sass/var
+
+This folder contains sass files defining sass variables corresponding to classes
+included in the application's javascript code build.  By default, files in this 
+folder are mapped to the application's root namespace, 'Demo'. The
+namespace to which files in this directory are matched is controlled by the
+app.sass.namespace property in Demo/.sencha/app/sencha.cfg. 

highmaps_demo.extjs4/app.js

@@ -0,0 +1,86 @@
+/*
+ * File: app.js
+ *
+ * This file was generated by Sencha Architect version 3.0.4.
+ * http://www.sencha.com/products/architect/
+ *
+ * This file requires use of the Ext JS 4.2.x library, under independent license.
+ * License of Sencha Architect does not include license for Ext JS 4.2.x. For more
+ * details see http://www.sencha.com/license or contact [email protected].
+ *
+ * This file will be auto-generated each and everytime you save your project.
+ *
+ * Do NOT hand edit this file.
+ */
+
+// @require @packageOverrides
+Ext.Loader.setConfig({
+    enabled: true
+});
+
+
+Ext.application({
+
+    requires: [
+        'Chart.ux.Highmaps',
+        'Chart.ux.Highcharts.MapSerie',
+        'Chart.ux.Highcharts.MapLineSerie',
+        'Chart.ux.Highcharts.MapPointSerie',
+        'Chart.ux.Highcharts.MapBubbleSerie',
+        'Chart.ux.Highcharts.LineSerie',
+        'Chart.ux.Highcharts.AreaSerie',
+        'Ext.layout.container.Border',
+        'Ext.layout.container.Card',
+        'Chart.ux.Highcharts.HeatmapSerie',
+        'Chart.ux.Highcharts.PieSerie'
+    ],
+    models: [
+        'PopDensity',
+        'MapData2',
+        'PopDensity1',
+        'Path',
+        'XYCoord',
+        'Population',
+        'PopulationHistory',
+        'Value',
+        'USStates',
+        'Drilldown',
+        'Heatmap',
+        'USMap',
+        'Vote'
+    ],
+    stores: [
+        'PopDensity',
+        'PopDensity1',
+        'MapData2',
+        'MeuseAreas',
+        'MeuseBasin',
+        'Meuse',
+        'Tributaries',
+        'Borders',
+        'Cities',
+        'WorldPopulation',
+        'PopulationHistory',
+        'USCountiesMap',
+        'USCountiesData',
+        'USCountiesBorders',
+        'USStates',
+        'Heatmap',
+        'Drilldown',
+        'USMap',
+        'Vote'
+    ],
+    views: [
+        'MainView',
+        'SetValue'
+    ],
+    controllers: [
+        'Navigation'
+    ],
+    name: 'Demo',
+
+    launch: function() {
+        Ext.create('Demo.view.MainView');
+    }
+
+});

highmaps_demo.extjs4/app.json

@@ -0,0 +1,9 @@
+{
+   "name": "Demo",
+   "requires": [],
+   "id": "d77e9b69-e3e3-4d2f-95c3-0b3853862de0",
+   "resources": [
+      "/HighmapsDemo/flags32.css",
+      "/HighmapsDemo/demo.css"
+   ]
+}

highmaps_demo.extjs4/app.json.meta

@@ -0,0 +1 @@
+{"name":"Demo","_comment":"Please don't edit. This is Architect data.","resources":["/HighmapsDemo/flags32.css","/HighmapsDemo/demo.css"],"requires":[]}

highmaps_demo.extjs4/app/Application.js

@@ -0,0 +1,17 @@
+Ext.define('Demo.Application', {
+    name: 'Demo',
+
+    extend: 'Ext.app.Application',
+
+    views: [
+        // TODO: add views here
+    ],
+
+    controllers: [
+        // TODO: add controllers here
+    ],
+
+    stores: [
+        // TODO: add stores here
+    ]
+});

highmaps_demo.extjs4/app/Readme.md

@@ -0,0 +1,15 @@
+# ./controller
+
+This folder contains the controllers
+
+# ./model
+
+This folder contains the models
+
+# ./view
+
+This folder contains the views
+
+# ./store
+
+This folder contains the stores