Browse Source

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

* commit 'cd99b682b3a342b74d694e3c330a22764e0e2dc6':
  Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui
es6
guy 6 years ago
parent
commit
2c88e13951
  1. 37
      dist/bundle.js
  2. 4
      dist/bundle.min.js
  3. 37
      dist/core.js
  4. 37
      dist/fineui.js
  5. 4
      dist/fineui.min.js
  6. 37
      dist/fineui_without_jquery_polyfill.js
  7. 2
      dist/utils.min.js
  8. 37
      src/core/widget.js

37
dist/bundle.js vendored

@ -11802,29 +11802,28 @@ _.extend(BI.OB.prototype, {
this._parent = parent;
},
_mount: function () {
/**
*
* @param force 是否强制挂载子节点
* @param deep 子节点是否也是按照当前force处理
* @param lifeHook 生命周期钩子触不触发默认触发
* @returns {boolean}
* @private
*/
_mount: function (force, deep, lifeHook) {
var self = this;
var isMounted = this._isMounted;
if (isMounted || !this.isVisible() || this.__asking === true) {
return;
}
if (this._isRoot === true) {
isMounted = true;
} else if (this._parent && this._parent._isMounted === true) {
isMounted = true;
}
if (!isMounted) {
return;
if (!force && (this._isMounted || !this.isVisible() || this.__asking === true || !(this._isRoot === true || (this._parent && this._parent._isMounted === true)))) {
return false;
}
this.beforeMount && this.beforeMount();
lifeHook !== false && this.beforeMount && this.beforeMount();
this._isMounted = true;
this._mountChildren && this._mountChildren();
BI.each(this._children, function (i, widget) {
!self.isEnabled() && widget._setEnable(false);
!self.isValid() && widget._setValid(false);
widget._mount && widget._mount();
widget._mount && widget._mount(deep ? force : false, deep, lifeHook);
});
this.mounted && this.mounted();
lifeHook !== false && this.mounted && this.mounted();
return true;
},
@ -12120,6 +12119,14 @@ _.extend(BI.OB.prototype, {
return document.createDocumentFragment();
}
});
BI.mount = function (widget, container) {
if (container) {
BI.Widget._renderEngine.createElement(container).append(widget.element);
return widget._mount(true, false, false);
}
return widget._mount(true, true, false);
};
})();(function () {
var kv = {};
BI.shortcut = function (xtype, cls) {

4
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

37
dist/core.js vendored

@ -11802,29 +11802,28 @@ _.extend(BI.OB.prototype, {
this._parent = parent;
},
_mount: function () {
/**
*
* @param force 是否强制挂载子节点
* @param deep 子节点是否也是按照当前force处理
* @param lifeHook 生命周期钩子触不触发默认触发
* @returns {boolean}
* @private
*/
_mount: function (force, deep, lifeHook) {
var self = this;
var isMounted = this._isMounted;
if (isMounted || !this.isVisible() || this.__asking === true) {
return;
}
if (this._isRoot === true) {
isMounted = true;
} else if (this._parent && this._parent._isMounted === true) {
isMounted = true;
}
if (!isMounted) {
return;
if (!force && (this._isMounted || !this.isVisible() || this.__asking === true || !(this._isRoot === true || (this._parent && this._parent._isMounted === true)))) {
return false;
}
this.beforeMount && this.beforeMount();
lifeHook !== false && this.beforeMount && this.beforeMount();
this._isMounted = true;
this._mountChildren && this._mountChildren();
BI.each(this._children, function (i, widget) {
!self.isEnabled() && widget._setEnable(false);
!self.isValid() && widget._setValid(false);
widget._mount && widget._mount();
widget._mount && widget._mount(deep ? force : false, deep, lifeHook);
});
this.mounted && this.mounted();
lifeHook !== false && this.mounted && this.mounted();
return true;
},
@ -12120,6 +12119,14 @@ _.extend(BI.OB.prototype, {
return document.createDocumentFragment();
}
});
BI.mount = function (widget, container) {
if (container) {
BI.Widget._renderEngine.createElement(container).append(widget.element);
return widget._mount(true, false, false);
}
return widget._mount(true, true, false);
};
})();(function () {
var kv = {};
BI.shortcut = function (xtype, cls) {

37
dist/fineui.js vendored

@ -12044,29 +12044,28 @@ _.extend(BI.OB.prototype, {
this._parent = parent;
},
_mount: function () {
/**
*
* @param force 是否强制挂载子节点
* @param deep 子节点是否也是按照当前force处理
* @param lifeHook 生命周期钩子触不触发默认触发
* @returns {boolean}
* @private
*/
_mount: function (force, deep, lifeHook) {
var self = this;
var isMounted = this._isMounted;
if (isMounted || !this.isVisible() || this.__asking === true) {
return;
}
if (this._isRoot === true) {
isMounted = true;
} else if (this._parent && this._parent._isMounted === true) {
isMounted = true;
}
if (!isMounted) {
return;
if (!force && (this._isMounted || !this.isVisible() || this.__asking === true || !(this._isRoot === true || (this._parent && this._parent._isMounted === true)))) {
return false;
}
this.beforeMount && this.beforeMount();
lifeHook !== false && this.beforeMount && this.beforeMount();
this._isMounted = true;
this._mountChildren && this._mountChildren();
BI.each(this._children, function (i, widget) {
!self.isEnabled() && widget._setEnable(false);
!self.isValid() && widget._setValid(false);
widget._mount && widget._mount();
widget._mount && widget._mount(deep ? force : false, deep, lifeHook);
});
this.mounted && this.mounted();
lifeHook !== false && this.mounted && this.mounted();
return true;
},
@ -12362,6 +12361,14 @@ _.extend(BI.OB.prototype, {
return document.createDocumentFragment();
}
});
BI.mount = function (widget, container) {
if (container) {
BI.Widget._renderEngine.createElement(container).append(widget.element);
return widget._mount(true, false, false);
}
return widget._mount(true, true, false);
};
})();(function () {
var kv = {};
BI.shortcut = function (xtype, cls) {

4
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

37
dist/fineui_without_jquery_polyfill.js vendored

@ -11802,29 +11802,28 @@ _.extend(BI.OB.prototype, {
this._parent = parent;
},
_mount: function () {
/**
*
* @param force 是否强制挂载子节点
* @param deep 子节点是否也是按照当前force处理
* @param lifeHook 生命周期钩子触不触发默认触发
* @returns {boolean}
* @private
*/
_mount: function (force, deep, lifeHook) {
var self = this;
var isMounted = this._isMounted;
if (isMounted || !this.isVisible() || this.__asking === true) {
return;
}
if (this._isRoot === true) {
isMounted = true;
} else if (this._parent && this._parent._isMounted === true) {
isMounted = true;
}
if (!isMounted) {
return;
if (!force && (this._isMounted || !this.isVisible() || this.__asking === true || !(this._isRoot === true || (this._parent && this._parent._isMounted === true)))) {
return false;
}
this.beforeMount && this.beforeMount();
lifeHook !== false && this.beforeMount && this.beforeMount();
this._isMounted = true;
this._mountChildren && this._mountChildren();
BI.each(this._children, function (i, widget) {
!self.isEnabled() && widget._setEnable(false);
!self.isValid() && widget._setValid(false);
widget._mount && widget._mount();
widget._mount && widget._mount(deep ? force : false, deep, lifeHook);
});
this.mounted && this.mounted();
lifeHook !== false && this.mounted && this.mounted();
return true;
},
@ -12120,6 +12119,14 @@ _.extend(BI.OB.prototype, {
return document.createDocumentFragment();
}
});
BI.mount = function (widget, container) {
if (container) {
BI.Widget._renderEngine.createElement(container).append(widget.element);
return widget._mount(true, false, false);
}
return widget._mount(true, true, false);
};
})();(function () {
var kv = {};
BI.shortcut = function (xtype, cls) {

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

37
src/core/widget.js

@ -171,29 +171,28 @@
this._parent = parent;
},
_mount: function () {
/**
*
* @param force 是否强制挂载子节点
* @param deep 子节点是否也是按照当前force处理
* @param lifeHook 生命周期钩子触不触发默认触发
* @returns {boolean}
* @private
*/
_mount: function (force, deep, lifeHook) {
var self = this;
var isMounted = this._isMounted;
if (isMounted || !this.isVisible() || this.__asking === true) {
return;
}
if (this._isRoot === true) {
isMounted = true;
} else if (this._parent && this._parent._isMounted === true) {
isMounted = true;
if (!force && (this._isMounted || !this.isVisible() || this.__asking === true || !(this._isRoot === true || (this._parent && this._parent._isMounted === true)))) {
return false;
}
if (!isMounted) {
return;
}
this.beforeMount && this.beforeMount();
lifeHook !== false && this.beforeMount && this.beforeMount();
this._isMounted = true;
this._mountChildren && this._mountChildren();
BI.each(this._children, function (i, widget) {
!self.isEnabled() && widget._setEnable(false);
!self.isValid() && widget._setValid(false);
widget._mount && widget._mount();
widget._mount && widget._mount(deep ? force : false, deep, lifeHook);
});
this.mounted && this.mounted();
lifeHook !== false && this.mounted && this.mounted();
return true;
},
@ -489,4 +488,12 @@
return document.createDocumentFragment();
}
});
BI.mount = function (widget, container) {
if (container) {
BI.Widget._renderEngine.createElement(container).append(widget.element);
return widget._mount(true, false, false);
}
return widget._mount(true, true, false);
};
})();
Loading…
Cancel
Save