FIX object scope

digitv · Jan 29, 2018 · ce4450f · ce4450f
1 parent 26d3763
commit ce4450f
Show file tree

Hide file tree

Showing 3 changed files with 362 additions and 345 deletions.
diff --git a/assets/Yii2LiveAsset.php b/assets/Yii2LiveAsset.php
@@ -68,7 +68,7 @@ public function registerAssetFiles($view)
         $settingsJson = json_encode($settings);
         $jsSettings = new JsExpression("
         if(typeof yii2live === 'undefined') yii2live = new Yii2Live(" . $settingsJson . ");
-        else yii2live.settings.merge(" . $settingsJson . ");
+        else yii2live.settingsUtils.merge(" . $settingsJson . ");
         ");
         /** @var $view View|\yii\web\View */
         parent::registerAssetFiles($view);

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "digitv/yii2live",
-    "version": "1.1.8",
+    "version": "1.1.9",
     "description": "Yii2 Live package",
     "keywords": ["yii2", "ajax", "live", "node.js"],
     "type": "yii2-extension",