Fixes yiisoft#5061: Switched to use jquery composer package.

switchy · Sep 17, 2014 · ecdb41e · ecdb41e
1 parent db26e65
commit ecdb41e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -15,7 +15,7 @@
  */
 class JqueryAsset extends AssetBundle
 {
- public $sourcePath = '@bower/jquery';
+ public $sourcePath = '@vendor/yiisoft/jquery';
  public $js = [
  'dist/jquery.js',
  ];