caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

* commit '80f00fa03a688891093c22f0829341dd6796c916':
  update
  update
  update
es6
guy 6 years ago
parent
310b234752 80f00fa03a
commit
3b2e323a3d
16 changed files with 84 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      dist/base.js
  2. 23
      dist/bundle.js
  3. 22
      dist/bundle.min.js
  4. 2
      dist/case.js
  5. 13
      dist/core.js
  6. 23
      dist/fineui.js
  7. 22
      dist/fineui.min.js
  8. 15
      dist/fineui_without_jquery_polyfill.js
  9. 2
      dist/utils.min.js
  10. 2
      src/base/list/virtuallist.js
  11. 2
      src/base/single/icon/icon.js
  12. 4
      src/base/tree/treeview.js
  13. 2
      src/case/colorchooser/colorchooser.trigger.js
  14. 2
      src/core/platform/dom/dom.js
  15. 5
      src/core/widget.js
  16. 6
      src/core/wrapper/layout.js

8
dist/base.js vendored
Unescape View File

@ -1636,10 +1636,10 @@ BI.TreeView = BI.inherit(BI.Pane, {
element: this,
items: [this.tip]
});
if(BI.isNotNull(o.value)){
if(BI.isNotNull(o.value)) {
this.setSelectedValue(o.value);
}
if (BI.isIE9Below()) {
if (BI.isIE9Below && BI.isIE9Below()) {
this.element.addClass("hack");
}
},
@ -6390,7 +6390,7 @@ BI.VirtualList = BI.inherit(BI.Widget, {
this.cache[i].destroyed = true;
}
}
var firstFragment = document.createDocumentFragment(), lastFragment = document.createDocumentFragment();
var firstFragment = BI.Widget._renderEngine.createFragment(), lastFragment = BI.Widget._renderEngine.createFragment();
var currentFragment = firstFragment;
for (var i = (start < 0 ? 0 : start); i <= end && i <= this.renderedIndex; i++) {
var index = this.cache[i].index;
@ -8936,7 +8936,7 @@ BI.Icon = BI.inherit(BI.Single, {
},
_init: function () {
BI.Icon.superclass._init.apply(this, arguments);
if (BI.isIE9Below()) {
if (BI.isIE9Below && BI.isIE9Below()) {
this.element.addClass("hack");
}
}

23
dist/bundle.js vendored
Unescape View File

@ -12106,7 +12106,7 @@ _.extend(BI.OB.prototype, {
};
BI.Widget.registerRenderEngine({
createElement: function (widget) {
if(BI.isWidget(widget)) {
if (BI.isWidget(widget)) {
var o = widget.options;
if (o.element) {
return $(o.element);
@ -12114,6 +12114,9 @@ _.extend(BI.OB.prototype, {
return $(document.createElement(o.tagName));
}
return $(widget);
},
createFragment: function () {
return document.createDocumentFragment();
}
});
})();(function () {
@ -14700,7 +14703,7 @@ BI.Layout = BI.inherit(BI.Widget, {
_mountChildren: function () {
var self = this;
var frag = document.createDocumentFragment();
var frag = BI.Widget._renderEngine.createFragment();
var hasChild = false;
BI.each(this._children, function (i, widget) {
if (widget.element !== self.element) {
@ -14929,7 +14932,7 @@ BI.Layout = BI.inherit(BI.Widget, {
addItems: function (items) {
var self = this, o = this.options;
var fragment = document.createDocumentFragment();
var fragment = BI.Widget._renderEngine.createFragment();
var added = [];
BI.each(items, function (i, item) {
var w = self._addElement(o.items.length, item);
@ -14947,7 +14950,7 @@ BI.Layout = BI.inherit(BI.Widget, {
prependItems: function (items) {
var self = this;
items = items || [];
var fragment = document.createDocumentFragment();
var fragment = BI.Widget._renderEngine.createFragment();
var added = [];
for (var i = items.length - 1; i >= 0; i--) {
this._addItemAt(0, items[i]);
@ -18496,7 +18499,7 @@ BI.extend(BI.DOM, {
if (BI.isEmpty(doms)) {
return;
}
var frag = document.createDocumentFragment();
var frag = BI.Widget._renderEngine.createFragment();
BI.each(doms, function (i, dom) {
dom instanceof BI.Widget && (dom = dom.element);
dom instanceof $ && dom[0] && frag.appendChild(dom[0]);
@ -36891,10 +36894,10 @@ BI.TreeView = BI.inherit(BI.Pane, {
element: this,
items: [this.tip]
});
if(BI.isNotNull(o.value)){
if(BI.isNotNull(o.value)) {
this.setSelectedValue(o.value);
}
if (BI.isIE9Below()) {
if (BI.isIE9Below && BI.isIE9Below()) {
this.element.addClass("hack");
}
},
@ -41645,7 +41648,7 @@ BI.VirtualList = BI.inherit(BI.Widget, {
this.cache[i].destroyed = true;
}
}
var firstFragment = document.createDocumentFragment(), lastFragment = document.createDocumentFragment();
var firstFragment = BI.Widget._renderEngine.createFragment(), lastFragment = BI.Widget._renderEngine.createFragment();
var currentFragment = firstFragment;
for (var i = (start < 0 ? 0 : start); i <= end && i <= this.renderedIndex; i++) {
var index = this.cache[i].index;
@ -44191,7 +44194,7 @@ BI.Icon = BI.inherit(BI.Single, {
},
_init: function () {
BI.Icon.superclass._init.apply(this, arguments);
if (BI.isIE9Below()) {
if (BI.isIE9Below && BI.isIE9Below()) {
this.element.addClass("hack");
}
}
@ -51272,7 +51275,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
this.colorContainer = BI.createWidget({
type: "bi.layout",
cls: "color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
cls: "color-chooser-trigger-content" + (BI.isIE9Below && BI.isIE9Below() ? " hack" : "")
});
var down = BI.createWidget({

22
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/case.js vendored
Unescape View File

@ -2655,7 +2655,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
this.colorContainer = BI.createWidget({
type: "bi.layout",
cls: "color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
cls: "color-chooser-trigger-content" + (BI.isIE9Below && BI.isIE9Below() ? " hack" : "")
});
var down = BI.createWidget({

13
dist/core.js vendored
Unescape View File

@ -12106,7 +12106,7 @@ _.extend(BI.OB.prototype, {
};
BI.Widget.registerRenderEngine({
createElement: function (widget) {
if(BI.isWidget(widget)) {
if (BI.isWidget(widget)) {
var o = widget.options;
if (o.element) {
return $(o.element);
@ -12114,6 +12114,9 @@ _.extend(BI.OB.prototype, {
return $(document.createElement(o.tagName));
}
return $(widget);
},
createFragment: function () {
return document.createDocumentFragment();
}
});
})();(function () {
@ -14700,7 +14703,7 @@ BI.Layout = BI.inherit(BI.Widget, {
_mountChildren: function () {
var self = this;
var frag = document.createDocumentFragment();
var frag = BI.Widget._renderEngine.createFragment();
var hasChild = false;
BI.each(this._children, function (i, widget) {
if (widget.element !== self.element) {
@ -14929,7 +14932,7 @@ BI.Layout = BI.inherit(BI.Widget, {
addItems: function (items) {
var self = this, o = this.options;
var fragment = document.createDocumentFragment();
var fragment = BI.Widget._renderEngine.createFragment();
var added = [];
BI.each(items, function (i, item) {
var w = self._addElement(o.items.length, item);
@ -14947,7 +14950,7 @@ BI.Layout = BI.inherit(BI.Widget, {
prependItems: function (items) {
var self = this;
items = items || [];
var fragment = document.createDocumentFragment();
var fragment = BI.Widget._renderEngine.createFragment();
var added = [];
for (var i = items.length - 1; i >= 0; i--) {
this._addItemAt(0, items[i]);
@ -18496,7 +18499,7 @@ BI.extend(BI.DOM, {
if (BI.isEmpty(doms)) {
return;
}
var frag = document.createDocumentFragment();
var frag = BI.Widget._renderEngine.createFragment();
BI.each(doms, function (i, dom) {
dom instanceof BI.Widget && (dom = dom.element);
dom instanceof $ && dom[0] && frag.appendChild(dom[0]);

23
dist/fineui.js vendored
Unescape View File

@ -12347,7 +12347,7 @@ _.extend(BI.OB.prototype, {
};
BI.Widget.registerRenderEngine({
createElement: function (widget) {
if(BI.isWidget(widget)) {
if (BI.isWidget(widget)) {
var o = widget.options;
if (o.element) {
return $(o.element);
@ -12355,6 +12355,9 @@ _.extend(BI.OB.prototype, {
return $(document.createElement(o.tagName));
}
return $(widget);
},
createFragment: function () {
return document.createDocumentFragment();
}
});
})();(function () {
@ -14941,7 +14944,7 @@ BI.Layout = BI.inherit(BI.Widget, {
_mountChildren: function () {
var self = this;
var frag = document.createDocumentFragment();
var frag = BI.Widget._renderEngine.createFragment();
var hasChild = false;
BI.each(this._children, function (i, widget) {
if (widget.element !== self.element) {
@ -15170,7 +15173,7 @@ BI.Layout = BI.inherit(BI.Widget, {
addItems: function (items) {
var self = this, o = this.options;
var fragment = document.createDocumentFragment();
var fragment = BI.Widget._renderEngine.createFragment();
var added = [];
BI.each(items, function (i, item) {
var w = self._addElement(o.items.length, item);
@ -15188,7 +15191,7 @@ BI.Layout = BI.inherit(BI.Widget, {
prependItems: function (items) {
var self = this;
items = items || [];
var fragment = document.createDocumentFragment();
var fragment = BI.Widget._renderEngine.createFragment();
var added = [];
for (var i = items.length - 1; i >= 0; i--) {
this._addItemAt(0, items[i]);
@ -18737,7 +18740,7 @@ BI.extend(BI.DOM, {
if (BI.isEmpty(doms)) {
return;
}
var frag = document.createDocumentFragment();
var frag = BI.Widget._renderEngine.createFragment();
BI.each(doms, function (i, dom) {
dom instanceof BI.Widget && (dom = dom.element);
dom instanceof $ && dom[0] && frag.appendChild(dom[0]);
@ -37132,10 +37135,10 @@ BI.TreeView = BI.inherit(BI.Pane, {
element: this,
items: [this.tip]
});
if(BI.isNotNull(o.value)){
if(BI.isNotNull(o.value)) {
this.setSelectedValue(o.value);
}
if (BI.isIE9Below()) {
if (BI.isIE9Below && BI.isIE9Below()) {
this.element.addClass("hack");
}
},
@ -41886,7 +41889,7 @@ BI.VirtualList = BI.inherit(BI.Widget, {
this.cache[i].destroyed = true;
}
}
var firstFragment = document.createDocumentFragment(), lastFragment = document.createDocumentFragment();
var firstFragment = BI.Widget._renderEngine.createFragment(), lastFragment = BI.Widget._renderEngine.createFragment();
var currentFragment = firstFragment;
for (var i = (start < 0 ? 0 : start); i <= end && i <= this.renderedIndex; i++) {
var index = this.cache[i].index;
@ -44432,7 +44435,7 @@ BI.Icon = BI.inherit(BI.Single, {
},
_init: function () {
BI.Icon.superclass._init.apply(this, arguments);
if (BI.isIE9Below()) {
if (BI.isIE9Below && BI.isIE9Below()) {
this.element.addClass("hack");
}
}
@ -51513,7 +51516,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
this.colorContainer = BI.createWidget({
type: "bi.layout",
cls: "color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
cls: "color-chooser-trigger-content" + (BI.isIE9Below && BI.isIE9Below() ? " hack" : "")
});
var down = BI.createWidget({

22
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

15
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -12106,7 +12106,7 @@ _.extend(BI.OB.prototype, {
};
BI.Widget.registerRenderEngine({
createElement: function (widget) {
if(BI.isWidget(widget)) {
if (BI.isWidget(widget)) {
var o = widget.options;
if (o.element) {
return $(o.element);
@ -12114,6 +12114,9 @@ _.extend(BI.OB.prototype, {
return $(document.createElement(o.tagName));
}
return $(widget);
},
createFragment: function () {
return document.createDocumentFragment();
}
});
})();(function () {
@ -14446,7 +14449,7 @@ BI.Layout = BI.inherit(BI.Widget, {
_mountChildren: function () {
var self = this;
var frag = document.createDocumentFragment();
var frag = BI.Widget._renderEngine.createFragment();
var hasChild = false;
BI.each(this._children, function (i, widget) {
if (widget.element !== self.element) {
@ -14675,7 +14678,7 @@ BI.Layout = BI.inherit(BI.Widget, {
addItems: function (items) {
var self = this, o = this.options;
var fragment = document.createDocumentFragment();
var fragment = BI.Widget._renderEngine.createFragment();
var added = [];
BI.each(items, function (i, item) {
var w = self._addElement(o.items.length, item);
@ -14693,7 +14696,7 @@ BI.Layout = BI.inherit(BI.Widget, {
prependItems: function (items) {
var self = this;
items = items || [];
var fragment = document.createDocumentFragment();
var fragment = BI.Widget._renderEngine.createFragment();
var added = [];
for (var i = items.length - 1; i >= 0; i--) {
this._addItemAt(0, items[i]);
@ -29577,7 +29580,7 @@ BI.VirtualList = BI.inherit(BI.Widget, {
this.cache[i].destroyed = true;
}
}
var firstFragment = document.createDocumentFragment(), lastFragment = document.createDocumentFragment();
var firstFragment = BI.Widget._renderEngine.createFragment(), lastFragment = BI.Widget._renderEngine.createFragment();
var currentFragment = firstFragment;
for (var i = (start < 0 ? 0 : start); i <= end && i <= this.renderedIndex; i++) {
var index = this.cache[i].index;
@ -32123,7 +32126,7 @@ BI.Icon = BI.inherit(BI.Single, {
},
_init: function () {
BI.Icon.superclass._init.apply(this, arguments);
if (BI.isIE9Below()) {
if (BI.isIE9Below && BI.isIE9Below()) {
this.element.addClass("hack");
}
}

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/base/list/virtuallist.js
Unescape View File

@ -114,7 +114,7 @@ BI.VirtualList = BI.inherit(BI.Widget, {
this.cache[i].destroyed = true;
}
}
var firstFragment = document.createDocumentFragment(), lastFragment = document.createDocumentFragment();
var firstFragment = BI.Widget._renderEngine.createFragment(), lastFragment = BI.Widget._renderEngine.createFragment();
var currentFragment = firstFragment;
for (var i = (start < 0 ? 0 : start); i <= end && i <= this.renderedIndex; i++) {
var index = this.cache[i].index;

2
src/base/single/icon/icon.js
Unescape View File

@ -13,7 +13,7 @@ BI.Icon = BI.inherit(BI.Single, {
},
_init: function () {
BI.Icon.superclass._init.apply(this, arguments);
if (BI.isIE9Below()) {
if (BI.isIE9Below && BI.isIE9Below()) {
this.element.addClass("hack");
}
}

4
src/base/tree/treeview.js
Unescape View File

@ -30,10 +30,10 @@ BI.TreeView = BI.inherit(BI.Pane, {
element: this,
items: [this.tip]
});
if(BI.isNotNull(o.value)){
if(BI.isNotNull(o.value)) {
this.setSelectedValue(o.value);
}
if (BI.isIE9Below()) {
if (BI.isIE9Below && BI.isIE9Below()) {
this.element.addClass("hack");
}
},

2
src/case/colorchooser/colorchooser.trigger.js
Unescape View File

@ -19,7 +19,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
this.colorContainer = BI.createWidget({
type: "bi.layout",
cls: "color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
cls: "color-chooser-trigger-content" + (BI.isIE9Below && BI.isIE9Below() ? " hack" : "")
});
var down = BI.createWidget({

2
src/core/platform/dom/dom.js
Unescape View File

@ -13,7 +13,7 @@ BI.extend(BI.DOM, {
if (BI.isEmpty(doms)) {
return;
}
var frag = document.createDocumentFragment();
var frag = BI.Widget._renderEngine.createFragment();
BI.each(doms, function (i, dom) {
dom instanceof BI.Widget && (dom = dom.element);
dom instanceof $ && dom[0] && frag.appendChild(dom[0]);

5
src/core/widget.js
Unescape View File

@ -476,7 +476,7 @@
};
BI.Widget.registerRenderEngine({
createElement: function (widget) {
if(BI.isWidget(widget)) {
if (BI.isWidget(widget)) {
var o = widget.options;
if (o.element) {
return $(o.element);
@ -484,6 +484,9 @@
return $(document.createElement(o.tagName));
}
return $(widget);
},
createFragment: function () {
return document.createDocumentFragment();
}
});
})();

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

@ -69,7 +69,7 @@ BI.Layout = BI.inherit(BI.Widget, {
_mountChildren: function () {
var self = this;
var frag = document.createDocumentFragment();
var frag = BI.Widget._renderEngine.createFragment();
var hasChild = false;
BI.each(this._children, function (i, widget) {
if (widget.element !== self.element) {
@ -298,7 +298,7 @@ BI.Layout = BI.inherit(BI.Widget, {
addItems: function (items) {
var self = this, o = this.options;
var fragment = document.createDocumentFragment();
var fragment = BI.Widget._renderEngine.createFragment();
var added = [];
BI.each(items, function (i, item) {
var w = self._addElement(o.items.length, item);
@ -316,7 +316,7 @@ BI.Layout = BI.inherit(BI.Widget, {
prependItems: function (items) {
var self = this;
items = items || [];
var fragment = document.createDocumentFragment();
var fragment = BI.Widget._renderEngine.createFragment();
var added = [];
for (var i = items.length - 1; i >= 0; i--) {
this._addItemAt(0, items[i]);

Write Preview
Loading…
Cancel
Save