Issue yiisoft#12580 Make yii.js comply to js strict mode

Deele · Sep 24, 2016 · 3d4ab26 · 3d4ab26
1 parent d0fb0d9
commit 3d4ab26
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -79,6 +79,7 @@ Yii Framework 2 Change Log
 - Enh #12440: Added `yii\base\Event::offAll()` method allowing clear all registered class-level event handlers (klimov-paul)
 - Enh: Method `yii\console\controllers\AssetController::getAssetManager()` automatically enables `yii\web\AssetManager::forceCopy` in case it is not explicitly specified (pana1990, klimov-paul)
 
+- Enh #12580: Make `yii.js` comply with strict and non-strict javascript mode to allow concatenation with external code (mikehaertl)
 
 2.0.9 July 11, 2016
 -------------------

diff --git a/framework/assets/yii.js b/framework/assets/yii.js
@@ -41,7 +41,7 @@
  *
  * You must call "yii.initModule()" once for the root module of all your modules.
  */
-yii = (function ($) {
+window.yii = (function ($) {
     var pub = {
         /**
          * List of JS or CSS URLs that can be loaded multiple times via AJAX requests. Each script can be represented