Cauchy.Ke
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #1029 in VISUAL/fineui from ~GUY/fineui:master to master 

* commit '5dd5f5867c2276f14ed1a0aa6c2f99c4aa5f3afc':
  bugfix
master
guy 5 years ago
parent
99074af2c9 5dd5f5867c
commit
313a0aceb8
21 changed files with 124 additions and 59 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. 5
      dist/2.0/fineui.css
  2. 13
      dist/2.0/fineui.ie.js
  3. 8
      dist/2.0/fineui.ie.min.js
  4. 13
      dist/2.0/fineui.js
  5. 8
      dist/2.0/fineui.min.js
  6. 5
      dist/bundle.css
  7. 13
      dist/bundle.ie.js
  8. 8
      dist/bundle.ie.min.js
  9. 13
      dist/bundle.js
  10. 8
      dist/bundle.min.js
  11. 11
      dist/core.js
  12. 5
      dist/fineui.css
  13. 13
      dist/fineui.ie.js
  14. 6
      dist/fineui.ie.min.js
  15. 13
      dist/fineui.js
  16. 8
      dist/fineui.min.js
  17. 13
      dist/fineui_without_jquery_polyfill.js
  18. 2
      dist/utils.min.js
  19. 5
      dist/widget.css
  20. 2
      dist/widget.js
  21. 11
      src/core/widget.js

5
dist/2.0/fineui.css vendored
Unescape View File

@ -4420,6 +4420,11 @@ ul.ztree.zTreeDragUL {
.bi-number-editor .pull-up-font { .bi-number-editor .pull-up-font {
font-size: 12px; font-size: 12px;
} }
.bi-number-interval.hack {
-webkit-border-radius: 0px;
-moz-border-radius: 0px;
border-radius: 0px;
}
.bi-number-interval .number-interval-small-editor { .bi-number-interval .number-interval-small-editor {
-moz-border-radius-topleft: 2px; -moz-border-radius-topleft: 2px;
-webkit-border-top-left-radius: 2px; -webkit-border-top-left-radius: 2px;

13
dist/2.0/fineui.ie.js vendored
Unescape View File

@ -11657,12 +11657,14 @@ if (!_global.BI) {
invalid: false, invalid: false,
baseCls: "", baseCls: "",
extraCls: "", extraCls: "",
cls: "" cls: "",
css: null
}); });
}, },
// 覆盖父类的_constructor方法，widget不走ob的生命周期 // 覆盖父类的_constructor方法，widget不走ob的生命周期
_constructor: function () {}, _constructor: function () {
},
beforeInit: null, beforeInit: null,
@ -11751,6 +11753,9 @@ if (!_global.BI) {
if (o.data) { if (o.data) {
this.element.data(o.data); this.element.data(o.data);
} }
if (o.css) {
this.element.css(o.css);
}
this._children = {}; this._children = {};
}, },
@ -11830,7 +11835,7 @@ if (!_global.BI) {
lifeHook !== false && this.beforeMount && this.beforeMount(); lifeHook !== false && this.beforeMount && this.beforeMount();
this._isMounted = true; this._isMounted = true;
this._mountChildren && this._mountChildren(); this._mountChildren && this._mountChildren();
if(BI.isNotNull(this._parent)) { if (BI.isNotNull(this._parent)) {
!this._parent.isEnabled() && this._setEnable(false); !this._parent.isEnabled() && this._setEnable(false);
!this._parent.isValid() && this._setValid(false); !this._parent.isValid() && this._setValid(false);
} }
@ -77205,7 +77210,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments); var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval" + (BI.isIE() && BI.getIEVersion() < 10) ? " hack" : "",
height: 24, height: 24,
validation: "valid", validation: "valid",
closeMin: true, closeMin: true,

8
dist/2.0/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

13
dist/2.0/fineui.js vendored
Unescape View File

@ -11657,12 +11657,14 @@ if (!_global.BI) {
invalid: false, invalid: false,
baseCls: "", baseCls: "",
extraCls: "", extraCls: "",
cls: "" cls: "",
css: null
}); });
}, },
// 覆盖父类的_constructor方法，widget不走ob的生命周期 // 覆盖父类的_constructor方法，widget不走ob的生命周期
_constructor: function () {}, _constructor: function () {
},
beforeInit: null, beforeInit: null,
@ -11751,6 +11753,9 @@ if (!_global.BI) {
if (o.data) { if (o.data) {
this.element.data(o.data); this.element.data(o.data);
} }
if (o.css) {
this.element.css(o.css);
}
this._children = {}; this._children = {};
}, },
@ -11830,7 +11835,7 @@ if (!_global.BI) {
lifeHook !== false && this.beforeMount && this.beforeMount(); lifeHook !== false && this.beforeMount && this.beforeMount();
this._isMounted = true; this._isMounted = true;
this._mountChildren && this._mountChildren(); this._mountChildren && this._mountChildren();
if(BI.isNotNull(this._parent)) { if (BI.isNotNull(this._parent)) {
!this._parent.isEnabled() && this._setEnable(false); !this._parent.isEnabled() && this._setEnable(false);
!this._parent.isValid() && this._setValid(false); !this._parent.isValid() && this._setValid(false);
} }
@ -77609,7 +77614,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments); var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval" + (BI.isIE() && BI.getIEVersion() < 10) ? " hack" : "",
height: 24, height: 24,
validation: "valid", validation: "valid",
closeMin: true, closeMin: true,

8
dist/2.0/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
dist/bundle.css vendored
Unescape View File

@ -4420,6 +4420,11 @@ ul.ztree.zTreeDragUL {
.bi-number-editor .pull-up-font { .bi-number-editor .pull-up-font {
font-size: 12px; font-size: 12px;
} }
.bi-number-interval.hack {
-webkit-border-radius: 0px;
-moz-border-radius: 0px;
border-radius: 0px;
}
.bi-number-interval .number-interval-small-editor { .bi-number-interval .number-interval-small-editor {
-moz-border-radius-topleft: 2px; -moz-border-radius-topleft: 2px;
-webkit-border-top-left-radius: 2px; -webkit-border-top-left-radius: 2px;

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

@ -11657,12 +11657,14 @@ if (!_global.BI) {
invalid: false, invalid: false,
baseCls: "", baseCls: "",
extraCls: "", extraCls: "",
cls: "" cls: "",
css: null
}); });
}, },
// 覆盖父类的_constructor方法，widget不走ob的生命周期 // 覆盖父类的_constructor方法，widget不走ob的生命周期
_constructor: function () {}, _constructor: function () {
},
beforeInit: null, beforeInit: null,
@ -11751,6 +11753,9 @@ if (!_global.BI) {
if (o.data) { if (o.data) {
this.element.data(o.data); this.element.data(o.data);
} }
if (o.css) {
this.element.css(o.css);
}
this._children = {}; this._children = {};
}, },
@ -11830,7 +11835,7 @@ if (!_global.BI) {
lifeHook !== false && this.beforeMount && this.beforeMount(); lifeHook !== false && this.beforeMount && this.beforeMount();
this._isMounted = true; this._isMounted = true;
this._mountChildren && this._mountChildren(); this._mountChildren && this._mountChildren();
if(BI.isNotNull(this._parent)) { if (BI.isNotNull(this._parent)) {
!this._parent.isEnabled() && this._setEnable(false); !this._parent.isEnabled() && this._setEnable(false);
!this._parent.isValid() && this._setValid(false); !this._parent.isValid() && this._setValid(false);
} }
@ -77205,7 +77210,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments); var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval" + (BI.isIE() && BI.getIEVersion() < 10) ? " hack" : "",
height: 24, height: 24,
validation: "valid", validation: "valid",
closeMin: true, closeMin: true,

8
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

13
dist/bundle.js vendored
Unescape View File

@ -11657,12 +11657,14 @@ if (!_global.BI) {
invalid: false, invalid: false,
baseCls: "", baseCls: "",
extraCls: "", extraCls: "",
cls: "" cls: "",
css: null
}); });
}, },
// 覆盖父类的_constructor方法，widget不走ob的生命周期 // 覆盖父类的_constructor方法，widget不走ob的生命周期
_constructor: function () {}, _constructor: function () {
},
beforeInit: null, beforeInit: null,
@ -11751,6 +11753,9 @@ if (!_global.BI) {
if (o.data) { if (o.data) {
this.element.data(o.data); this.element.data(o.data);
} }
if (o.css) {
this.element.css(o.css);
}
this._children = {}; this._children = {};
}, },
@ -11830,7 +11835,7 @@ if (!_global.BI) {
lifeHook !== false && this.beforeMount && this.beforeMount(); lifeHook !== false && this.beforeMount && this.beforeMount();
this._isMounted = true; this._isMounted = true;
this._mountChildren && this._mountChildren(); this._mountChildren && this._mountChildren();
if(BI.isNotNull(this._parent)) { if (BI.isNotNull(this._parent)) {
!this._parent.isEnabled() && this._setEnable(false); !this._parent.isEnabled() && this._setEnable(false);
!this._parent.isValid() && this._setValid(false); !this._parent.isValid() && this._setValid(false);
} }
@ -77609,7 +77614,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments); var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval" + (BI.isIE() && BI.getIEVersion() < 10) ? " hack" : "",
height: 24, height: 24,
validation: "valid", validation: "valid",
closeMin: true, closeMin: true,

8
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/core.js vendored
Unescape View File

@ -11657,12 +11657,14 @@ if (!_global.BI) {
invalid: false, invalid: false,
baseCls: "", baseCls: "",
extraCls: "", extraCls: "",
cls: "" cls: "",
css: null
}); });
}, },
// 覆盖父类的_constructor方法，widget不走ob的生命周期 // 覆盖父类的_constructor方法，widget不走ob的生命周期
_constructor: function () {}, _constructor: function () {
},
beforeInit: null, beforeInit: null,
@ -11751,6 +11753,9 @@ if (!_global.BI) {
if (o.data) { if (o.data) {
this.element.data(o.data); this.element.data(o.data);
} }
if (o.css) {
this.element.css(o.css);
}
this._children = {}; this._children = {};
}, },
@ -11830,7 +11835,7 @@ if (!_global.BI) {
lifeHook !== false && this.beforeMount && this.beforeMount(); lifeHook !== false && this.beforeMount && this.beforeMount();
this._isMounted = true; this._isMounted = true;
this._mountChildren && this._mountChildren(); this._mountChildren && this._mountChildren();
if(BI.isNotNull(this._parent)) { if (BI.isNotNull(this._parent)) {
!this._parent.isEnabled() && this._setEnable(false); !this._parent.isEnabled() && this._setEnable(false);
!this._parent.isValid() && this._setValid(false); !this._parent.isValid() && this._setValid(false);
} }

5
dist/fineui.css vendored
Unescape View File

@ -4420,6 +4420,11 @@ ul.ztree.zTreeDragUL {
.bi-number-editor .pull-up-font { .bi-number-editor .pull-up-font {
font-size: 12px; font-size: 12px;
} }
.bi-number-interval.hack {
-webkit-border-radius: 0px;
-moz-border-radius: 0px;
border-radius: 0px;
}
.bi-number-interval .number-interval-small-editor { .bi-number-interval .number-interval-small-editor {
-moz-border-radius-topleft: 2px; -moz-border-radius-topleft: 2px;
-webkit-border-top-left-radius: 2px; -webkit-border-top-left-radius: 2px;

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

@ -11902,12 +11902,14 @@ if (!_global.BI) {
invalid: false, invalid: false,
baseCls: "", baseCls: "",
extraCls: "", extraCls: "",
cls: "" cls: "",
css: null
}); });
}, },
// 覆盖父类的_constructor方法，widget不走ob的生命周期 // 覆盖父类的_constructor方法，widget不走ob的生命周期
_constructor: function () {}, _constructor: function () {
},
beforeInit: null, beforeInit: null,
@ -11996,6 +11998,9 @@ if (!_global.BI) {
if (o.data) { if (o.data) {
this.element.data(o.data); this.element.data(o.data);
} }
if (o.css) {
this.element.css(o.css);
}
this._children = {}; this._children = {};
}, },
@ -12075,7 +12080,7 @@ if (!_global.BI) {
lifeHook !== false && this.beforeMount && this.beforeMount(); lifeHook !== false && this.beforeMount && this.beforeMount();
this._isMounted = true; this._isMounted = true;
this._mountChildren && this._mountChildren(); this._mountChildren && this._mountChildren();
if(BI.isNotNull(this._parent)) { if (BI.isNotNull(this._parent)) {
!this._parent.isEnabled() && this._setEnable(false); !this._parent.isEnabled() && this._setEnable(false);
!this._parent.isValid() && this._setValid(false); !this._parent.isValid() && this._setValid(false);
} }
@ -77450,7 +77455,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments); var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval" + (BI.isIE() && BI.getIEVersion() < 10) ? " hack" : "",
height: 24, height: 24,
validation: "valid", validation: "valid",
closeMin: true, closeMin: true,

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

File diff suppressed because one or more lines are too long

13
dist/fineui.js vendored
Unescape View File

@ -11902,12 +11902,14 @@ if (!_global.BI) {
invalid: false, invalid: false,
baseCls: "", baseCls: "",
extraCls: "", extraCls: "",
cls: "" cls: "",
css: null
}); });
}, },
// 覆盖父类的_constructor方法，widget不走ob的生命周期 // 覆盖父类的_constructor方法，widget不走ob的生命周期
_constructor: function () {}, _constructor: function () {
},
beforeInit: null, beforeInit: null,
@ -11996,6 +11998,9 @@ if (!_global.BI) {
if (o.data) { if (o.data) {
this.element.data(o.data); this.element.data(o.data);
} }
if (o.css) {
this.element.css(o.css);
}
this._children = {}; this._children = {};
}, },
@ -12075,7 +12080,7 @@ if (!_global.BI) {
lifeHook !== false && this.beforeMount && this.beforeMount(); lifeHook !== false && this.beforeMount && this.beforeMount();
this._isMounted = true; this._isMounted = true;
this._mountChildren && this._mountChildren(); this._mountChildren && this._mountChildren();
if(BI.isNotNull(this._parent)) { if (BI.isNotNull(this._parent)) {
!this._parent.isEnabled() && this._setEnable(false); !this._parent.isEnabled() && this._setEnable(false);
!this._parent.isValid() && this._setValid(false); !this._parent.isValid() && this._setValid(false);
} }
@ -77854,7 +77859,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments); var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval" + (BI.isIE() && BI.getIEVersion() < 10) ? " hack" : "",
height: 24, height: 24,
validation: "valid", validation: "valid",
closeMin: true, closeMin: true,

8
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

13
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -11657,12 +11657,14 @@ if (!_global.BI) {
invalid: false, invalid: false,
baseCls: "", baseCls: "",
extraCls: "", extraCls: "",
cls: "" cls: "",
css: null
}); });
}, },
// 覆盖父类的_constructor方法，widget不走ob的生命周期 // 覆盖父类的_constructor方法，widget不走ob的生命周期
_constructor: function () {}, _constructor: function () {
},
beforeInit: null, beforeInit: null,
@ -11751,6 +11753,9 @@ if (!_global.BI) {
if (o.data) { if (o.data) {
this.element.data(o.data); this.element.data(o.data);
} }
if (o.css) {
this.element.css(o.css);
}
this._children = {}; this._children = {};
}, },
@ -11830,7 +11835,7 @@ if (!_global.BI) {
lifeHook !== false && this.beforeMount && this.beforeMount(); lifeHook !== false && this.beforeMount && this.beforeMount();
this._isMounted = true; this._isMounted = true;
this._mountChildren && this._mountChildren(); this._mountChildren && this._mountChildren();
if(BI.isNotNull(this._parent)) { if (BI.isNotNull(this._parent)) {
!this._parent.isEnabled() && this._setEnable(false); !this._parent.isEnabled() && this._setEnable(false);
!this._parent.isValid() && this._setValid(false); !this._parent.isValid() && this._setValid(false);
} }
@ -60158,7 +60163,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments); var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval" + (BI.isIE() && BI.getIEVersion() < 10) ? " hack" : "",
height: 24, height: 24,
validation: "valid", validation: "valid",
closeMin: true, closeMin: true,

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
dist/widget.css vendored
Unescape View File

@ -204,6 +204,11 @@
.bi-number-editor .pull-up-font { .bi-number-editor .pull-up-font {
font-size: 12px; font-size: 12px;
} }
.bi-number-interval.hack {
-webkit-border-radius: 0px;
-moz-border-radius: 0px;
border-radius: 0px;
}
.bi-number-interval .number-interval-small-editor { .bi-number-interval .number-interval-small-editor {
-moz-border-radius-topleft: 2px; -moz-border-radius-topleft: 2px;
-webkit-border-top-left-radius: 2px; -webkit-border-top-left-radius: 2px;

2
dist/widget.js vendored
Unescape View File

@ -15300,7 +15300,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments); var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval" + (BI.isIE() && BI.getIEVersion() < 10) ? " hack" : "",
height: 24, height: 24,
validation: "valid", validation: "valid",
closeMin: true, closeMin: true,

11
src/core/widget.js
Unescape View File

@ -21,12 +21,14 @@
invalid: false, invalid: false,
baseCls: "", baseCls: "",
extraCls: "", extraCls: "",
cls: "" cls: "",
css: null
}); });
}, },
// 覆盖父类的_constructor方法，widget不走ob的生命周期 // 覆盖父类的_constructor方法，widget不走ob的生命周期
_constructor: function () {}, _constructor: function () {
},
beforeInit: null, beforeInit: null,
@ -115,6 +117,9 @@
if (o.data) { if (o.data) {
this.element.data(o.data); this.element.data(o.data);
} }
if (o.css) {
this.element.css(o.css);
}
this._children = {}; this._children = {};
}, },
@ -194,7 +199,7 @@
lifeHook !== false && this.beforeMount && this.beforeMount(); lifeHook !== false && this.beforeMount && this.beforeMount();
this._isMounted = true; this._isMounted = true;
this._mountChildren && this._mountChildren(); this._mountChildren && this._mountChildren();
if(BI.isNotNull(this._parent)) { if (BI.isNotNull(this._parent)) {
!this._parent.isEnabled() && this._setEnable(false); !this._parent.isEnabled() && this._setEnable(false);
!this._parent.isValid() && this._setValid(false); !this._parent.isValid() && this._setValid(false);
} }

Write Preview
Loading…
Cancel
Save