From 1a625516911430b32cf9c70ce5825d6b93eef4c7 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Thu, 28 Aug 2014 17:02:56 -0400
Subject: [PATCH] new asset WIP

---
 extensions/debug/DebugAsset.php          | 4 ++--
 framework/captcha/CaptchaAsset.php       | 3 +--
 framework/grid/GridViewAsset.php         | 3 +--
 framework/validators/PunycodeAsset.php   | 1 -
 framework/validators/ValidationAsset.php | 3 +--
 framework/widgets/ActiveFormAsset.php    | 3 +--
 framework/widgets/MaskedInputAsset.php   | 3 +--
 framework/widgets/PjaxAsset.php          | 3 +--
 8 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/extensions/debug/DebugAsset.php b/extensions/debug/DebugAsset.php
index f1ba95b80b..09d5f31cbd 100644
--- a/extensions/debug/DebugAsset.php
+++ b/extensions/debug/DebugAsset.php
@@ -18,8 +18,8 @@ use yii\web\AssetBundle;
 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
index 8af07e17a9..bf10100dc9 100644
--- a/framework/captcha/CaptchaAsset.php
+++ b/framework/captcha/CaptchaAsset.php
@@ -17,9 +17,8 @@ use yii\web\AssetBundle;
  */
 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
index 0403e9f5b7..3ecf136e94 100644
--- a/framework/grid/GridViewAsset.php
+++ b/framework/grid/GridViewAsset.php
@@ -17,9 +17,8 @@ use yii\web\AssetBundle;
  */
 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
index 1988da5e8a..b8d0d125ec 100644
--- a/framework/validators/PunycodeAsset.php
+++ b/framework/validators/PunycodeAsset.php
@@ -17,7 +17,6 @@ use yii\web\AssetBundle;
  */
 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
index a25acffd62..3fbd40c664 100644
--- a/framework/validators/ValidationAsset.php
+++ b/framework/validators/ValidationAsset.php
@@ -17,9 +17,8 @@ use yii\web\AssetBundle;
  */
 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
index 971606318a..c95ff07a65 100644
--- a/framework/widgets/ActiveFormAsset.php
+++ b/framework/widgets/ActiveFormAsset.php
@@ -15,9 +15,8 @@ use yii\web\AssetBundle;
  */
 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
index fea33d053b..086855a0cb 100644
--- a/framework/widgets/MaskedInputAsset.php
+++ b/framework/widgets/MaskedInputAsset.php
@@ -19,9 +19,8 @@ use yii\web\AssetBundle;
  */
 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
index 4844f797fb..dfbfcc29ca 100644
--- a/framework/widgets/PjaxAsset.php
+++ b/framework/widgets/PjaxAsset.php
@@ -17,9 +17,8 @@ use yii\web\AssetBundle;
  */
 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',