php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-25 19:20:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #5061: Switched to use jquery composer package.

Browse Source
This commit is contained in:
Qiang Xue
2014-09-17 09:59:44 -04:00
parent db26e65c62
commit ecdb41e046
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@@ -76,6 +76,7 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"lib-pcre": "*", "lib-pcre": "*",
"yiisoft/yii2-composer": "*", "yiisoft/yii2-composer": "*",
"yiisoft/jquery": "~2.0 | ~1.10",
"ezyang/htmlpurifier": "4.6.*", "ezyang/htmlpurifier": "4.6.*",
"cebe/markdown": "0.9.*", "cebe/markdown": "0.9.*",
"bower-asset/jquery": ">=1.8", "bower-asset/jquery": ">=1.8",

1
framework/composer.json
View File

@@ -56,6 +56,7 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"lib-pcre": "*", "lib-pcre": "*",
"yiisoft/yii2-composer": "*", "yiisoft/yii2-composer": "*",
"yiisoft/jquery": "~2.0 | ~1.10",
"ezyang/htmlpurifier": "4.6.*", "ezyang/htmlpurifier": "4.6.*",
"cebe/markdown": "0.9.*", "cebe/markdown": "0.9.*",
"bower-asset/jquery": ">=1.8", "bower-asset/jquery": ">=1.8",

2
framework/web/JqueryAsset.php
View File

@@ -15,7 +15,7 @@ namespace yii\web;
*/ */
class JqueryAsset extends AssetBundle class JqueryAsset extends AssetBundle
{ {
public $sourcePath = '@bower/jquery'; public $sourcePath = '@vendor/yiisoft/jquery';
public $js = [ public $js = [
'dist/jquery.js', 'dist/jquery.js',
]; ];