Merge remote-tracking branch 'origin/master'

ignite-template.js

@@ -198,48 +198,48 @@ class IgniteTemplate {
             this._callbacks.push(value.attachOnShift((list) => this.onValueChanged((converter != null ? converter(list) : null))));
             this._callbacks.push(value.attachOnSplice((list, start, deleteCount, items) => this.onValueChanged((converter != null ? converter(list) : null))));
 
-            if (reflect != null && ((typeof (reflect) == "boolean" && reflect == true) || reflect instanceof Function)) {
-                var valueChanged = () => {
-                    var newValue = null;
-
-                    var type = this.element.hasAttribute("type") ? this.element.getAttribute("type").toLowerCase().trim() : null;
-
-                    if (type == "checkbox") {
-                        newValue = this.element.checked;
-                    } else if (type == "radio") {
-                        newValue = this.element.checked;
-                    } else if (type == "number") {
-                        newValue = Number(this.element.value);
-                    } else if (type == "file") { 
-                        newValue = this.element.files && this.element.files.length > 0 ? this.element.files[0] : null;
-                    } else if (this.element.hasAttribute("contenteditable") && this.element.getAttribute("contenteditable").toLowerCase().trim() == "true") {
-                        newValue = this.element.textContent;
-                    } else {
-                        newValue = this.element.value;
-                    }
-
-                    if (reflect instanceof Function) {
-                        reflect(newValue);
-                    } else {
-                        value.setValue(newValue, true);
-                    }
-
-                    this._elementValue = newValue;
-                };
-
-                if (live) {
-                    this.on("input", valueChanged);
-                }
-
-                this.on("change", valueChanged);
-                this.on("keyup", valueChanged);
-            }
-
             this._elementValue = (converter != null ? converter(value.value) : value.value);
         } else {
             this._elementValue = (converter != null ? converter(value) : value);
         }
 
+        if (reflect != null && ((typeof (reflect) == "boolean" && reflect == true) || reflect instanceof Function)) {
+            var valueChanged = () => {
+                var newValue = null;
+
+                var type = this.element.hasAttribute("type") ? this.element.getAttribute("type").toLowerCase().trim() : null;
+
+                if (type == "checkbox") {
+                    newValue = this.element.checked;
+                } else if (type == "radio") {
+                    newValue = this.element.checked;
+                } else if (type == "number") {
+                    newValue = Number(this.element.value);
+                } else if (type == "file") {
+                    newValue = this.element.files && this.element.files.length > 0 ? this.element.files[0] : null;
+                } else if (this.element.hasAttribute("contenteditable") && this.element.getAttribute("contenteditable").toLowerCase().trim() == "true") {
+                    newValue = this.element.textContent;
+                } else {
+                    newValue = this.element.value;
+                }
+
+                if (reflect instanceof Function) {
+                    reflect(newValue);
+                } else if (value instanceof IgniteProperty) {
+                    value.setValue(newValue, true);
+                }
+
+                this._elementValue = newValue;
+            };
+
+            if (live) {
+                this.on("input", valueChanged);
+            }
+
+            this.on("change", valueChanged);
+            this.on("keyup", valueChanged);
+        }
+
         IgniteRendering.pop();
         return this;
     }
@@ -2797,7 +2797,7 @@ class pagination extends IgniteTemplate {
                 } else {
                     template.element.style.removeProperty("display");
                 }
-                
+
                 this.pages[page].push(template.element);
                 this.children.push(template);
                 this.elements.push(template.element);
@@ -3130,9 +3130,9 @@ class pager extends IgniteTemplate {
                 while (rightSiblingIndex < this.pageCount - 2 && (rightSiblingIndex - leftSiblingIndex) < this.pageRange * 2) {
                     rightSiblingIndex++;
                 }
-                
+
                 var shouldShowLeftDots = leftSiblingIndex > 2;
-                
+
                 var shouldShowRightDots = rightSiblingIndex < this.pageCount - 2;
 
                 if (shouldShowLeftDots) {