Browse Source

Pull request #1532: 无JIRA任务 bugfix

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

* commit '9ba0f3f17ee9e4a5db28a457ecbba6a668016a6a':
  context重构
  context重构
es6
guy 4 years ago
parent
commit
a11cd667f5
  1. 6
      dist/fix/fix.compact.ie.js
  2. 6
      dist/fix/fix.compact.js
  3. 12
      src/core/widget.js

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

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

6
dist/fix/fix.compact.js vendored

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

12
src/core/widget.js

@ -517,8 +517,10 @@
}; };
BI.Widget.popContext = function () { BI.Widget.popContext = function () {
contextStack.pop(); BI.Widget.context = context = contextStack.pop();
BI.Widget.context = context = null; if (contextStack.length <= 0) {
BI.Widget.context = context = null;
}
}; };
function pushTarget (_current) { function pushTarget (_current) {
@ -527,8 +529,10 @@
} }
function popTarget () { function popTarget () {
currentStack.pop(); BI.Widget.current = current = currentStack.pop();
BI.Widget.current = current = null; if (currentStack.length <= 0) {
BI.Widget.current = current = null;
}
} }
BI.onBeforeMount = function (beforeMount) { BI.onBeforeMount = function (beforeMount) {

Loading…
Cancel
Save