fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

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
es6
windy 6 years ago
parent
2cf2e6e70c 27303c90e5
commit
576153200a
11 changed files with 37 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      demo/config.js
  2. 6
      dist/bundle.ie.js
  3. 6
      dist/bundle.js
  4. 2
      dist/core.js
  5. 3
      dist/demo.js
  6. 6
      dist/fineui.ie.js
  7. 6
      dist/fineui.js
  8. 6
      dist/fineui_without_jquery_polyfill.js
  9. 4
      dist/widget.js
  10. 2
      src/core/wrapper/layout.js
  11. 4
      src/widget/numberinterval/numberinterval.js

3
demo/config.js
Unescape View File

@ -1535,8 +1535,7 @@ Demo.CONSTANTS = {
{id: 22, pId: 2, value: "第二级文件2", text: "第二级文件2"}, {id: 22, pId: 2, value: "第二级文件2", text: "第二级文件2"},
{id: 211, pId: 21, value: "第三级目录2", text: "第三级目录2"}, {id: 211, pId: 21, value: "第三级目录2", text: "第三级目录2"},
{id: 212, 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: [{ LEVELTREE: [{
id: 1, id: 1,
text: "第一项", text: "第一项",

6
dist/bundle.ie.js vendored
Unescape View File

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

6
dist/bundle.js vendored
Unescape View File

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

2
dist/core.js vendored
Unescape View File

@ -15149,7 +15149,7 @@ BI.Layout = BI.inherit(BI.Widget, {
} }
} }
if (oldStartIdx > oldEndIdx) { 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); addVnodes(before, newCh, newStartIdx, newEndIdx);
} else if (newStartIdx > newEndIdx) { } else if (newStartIdx > newEndIdx) {
removeVnodes(oldCh, oldStartIdx, oldEndIdx); removeVnodes(oldCh, oldStartIdx, oldEndIdx);

3
dist/demo.js vendored
Unescape View File

@ -13297,8 +13297,7 @@ Demo.CONSTANTS = {
{id: 22, pId: 2, value: "第二级文件2", text: "第二级文件2"}, {id: 22, pId: 2, value: "第二级文件2", text: "第二级文件2"},
{id: 211, pId: 21, value: "第三级目录2", text: "第三级目录2"}, {id: 211, pId: 21, value: "第三级目录2", text: "第三级目录2"},
{id: 212, 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: [{ LEVELTREE: [{
id: 1, id: 1,
text: "第一项", text: "第一项",

6
dist/fineui.ie.js vendored
Unescape View File

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

6
dist/fineui.js vendored
Unescape View File

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

6
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

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

4
dist/widget.js vendored
Unescape View File

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

2
src/core/wrapper/layout.js
Unescape View File

@ -427,7 +427,7 @@ BI.Layout = BI.inherit(BI.Widget, {
} }
} }
if (oldStartIdx > oldEndIdx) { 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); addVnodes(before, newCh, newStartIdx, newEndIdx);
} else if (newStartIdx > newEndIdx) { } else if (newStartIdx > newEndIdx) {
removeVnodes(oldCh, oldStartIdx, oldEndIdx); removeVnodes(oldCh, oldStartIdx, oldEndIdx);

4
src/widget/numberinterval/numberinterval.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save