From ecdb41e04619e904e1bc7db066b84351be7c409f Mon Sep 17 00:00:00 2001 From: Qiang Xue <qiang.xue@gmail.com> Date: Wed, 17 Sep 2014 09:59:44 -0400 Subject: [PATCH] Fixes #5061: Switched to use jquery composer package. --- composer.json | 1 + framework/composer.json | 1 + framework/web/JqueryAsset.php | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b731bd6..f39e0f4 100644 --- a/composer.json +++ b/composer.json @@ -76,6 +76,7 @@ "ext-mbstring": "*", "lib-pcre": "*", "yiisoft/yii2-composer": "*", + "yiisoft/jquery": "~2.0 | ~1.10", "ezyang/htmlpurifier": "4.6.*", "cebe/markdown": "0.9.*", "bower-asset/jquery": ">=1.8", diff --git a/framework/composer.json b/framework/composer.json index 1905f5c..6571074 100644 --- a/framework/composer.json +++ b/framework/composer.json @@ -56,6 +56,7 @@ "ext-mbstring": "*", "lib-pcre": "*", "yiisoft/yii2-composer": "*", + "yiisoft/jquery": "~2.0 | ~1.10", "ezyang/htmlpurifier": "4.6.*", "cebe/markdown": "0.9.*", "bower-asset/jquery": ">=1.8", diff --git a/framework/web/JqueryAsset.php b/framework/web/JqueryAsset.php index a7d73ad..467b494 100644 --- a/framework/web/JqueryAsset.php +++ b/framework/web/JqueryAsset.php @@ -15,7 +15,7 @@ namespace yii\web; */ class JqueryAsset extends AssetBundle { - public $sourcePath = '@bower/jquery'; + public $sourcePath = '@vendor/yiisoft/jquery'; public $js = [ 'dist/jquery.js', ]; -- libgit2 0.27.1