Merge pull request #11 from mendix/bugfix/extra-unneeded-div

Bugfix/extra unneeded div

package.json

@@ -1,6 +1,6 @@
 {
   "name": "DynamicImage",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "",
   "license": "",
   "author": "",

src/DynamicImage/widget/DynamicImage.js

@@ -1,24 +1,27 @@
 define([
     "dojo/_base/declare",
     "mxui/widget/_WidgetBase",
+    "dijit/_TemplatedMixin",
     "dojo/dom-class",
+    "dojo/dom-attr",
     "dojo/dom-style",
     "dojo/_base/lang",
     "dojo/on",
-    "dojo/dom-construct",
-    "DynamicImage/widget/ImageNode"
-], function (declare, _WidgetBase, domClass, domStyle, lang, on, domConstruct, CreateImageNode) {
+    "dojo/text!DynamicImage/widget/template/DynamicImage.html"
+], function (declare, _WidgetBase, _TemplatedMixin,domClass, domAttr, domStyle, lang, on, widgetTemplate) {
     "use strict";
 
-    return declare("DynamicImage.widget.DynamicImage", [_WidgetBase], {
+    return declare("DynamicImage.widget.DynamicImage", [_WidgetBase,_TemplatedMixin], {
 
         _contextObj: null,
         _clickHandler: null,
         _imageNode: null,
+        templateString: widgetTemplate,
+
         postCreate: function () {
             logger.debug(this.id + ".postCreate");
-            this._imageNode = CreateImageNode(this.defaultImage, this.alt);
-            domConstruct.place(this._imageNode, this.domNode);
+            domAttr.set(this._imageNode,"src",this.defaultImage || "");
+            domAttr.set(this._imageNode,"alt",this.alt || "");
         },
         update: function (obj, callback) {
             logger.debug(this.id + ".update");

src/DynamicImage/widget/StaticImage.js

@@ -1,20 +1,22 @@
 define([
     "dojo/_base/declare",
     "mxui/widget/_WidgetBase",
+    "dijit/_TemplatedMixin",
     "dojo/_base/lang",
-    "dojo/dom-construct",
-    "DynamicImage/widget/ImageNode"
-], function (declare, _WidgetBase, lang, domConstruct, CreateImageNode) {
+    "dojo/text!DynamicImage/widget/template/DynamicImage.html"
+], function (declare, _WidgetBase, _TemplatedMixin,lang, widgetTemplate) {
     "use strict";
 
-    return declare("DynamicImage.widget.StaticImage", [_WidgetBase], {
+    return declare("DynamicImage.widget.StaticImage", [_WidgetBase,_TemplatedMixin], {
 
         _contextObj: null,
         _imageNode: null,
+        templateString: widgetTemplate,
+
         postCreate: function () {
             logger.debug(this.id + ".postCreate");
-            this._imageNode = CreateImageNode(this.defaultImage, this.alt);
-            domConstruct.place(this._imageNode, this.domNode);
+            domAttr.set(this._imageNode,"src",this.defaultImage || "");
+            domAttr.set(this._imageNode,"alt",this.alt || "");
         },
         update: function (obj, callback) {
             logger.debug(this.id + ".update");

src/DynamicImage/widget/template/DynamicImage.html

@@ -0,0 +1 @@
+<img data-dojo-attach-point="_imageNode" >

src/package.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="DynamicImage" version="5.0.1" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="DynamicImage" version="5.0.2" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="DynamicImage/DynamicImage.xml"/>
             <widgetFile path="DynamicImage/StaticImage.xml"/>