Code cleanup & templates cleanup

Author: Jelte Lagendijk

.jshintrc

@@ -9,7 +9,8 @@
     "undef"    : true,
     "globals"  : {
         "mendix" : false,
-        "mx"     : false
+        "mx"     : false,
+        "logger" : false
     },
 
     // Relaxing

src/ChartJS/widgets/BarChart/widget/BarChart.js

@@ -1,17 +1,12 @@
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */
-/*global mx, mendix, require, console, define, module, logger, window */
-/*mendix */
 define([
-
-    "dojo/_base/declare", "dojo/_base/lang", "dojo/on", "ChartJS/widgets/Core"
-
-], function (declare, lang, on, _core) {
+    "dojo/_base/declare",
+    "ChartJS/widgets/Core",
+    "dojo/_base/lang",
+    "dojo/on"
+], function (declare, Core, lang, on) {
     "use strict";
 
-    // Declare widget.
-    return declare("ChartJS.widgets.BarChart.widget.BarChart", [ _core ], {
-
-        // Overwrite functions from _core here...
+    return declare("ChartJS.widgets.BarChart.widget.BarChart", [ Core ], {
 
         _processData : function () {
             logger.debug(this.id + "._processData");

src/ChartJS/widgets/BarChart/widget/templates/BarChart.html

@@ -1,6 +1,7 @@
 .chartjs-node {
     position: relative;
 }
+
 .legend-node {
     width: 250px;
     padding: 5px;
@@ -24,6 +25,7 @@
     opacity: 0.5;
     filter:Alpha(opacity=50);
 }
+
 .chartjs-custom-tooltip {
     position: absolute;
     top: -50px;
@@ -42,4 +44,4 @@
     display: inline-block;
     padding: 10px;
     background-color: #f1f1f1;
-}
+}

src/ChartJS/widgets/BarChart/widget/ui/BarChart.css

@@ -1,15 +1,25 @@
-/*jslint white:true, nomen: true, plusplus: true */
-/*global mx, mxui, mendix, require, console, define, module, logger, ChartJS, position, clearTimeout, setTimeout */
-/*mendix */
-
-// Required module list. Remove unnecessary modules, you can always get them back from the boilerplate.
 define([
 
     // Mixins
-    "dojo/_base/declare", "mxui/widget/_WidgetBase", "dijit/_TemplatedMixin",
+    "dojo/_base/declare",
+    "mxui/widget/_WidgetBase",
+    "dijit/_TemplatedMixin",
 
     // Client API and DOJO functions
-    "mxui/dom", "dojo/dom", "dojo/query", "dojo/dom-prop", "dojo/dom-geometry", "dojo/dom-class", "dojo/dom-attr", "dojo/dom-style", "dojo/_base/window", "dojo/dom-construct", "dojo/_base/array", "dojo/_base/lang", "dojo/html", "dojo/ready",
+    "mxui/dom",
+    "dojo/dom",
+    "dojo/query",
+    "dojo/dom-prop",
+    "dojo/dom-geometry",
+    "dojo/dom-class",
+    "dojo/dom-attr",
+    "dojo/dom-style",
+    "dojo/_base/window",
+    "dojo/dom-construct",
+    "dojo/_base/array",
+    "dojo/_base/lang",
+    "dojo/html",
+    "dojo/ready",
 
     // External libraries
     "ChartJS/lib/charts",
@@ -62,8 +72,6 @@ define([
         _tooltipNode: null,
 
         startup: function () {
-            // Uncomment line to start debugging
-            //logger.level(logger.DEBUG);
             logger.debug(this.id + ".startup");
 
             var domNode = null;
@@ -539,9 +547,9 @@ define([
                         callback(obj);
                     }
                 }),
-                error: function (error) {
-                    console.log(error.description);
-                }
+                error: lang.hitch(this, function (error) {
+                    console.log(this.id + "._executeMicroflow error: " + error.description);
+                })
             }, this);
         }
 

src/ChartJS/widgets/Core.js

@@ -1,15 +1,14 @@
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */
-/*global mx, mendix, require, console, define, module, logger, window */
-/*mendix */
 define([
-
-    "dojo/_base/declare", "dojo/_base/lang", "dojo/query", "dojo/on", "dojo/html", "ChartJS/widgets/Core"
-
-], function (declare, lang, domQuery, on, html, _core) {
+    "dojo/_base/declare",
+    "ChartJS/widgets/Core",
+    "dojo/_base/lang",
+    "dojo/query",
+    "dojo/on",
+    "dojo/html"
+], function (declare, Core, lang, domQuery, on, html) {
     "use strict";
 
-    // Declare widget.
-    return declare("ChartJS.widgets.DoughnutChart.widget.DoughnutChart", [ _core ], {
+    return declare("ChartJS.widgets.DoughnutChart.widget.DoughnutChart", [ Core ], {
 
         _processData : function () {
             logger.debug(this.id + "._processData");

src/ChartJS/widgets/DoughnutChart/widget/DoughnutChart.js

@@ -1,18 +1 @@
-.chartjs-node {
-    position: relative;
-}
-.legend-node {
-	width: 100%;
-	padding: 5px;
-}
-.legend-node li {
-	cursor: pointer;
-}
-.pie-legend {
-	text-align	: center;
-}
-.pie-legend li {
-	clear: none;
-	display: inline-block;
-	margin-right: 20px;
-}
+/* DoughnutChart reference css file, all general ChartJS styles are in widgets/BarChart/widget/ui/BarChart.css */

src/ChartJS/widgets/DoughnutChart/widget/templates/DoughnutChart.html

@@ -1,15 +1,13 @@
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */
-/*global mx, mendix, require, console, define, module, logger, window */
-/*mendix */
 define([
-
-    "dojo/_base/declare", "dojo/_base/lang", "dojo/query", "dojo/on", "ChartJS/widgets/Core"
-
-], function (declare, lang, domQuery, on, _core) {
+    "dojo/_base/declare",
+    "ChartJS/widgets/Core",
+    "dojo/_base/lang",
+    "dojo/query",
+    "dojo/on"
+], function (declare, Core, lang, domQuery, on) {
     "use strict";
 
-    // Declare widget.
-    return declare("ChartJS.widgets.LineChart.widget.LineChart", [ _core ], {
+    return declare("ChartJS.widgets.LineChart.widget.LineChart", [ Core ], {
 
         // Overwrite functions from _core here...
 
@@ -255,6 +253,7 @@ define([
 
     });
 });
+
 require(["ChartJS/widgets/LineChart/widget/LineChart"], function () {
     "use strict";
 });