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

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

* commit '96f0445a0452a9dff3bc911abd03c44f7eda3441':
  update
  update
es6
guy 6 years ago
parent
3d4bd87458 96f0445a04
commit
79523af80a
9 changed files with 70 additions and 55 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. 19
      dist/bundle.js
  2. 4
      dist/bundle.min.js
  3. 19
      dist/core.js
  4. 19
      dist/fineui.js
  5. 4
      dist/fineui.min.js
  6. 19
      dist/fineui_without_jquery_polyfill.js
  7. 2
      dist/utils.min.js
  8. 2
      src/core/shortcut.js
  9. 17
      src/core/widget.js

19
dist/bundle.js vendored
Unescape View File

@ -12123,15 +12123,18 @@ _.extend(BI.OB.prototype, {
}); });
BI.mount = function (widget, container, predicate, hydrate) { BI.mount = function (widget, container, predicate, hydrate) {
if(hydrate === true){ if (hydrate === true) {
// 将widget的element元素都挂载好，并建立相互关系 // 将widget的element元素都挂载好，并建立相互关系
var res = widget._mount(true, false, false, function(w){ widget.element.data("__widgets", [widget]);
var ws = w.element.data("__widgets"); var res = widget._mount(true, false, false, function (w) {
if(!ws) { BI.each(w._children, function (i, child) {
var ws = child.element.data("__widgets");
if (!ws) {
ws = []; ws = [];
} }
ws.push(w); ws.push(child);
w.element.data("__widgets", ws); child.element.data("__widgets", ws);
});
predicate && predicate.apply(this, arguments); predicate && predicate.apply(this, arguments);
}); });
// 将新的dom树属性（事件等）patch到已存在的dom上 // 将新的dom树属性（事件等）patch到已存在的dom上
@ -12145,7 +12148,7 @@ _.extend(BI.OB.prototype, {
triggerLifeHook(child); triggerLifeHook(child);
}); });
}; };
//最后触发组件树生命周期函数 // 最后触发组件树生命周期函数
triggerLifeHook(widget); triggerLifeHook(widget);
return res; return res;
} }
@ -12175,7 +12178,7 @@ _.extend(BI.OB.prototype, {
BI.createWidget = function (item, options, context) { BI.createWidget = function (item, options, context) {
// 先把准备环境准备好 // 先把准备环境准备好
while(BI.prepares && BI.prepares.length > 0) { while (BI.prepares && BI.prepares.length > 0) {
BI.prepares.shift()(); BI.prepares.shift()();
} }
var el, w; var el, w;

4
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

19
dist/core.js vendored
Unescape View File

@ -12123,15 +12123,18 @@ _.extend(BI.OB.prototype, {
}); });
BI.mount = function (widget, container, predicate, hydrate) { BI.mount = function (widget, container, predicate, hydrate) {
if(hydrate === true){ if (hydrate === true) {
// 将widget的element元素都挂载好，并建立相互关系 // 将widget的element元素都挂载好，并建立相互关系
var res = widget._mount(true, false, false, function(w){ widget.element.data("__widgets", [widget]);
var ws = w.element.data("__widgets"); var res = widget._mount(true, false, false, function (w) {
if(!ws) { BI.each(w._children, function (i, child) {
var ws = child.element.data("__widgets");
if (!ws) {
ws = []; ws = [];
} }
ws.push(w); ws.push(child);
w.element.data("__widgets", ws); child.element.data("__widgets", ws);
});
predicate && predicate.apply(this, arguments); predicate && predicate.apply(this, arguments);
}); });
// 将新的dom树属性（事件等）patch到已存在的dom上 // 将新的dom树属性（事件等）patch到已存在的dom上
@ -12145,7 +12148,7 @@ _.extend(BI.OB.prototype, {
triggerLifeHook(child); triggerLifeHook(child);
}); });
}; };
//最后触发组件树生命周期函数 // 最后触发组件树生命周期函数
triggerLifeHook(widget); triggerLifeHook(widget);
return res; return res;
} }
@ -12175,7 +12178,7 @@ _.extend(BI.OB.prototype, {
BI.createWidget = function (item, options, context) { BI.createWidget = function (item, options, context) {
// 先把准备环境准备好 // 先把准备环境准备好
while(BI.prepares && BI.prepares.length > 0) { while (BI.prepares && BI.prepares.length > 0) {
BI.prepares.shift()(); BI.prepares.shift()();
} }
var el, w; var el, w;

19
dist/fineui.js vendored
Unescape View File

@ -12365,15 +12365,18 @@ _.extend(BI.OB.prototype, {
}); });
BI.mount = function (widget, container, predicate, hydrate) { BI.mount = function (widget, container, predicate, hydrate) {
if(hydrate === true){ if (hydrate === true) {
// 将widget的element元素都挂载好，并建立相互关系 // 将widget的element元素都挂载好，并建立相互关系
var res = widget._mount(true, false, false, function(w){ widget.element.data("__widgets", [widget]);
var ws = w.element.data("__widgets"); var res = widget._mount(true, false, false, function (w) {
if(!ws) { BI.each(w._children, function (i, child) {
var ws = child.element.data("__widgets");
if (!ws) {
ws = []; ws = [];
} }
ws.push(w); ws.push(child);
w.element.data("__widgets", ws); child.element.data("__widgets", ws);
});
predicate && predicate.apply(this, arguments); predicate && predicate.apply(this, arguments);
}); });
// 将新的dom树属性（事件等）patch到已存在的dom上 // 将新的dom树属性（事件等）patch到已存在的dom上
@ -12387,7 +12390,7 @@ _.extend(BI.OB.prototype, {
triggerLifeHook(child); triggerLifeHook(child);
}); });
}; };
//最后触发组件树生命周期函数 // 最后触发组件树生命周期函数
triggerLifeHook(widget); triggerLifeHook(widget);
return res; return res;
} }
@ -12417,7 +12420,7 @@ _.extend(BI.OB.prototype, {
BI.createWidget = function (item, options, context) { BI.createWidget = function (item, options, context) {
// 先把准备环境准备好 // 先把准备环境准备好
while(BI.prepares && BI.prepares.length > 0) { while (BI.prepares && BI.prepares.length > 0) {
BI.prepares.shift()(); BI.prepares.shift()();
} }
var el, w; var el, w;

4
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

19
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -12123,15 +12123,18 @@ _.extend(BI.OB.prototype, {
}); });
BI.mount = function (widget, container, predicate, hydrate) { BI.mount = function (widget, container, predicate, hydrate) {
if(hydrate === true){ if (hydrate === true) {
// 将widget的element元素都挂载好，并建立相互关系 // 将widget的element元素都挂载好，并建立相互关系
var res = widget._mount(true, false, false, function(w){ widget.element.data("__widgets", [widget]);
var ws = w.element.data("__widgets"); var res = widget._mount(true, false, false, function (w) {
if(!ws) { BI.each(w._children, function (i, child) {
var ws = child.element.data("__widgets");
if (!ws) {
ws = []; ws = [];
} }
ws.push(w); ws.push(child);
w.element.data("__widgets", ws); child.element.data("__widgets", ws);
});
predicate && predicate.apply(this, arguments); predicate && predicate.apply(this, arguments);
}); });
// 将新的dom树属性（事件等）patch到已存在的dom上 // 将新的dom树属性（事件等）patch到已存在的dom上
@ -12145,7 +12148,7 @@ _.extend(BI.OB.prototype, {
triggerLifeHook(child); triggerLifeHook(child);
}); });
}; };
//最后触发组件树生命周期函数 // 最后触发组件树生命周期函数
triggerLifeHook(widget); triggerLifeHook(widget);
return res; return res;
} }
@ -12175,7 +12178,7 @@ _.extend(BI.OB.prototype, {
BI.createWidget = function (item, options, context) { BI.createWidget = function (item, options, context) {
// 先把准备环境准备好 // 先把准备环境准备好
while(BI.prepares && BI.prepares.length > 0) { while (BI.prepares && BI.prepares.length > 0) {
BI.prepares.shift()(); BI.prepares.shift()();
} }
var el, w; var el, w;

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/core/shortcut.js
Unescape View File

@ -19,7 +19,7 @@
BI.createWidget = function (item, options, context) { BI.createWidget = function (item, options, context) {
// 先把准备环境准备好 // 先把准备环境准备好
while(BI.prepares && BI.prepares.length > 0) { while (BI.prepares && BI.prepares.length > 0) {
BI.prepares.shift()(); BI.prepares.shift()();
} }
var el, w; var el, w;

17
src/core/widget.js
Unescape View File

@ -492,15 +492,18 @@
}); });
BI.mount = function (widget, container, predicate, hydrate) { BI.mount = function (widget, container, predicate, hydrate) {
if(hydrate === true){ if (hydrate === true) {
// 将widget的element元素都挂载好，并建立相互关系 // 将widget的element元素都挂载好，并建立相互关系
var res = widget._mount(true, false, false, function(w){ widget.element.data("__widgets", [widget]);
var ws = w.element.data("__widgets"); var res = widget._mount(true, false, false, function (w) {
if(!ws) { BI.each(w._children, function (i, child) {
var ws = child.element.data("__widgets");
if (!ws) {
ws = []; ws = [];
} }
ws.push(w); ws.push(child);
w.element.data("__widgets", ws); child.element.data("__widgets", ws);
});
predicate && predicate.apply(this, arguments); predicate && predicate.apply(this, arguments);
}); });
// 将新的dom树属性（事件等）patch到已存在的dom上 // 将新的dom树属性（事件等）patch到已存在的dom上
@ -514,7 +517,7 @@
triggerLifeHook(child); triggerLifeHook(child);
}); });
}; };
//最后触发组件树生命周期函数 // 最后触发组件树生命周期函数
triggerLifeHook(widget); triggerLifeHook(widget);
return res; return res;
} }

Write Preview
Loading…
Cancel
Save