Pull request #1532: 无JIRA任务 bugfix

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

* commit '9ba0f3f17ee9e4a5db28a457ecbba6a668016a6a':
  context重构
  context重构

dist/fix/fix.compact.ie.js

@@ -33,8 +33,10 @@
     }
 
     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;

dist/fix/fix.compact.js

@@ -33,8 +33,10 @@
     }
 
     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;

src/core/widget.js

@@ -517,8 +517,10 @@
     };
 
     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) {
@@ -527,8 +529,10 @@
     }
 
     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) {