From 7849759e92fa613670f2fb94945014bfc5ec9ede Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Wed, 29 Nov 2017 17:57:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/BI4.1'

# Conflicts:
#	dist/bundle.min.js
---
 dist/fix/fix.compact.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/fix/fix.compact.js b/dist/fix/fix.compact.js
index 83de70346..37bb87d0b 100644
--- a/dist/fix/fix.compact.js
+++ b/dist/fix/fix.compact.js
@@ -76,11 +76,11 @@
 
     _.each(["mounted", "populate"], function (name) {
         var old = BI.Widget.prototype[name];
-        old && BI.Widget.prototype[name] = function () {
+        old && (BI.Widget.prototype[name] = function () {
             this.store && pushTarget(this.store);
             return old.apply(this, arguments);
             this.store && popTarget();
-        };
+        });
     })
 
     _.each(["each", "map", "reduce", "reduceRight", "find", "filter", "reject", "every", "all", "some", "any", "max", "min",