new asset WIP

switchy · Aug 28, 2014 · 1a62551 · 1a62551
1 parent eb7ffc8
commit 1a62551
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 15 deletions.
diff --git a/extensions/debug/DebugAsset.php b/extensions/debug/DebugAsset.php
@@ -18,8 +18,8 @@
 class DebugAsset extends AssetBundle
 {
  public $css = [
- 'yii2-debug\assets\main.css',
- 'yii2-debug\assets\toolbar.css',
+ 'yii2-debug/assets/main.css',
+ 'yii2-debug/assets/toolbar.css',
  ];
  public $depends = [
  'yii\web\YiiAsset',

diff --git a/framework/captcha/CaptchaAsset.php b/framework/captcha/CaptchaAsset.php
@@ -17,9 +17,8 @@
  */
 class CaptchaAsset extends AssetBundle
 {
- public $sourcePath = '@yii/assets';
  public $js = [
- 'yii.captcha.js',
+ 'yii2/assets/yii.captcha.js',
  ];
  public $depends = [
  'yii\web\YiiAsset',

diff --git a/framework/grid/GridViewAsset.php b/framework/grid/GridViewAsset.php
@@ -17,9 +17,8 @@
  */
 class GridViewAsset extends AssetBundle
 {
- public $sourcePath = '@yii/assets';
  public $js = [
- 'yii.gridView.js',
+ 'yii2/assets/yii.gridView.js',
  ];
  public $depends = [
  'yii\web\YiiAsset',

diff --git a/framework/validators/PunycodeAsset.php b/framework/validators/PunycodeAsset.php
@@ -17,7 +17,6 @@
  */
 class PunycodeAsset extends AssetBundle
 {
- public $sourcePath = '@yii/assets';
  public $js = [
  'punycode/punycode.js',
  ];

diff --git a/framework/validators/ValidationAsset.php b/framework/validators/ValidationAsset.php
@@ -17,9 +17,8 @@
  */
 class ValidationAsset extends AssetBundle
 {
- public $sourcePath = '@yii/assets';
  public $js = [
- 'yii.validation.js',
+ 'yii2/assets/yii.validation.js',
  ];
  public $depends = [
  'yii\web\YiiAsset',

diff --git a/framework/widgets/ActiveFormAsset.php b/framework/widgets/ActiveFormAsset.php
@@ -15,9 +15,8 @@
  */
 class ActiveFormAsset extends AssetBundle
 {
- public $sourcePath = '@yii/assets';
  public $js = [
- 'yii.activeForm.js',
+ 'yii2/assets/yii.activeForm.js',
  ];
  public $depends = [
  'yii\web\YiiAsset',

diff --git a/framework/widgets/MaskedInputAsset.php b/framework/widgets/MaskedInputAsset.php
@@ -19,9 +19,8 @@
  */
 class MaskedInputAsset extends AssetBundle
 {
- public $sourcePath = '@yii/assets';
  public $js = [
- 'jquery.inputmask.bundle.min.js'
+ 'jquery.inputmask/dist/jquery.inputmask.bundle.js'
  ];
  public $depends = [
  'yii\web\YiiAsset'

diff --git a/framework/widgets/PjaxAsset.php b/framework/widgets/PjaxAsset.php
@@ -17,9 +17,8 @@
  */
 class PjaxAsset extends AssetBundle
 {
- public $sourcePath = '@vendor/yiisoft/jquery-pjax';
  public $js = [
- 'jquery.pjax.js',
+ 'yii2-pjax/jquery.pjax.js',
  ];
  public $depends = [
  'yii\web\YiiAsset',