Code refactoring

Author: Jelte Lagendijk

package.json

@@ -26,7 +26,7 @@
   "generatorVersion": "1.3.3",
   "paths": {
     "testProjectFolder": "./test/",
-    "testProjectFileName": "Test.mpr"
+    "testProjectFileName": "DynamicImageWidget.mpr"
   },
   "scripts": {
     "test": "grunt test"

src/DynamicImage/widget/DynamicImage.js

@@ -20,7 +20,6 @@ define([
 
         postCreate: function () {
             logger.debug(this.id + ".postCreate");
-            this._updateRendering();
         },
 
         update: function (obj, callback) {

src/DynamicImage/widget/MobileDynamicImage.js

@@ -1,12 +1,11 @@
-
 define([
     "dojo/_base/declare", "DynamicImage/widget/DynamicImage"
 ], function (declare, DynamicImage) {
     "use strict";
 
     // Declare widget"s prototype.
     return declare("DynamicImage.widget.MobileDynamicImage", [DynamicImage]);
-        
+
 });
 require(["DynamicImage/widget/MobileDynamicImage"], function () {
     "use strict";

src/DynamicImage/widget/MobileStaticImage.js

@@ -1,77 +1,11 @@
-
 define([
-    "dojo/_base/declare", "mxui/widget/_WidgetBase", "dijit/_TemplatedMixin",
-    "mxui/dom", "dojo/dom", "dojo/query", "dojo/dom-prop", "dojo/dom-geometry", "dojo/dom-class", "dojo/dom-style", "dojo/dom-construct", "dojo/_base/array", "dojo/_base/lang", "dojo/text", "dojo/html", "dojo/_base/event",
-    "dojo/text!DynamicImage/widget/template/DynamicImage.html"
-], function (declare, _WidgetBase, _TemplatedMixin, dom, dojoDom, domQuery, domProp, domGeom, domClass, domStyle, domConstruct, dojoArray, lang, text, html, event, widgetTemplate) {
+    "dojo/_base/declare", "DynamicImage/widget/StaticImage"
+], function (declare, StaticImage) {
     "use strict";
 
-    return declare("DynamicImage.widget.MobileStaticImage", [_WidgetBase, _TemplatedMixin], {
-
-        // _TemplatedMixin will create our dom node using this HTML template.
-        templateString: widgetTemplate,
-
-        _handles: null,
-        _contextObj: null,
-
-        constructor: function () {
-            this._handles = [];
-        },
-
-        postCreate: function () {
-            logger.debug(this.id + ".postCreate");
-        },
-
-        update: function (obj, callback) {
-            logger.debug(this.id + ".update");
-
-            this._contextObj = obj;
-            this._resetSubscriptions();
-            this._updateRendering(callback);
-        },
-
-        // Rerender the interface.
-        _updateRendering: function (callback) {
-            logger.debug(this.id + "._updateRendering");
-
-            if (this.imageurl !== "") {
-                this.imageNode.src = this.imageurl;
-            } else {
-                this.imageNode.src = this.defaultImage;
-            }
-
-            mendix.lang.nullExec(callback);
-        },
-
-        // Reset subscriptions.
-        _resetSubscriptions: function () {
-            logger.debug(this.id + "._resetSubscriptions");
-            var _objectHandle = null;
-
-            // Release handles on previous object, if any.
-            if (this._handles) {
-                this._handles.forEach(function (handle, i) {
-                    mx.data.unsubscribe(handle);
-                });
-                this._handles = [];
-            }
-
-            // When a mendix object exists create subscribtions.
-            if (this._contextObj) {
-
-                _objectHandle = this.subscribe({
-                    guid: this._contextObj.getGuid(),
-                    callback: lang.hitch(this, function (guid) {
-                        this._updateRendering();
-                    })
-                });
-
-
+    // Declare widget"s prototype.
+    return declare("DynamicImage.widget.MobileStaticImage", [StaticImage]);
 
-                this._handles = [_objectHandle];
-            }
-        }
-    });
 });
 require(["DynamicImage/widget/MobileStaticImage"], function () {
     "use strict";

src/DynamicImage/widget/StaticImage.js

@@ -24,6 +24,7 @@ define([
 
         update: function (obj, callback) {
             logger.debug(this.id + ".update");
+
             this._contextObj = obj;
             this._resetSubscriptions();
             this._updateRendering(callback);