Browse Source

Pull request #1533: 无JIRA任务 context重构

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit 'adcbbde1d6be4c02bba5e397dbde440fb56d4a35':
  context重构
es6
guy 4 years ago
parent
commit
2ec11a5aa0
  1. 13
      dist/fix/fix.compact.ie.js
  2. 3
      dist/fix/fix.compact.js
  3. 6
      src/core/widget.js

13
dist/fix/fix.compact.ie.js vendored

@ -34,9 +34,6 @@
function popTarget () { function popTarget () {
Fix.Model.target = target = targetStack.pop(); Fix.Model.target = target = targetStack.pop();
if (targetStack.length <= 0) {
Fix.Model.target = target = null;
}
} }
var oldWatch = Fix.watch; var oldWatch = Fix.watch;
@ -231,14 +228,14 @@
BI.defer(function () { BI.defer(function () {
additionFunc(); additionFunc();
}, 200); }, 200);
} };
var back = window.history.back; var back = window.history.back;
window.history.back = function () { window.history.back = function () {
back.apply(this, arguments); back.apply(this, arguments);
BI.defer(function () { BI.defer(function () {
additionFunc(); additionFunc();
}, 200); }, 200);
} };
} }
if (BI.Router) { if (BI.Router) {
@ -246,7 +243,7 @@
BI.Router.prototype.execute = function () { BI.Router.prototype.execute = function () {
execute.apply(this, arguments); execute.apply(this, arguments);
additionFunc(); additionFunc();
} };
} }
_.each(["each", "map", "reduce", "reduceRight", "find", "filter", "reject", "every", "all", "some", "any", "max", "min", _.each(["each", "map", "reduce", "reduceRight", "find", "filter", "reject", "every", "all", "some", "any", "max", "min",
@ -325,7 +322,7 @@
} finally { } finally {
return _.cloneDeep(obj); return _.cloneDeep(obj);
} }
} };
Fix.del = function (obj, k) { Fix.del = function (obj, k) {
try { try {
delete obj[k]; delete obj[k];
@ -334,5 +331,5 @@
} finally { } finally {
return _.cloneDeep(obj); return _.cloneDeep(obj);
} }
} };
}()); }());

3
dist/fix/fix.compact.js vendored

@ -34,9 +34,6 @@
function popTarget () { function popTarget () {
Fix.Model.target = target = targetStack.pop(); Fix.Model.target = target = targetStack.pop();
if (targetStack.length <= 0) {
Fix.Model.target = target = null;
}
} }
var oldWatch = Fix.watch; var oldWatch = Fix.watch;

6
src/core/widget.js

@ -518,9 +518,6 @@
BI.Widget.popContext = function () { BI.Widget.popContext = function () {
BI.Widget.context = context = contextStack.pop(); BI.Widget.context = context = contextStack.pop();
if (contextStack.length <= 0) {
BI.Widget.context = context = null;
}
}; };
function pushTarget (_current) { function pushTarget (_current) {
@ -530,9 +527,6 @@
function popTarget () { function popTarget () {
BI.Widget.current = current = currentStack.pop(); BI.Widget.current = current = currentStack.pop();
if (currentStack.length <= 0) {
BI.Widget.current = current = null;
}
} }
BI.onBeforeMount = function (beforeMount) { BI.onBeforeMount = function (beforeMount) {

Loading…
Cancel
Save