Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui

# Conflicts:
#	dist/bundle.ie.min.js
#	dist/bundle.min.js
#	dist/fineui.ie.min.js
#	dist/fineui.min.js

demo/config.js

@@ -1535,8 +1535,7 @@ Demo.CONSTANTS = {
         {id: 22, pId: 2, value: "第二级文件2", text: "第二级文件2"},
         {id: 211, pId: 21, value: "第三级目录2", text: "第三级目录2"},
         {id: 212, pId: 21, value: "第三级文件2", text: "第三级文件2"},
-        {id: 2111, pId: 211, value: "第四级文件1", text: "第四级文件1"},
+        {id: 2111, pId: 211, value: "第四级文件1", text: "第四级文件1"}],
-        {id: 3, pId: -1, value: "第一级目录3", text: "第一级目录3", isParent: true}],
     LEVELTREE: [{
         id: 1,
         text: "第一项",

dist/bundle.ie.js

@@ -15149,7 +15149,7 @@ BI.Layout = BI.inherit(BI.Widget, {
             }
         }
         if (oldStartIdx > oldEndIdx) {
-            before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1].elm;
+            before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1];
             addVnodes(before, newCh, newStartIdx, newEndIdx);
         } else if (newStartIdx > newEndIdx) {
             removeVnodes(oldCh, oldStartIdx, oldEndIdx);
@@ -72008,6 +72008,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         self._setComboValueChangedEvent(self.smallCombo);
         self._setEditorValueChangedEvent(self.bigEditor);
         self._setEditorValueChangedEvent(self.smallEditor);
+
+        self._checkValidation();
     },
 
     _checkValidation: function () {
@@ -72285,6 +72287,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
             }
             self.bigCombo.setValue(combo_value);
         }
+
+        this._checkValidation();
     },
 
 

dist/bundle.js

@@ -15149,7 +15149,7 @@ BI.Layout = BI.inherit(BI.Widget, {
             }
         }
         if (oldStartIdx > oldEndIdx) {
-            before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1].elm;
+            before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1];
             addVnodes(before, newCh, newStartIdx, newEndIdx);
         } else if (newStartIdx > newEndIdx) {
             removeVnodes(oldCh, oldStartIdx, oldEndIdx);
@@ -72547,6 +72547,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         self._setComboValueChangedEvent(self.smallCombo);
         self._setEditorValueChangedEvent(self.bigEditor);
         self._setEditorValueChangedEvent(self.smallEditor);
+
+        self._checkValidation();
     },
 
     _checkValidation: function () {
@@ -72824,6 +72826,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
             }
             self.bigCombo.setValue(combo_value);
         }
+
+        this._checkValidation();
     },
 
 

dist/core.js

@@ -15149,7 +15149,7 @@ BI.Layout = BI.inherit(BI.Widget, {
             }
         }
         if (oldStartIdx > oldEndIdx) {
-            before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1].elm;
+            before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1];
             addVnodes(before, newCh, newStartIdx, newEndIdx);
         } else if (newStartIdx > newEndIdx) {
             removeVnodes(oldCh, oldStartIdx, oldEndIdx);

dist/demo.js

@@ -13297,8 +13297,7 @@ Demo.CONSTANTS = {
         {id: 22, pId: 2, value: "第二级文件2", text: "第二级文件2"},
         {id: 211, pId: 21, value: "第三级目录2", text: "第三级目录2"},
         {id: 212, pId: 21, value: "第三级文件2", text: "第三级文件2"},
-        {id: 2111, pId: 211, value: "第四级文件1", text: "第四级文件1"},
+        {id: 2111, pId: 211, value: "第四级文件1", text: "第四级文件1"}],
-        {id: 3, pId: -1, value: "第一级目录3", text: "第一级目录3", isParent: true}],
     LEVELTREE: [{
         id: 1,
         text: "第一项",

dist/fineui.ie.js

@@ -15391,7 +15391,7 @@ BI.Layout = BI.inherit(BI.Widget, {
             }
         }
         if (oldStartIdx > oldEndIdx) {
-            before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1].elm;
+            before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1];
             addVnodes(before, newCh, newStartIdx, newEndIdx);
         } else if (newStartIdx > newEndIdx) {
             removeVnodes(oldCh, oldStartIdx, oldEndIdx);
@@ -72250,6 +72250,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         self._setComboValueChangedEvent(self.smallCombo);
         self._setEditorValueChangedEvent(self.bigEditor);
         self._setEditorValueChangedEvent(self.smallEditor);
+
+        self._checkValidation();
     },
 
     _checkValidation: function () {
@@ -72527,6 +72529,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
             }
             self.bigCombo.setValue(combo_value);
         }
+
+        this._checkValidation();
     },
 
 

dist/fineui.js

@@ -15391,7 +15391,7 @@ BI.Layout = BI.inherit(BI.Widget, {
             }
         }
         if (oldStartIdx > oldEndIdx) {
-            before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1].elm;
+            before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1];
             addVnodes(before, newCh, newStartIdx, newEndIdx);
         } else if (newStartIdx > newEndIdx) {
             removeVnodes(oldCh, oldStartIdx, oldEndIdx);
@@ -72789,6 +72789,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         self._setComboValueChangedEvent(self.smallCombo);
         self._setEditorValueChangedEvent(self.bigEditor);
         self._setEditorValueChangedEvent(self.smallEditor);
+
+        self._checkValidation();
     },
 
     _checkValidation: function () {
@@ -73066,6 +73068,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
             }
             self.bigCombo.setValue(combo_value);
         }
+
+        this._checkValidation();
     },
 
 

dist/fineui_without_jquery_polyfill.js

@@ -14895,7 +14895,7 @@ BI.Layout = BI.inherit(BI.Widget, {
             }
         }
         if (oldStartIdx > oldEndIdx) {
-            before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1].elm;
+            before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1];
             addVnodes(before, newCh, newStartIdx, newEndIdx);
         } else if (newStartIdx > newEndIdx) {
             removeVnodes(oldCh, oldStartIdx, oldEndIdx);
@@ -55671,6 +55671,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         self._setComboValueChangedEvent(self.smallCombo);
         self._setEditorValueChangedEvent(self.bigEditor);
         self._setEditorValueChangedEvent(self.smallEditor);
+
+        self._checkValidation();
     },
 
     _checkValidation: function () {
@@ -55948,6 +55950,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
             }
             self.bigCombo.setValue(combo_value);
         }
+
+        this._checkValidation();
     },
 
 

dist/widget.js

@@ -13852,6 +13852,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         self._setComboValueChangedEvent(self.smallCombo);
         self._setEditorValueChangedEvent(self.bigEditor);
         self._setEditorValueChangedEvent(self.smallEditor);
+
+        self._checkValidation();
     },
 
     _checkValidation: function () {
@@ -14129,6 +14131,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
             }
             self.bigCombo.setValue(combo_value);
         }
+
+        this._checkValidation();
     },
 
 

src/core/wrapper/layout.js

@@ -427,7 +427,7 @@ BI.Layout = BI.inherit(BI.Widget, {
             }
         }
         if (oldStartIdx > oldEndIdx) {
-            before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1].elm;
+            before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1];
             addVnodes(before, newCh, newStartIdx, newEndIdx);
         } else if (newStartIdx > newEndIdx) {
             removeVnodes(oldCh, oldStartIdx, oldEndIdx);

src/widget/numberinterval/numberinterval.js

@@ -240,6 +240,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         self._setComboValueChangedEvent(self.smallCombo);
         self._setEditorValueChangedEvent(self.bigEditor);
         self._setEditorValueChangedEvent(self.smallEditor);
+
+        self._checkValidation();
     },
 
     _checkValidation: function () {
@@ -517,6 +519,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
             }
             self.bigCombo.setValue(combo_value);
         }
+
+        this._checkValidation();
     },