new asset WIP

yiisoft · Aug 30, 2014 · dd4f98e · dd4f98e
1 parent 936fb71
commit dd4f98e
Show file tree

Hide file tree

Showing 74 changed files with 31 additions and 18,698 deletions.
diff --git a/Accordion.php b/Accordion.php
@@ -96,7 +96,7 @@ public function run()
         echo Html::beginTag($tag, $options) . "\n";
         echo $this->renderItems() . "\n";
         echo Html::endTag($tag) . "\n";
-        $this->registerWidget('accordion', AccordionAsset::className());
+        $this->registerWidget('accordion');
     }
 
     /**

diff --git a/AccordionAsset.php b/AccordionAsset.php
diff --git a/AutoComplete.php b/AutoComplete.php
@@ -47,7 +47,7 @@ class AutoComplete extends InputWidget
     public function run()
     {
         echo $this->renderWidget();
-        $this->registerWidget('autocomplete', AutoCompleteAsset::className());
+        $this->registerWidget('autocomplete');
     }
 
     /**

diff --git a/AutoCompleteAsset.php b/AutoCompleteAsset.php
diff --git a/ButtonAsset.php b/ButtonAsset.php
@@ -15,9 +15,8 @@
  */
 class ButtonAsset extends AssetBundle
 {
-    public $sourcePath = '@yii/jui/assets';
     public $js = [
-        'jquery.ui.button.js',
+        'jquery.ui/ui/button.js',
     ];
     public $depends = [
         'yii\jui\CoreAsset',

diff --git a/CoreAsset.php b/CoreAsset.php
@@ -15,12 +15,11 @@
  */
 class CoreAsset extends AssetBundle
 {
-    public $sourcePath = '@yii/jui/assets';
     public $js = [
-        'jquery.ui.core.js',
-        'jquery.ui.widget.js',
-        'jquery.ui.position.js',
-        'jquery.ui.mouse.js',
+        'jquery.ui/ui/core.js',
+        'jquery.ui/ui/widget.js',
+        'jquery.ui/ui/position.js',
+        'jquery.ui/ui/mouse.js',
     ];
     public $depends = [
         'yii\web\JqueryAsset',

diff --git a/DatePicker.php b/DatePicker.php
@@ -82,17 +82,17 @@ public function run()
         $language = $this->language ? $this->language : Yii::$app->language;
         if ($language != 'en-US') {
             $view = $this->getView();
-            DatePickerRegionalAsset::register($view);
+            DatePickerLanguageAsset::register($view);
 
             $options = Json::encode($this->clientOptions);
             $view->registerJs("$('#{$containerID}').datepicker($.extend({}, $.datepicker.regional['{$language}'], $options));");
 
             $options = $this->clientOptions;
             $this->clientOptions = false; // the datepicker js widget is already registered
-            $this->registerWidget('datepicker', DatePickerAsset::className(), $containerID);
+            $this->registerWidget('datepicker', $containerID);
             $this->clientOptions = $options;
         } else {
-            $this->registerWidget('datepicker', DatePickerAsset::className(), $containerID);
+            $this->registerWidget('datepicker', $containerID);
         }
     }
 

diff --git a/DatePickerAsset.php b/DatePickerAsset.php
diff --git a/DatePickerRegionalAsset.php → DatePickerLanguageAsset.php b/DatePickerRegionalAsset.php → DatePickerLanguageAsset.php
@@ -13,13 +13,12 @@
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class DatePickerRegionalAsset extends AssetBundle
+class DatePickerLanguageAsset extends AssetBundle
 {
-    public $sourcePath = '@yii/jui/assets';
     public $js = [
         'jquery.ui.datepicker-i18n.js',
     ];
     public $depends = [
-        'yii\jui\DatePickerAsset',
+        'yii\jui\JuiAsset',
     ];
 }
diff --git a/Dialog.php b/Dialog.php
@@ -47,6 +47,6 @@ public function init()
     public function run()
     {
         echo Html::endTag('div') . "\n";
-        $this->registerWidget('dialog', DialogAsset::className());
+        $this->registerWidget('dialog');
     }
 }
diff --git a/DialogAsset.php b/DialogAsset.php
diff --git a/Draggable.php b/Draggable.php
@@ -45,6 +45,6 @@ public function init()
     public function run()
     {
         echo Html::endTag('div') . "\n";
-        $this->registerWidget('draggable', DraggableAsset::className());
+        $this->registerWidget('draggable');
     }
 }
diff --git a/DraggableAsset.php b/DraggableAsset.php
diff --git a/Droppable.php b/Droppable.php
@@ -45,6 +45,6 @@ public function init()
     public function run()
     {
         echo Html::endTag('div') . "\n";
-        $this->registerWidget('droppable', DroppableAsset::className());
+        $this->registerWidget('droppable');
     }
 }
diff --git a/DroppableAsset.php b/DroppableAsset.php
diff --git a/EffectAsset.php → JuiAsset.php b/EffectAsset.php → JuiAsset.php
@@ -13,11 +13,13 @@
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class EffectAsset extends AssetBundle
+class JuiAsset extends AssetBundle
 {
-    public $sourcePath = '@yii/jui/assets';
     public $js = [
-        'jquery.ui.effect-all.js',
+        'jquery-ui/jquery-ui.js',
+    ];
+    public $css = [
+        'jquery-ui/themes/smoothness/jquery-ui.css',
     ];
     public $depends = [
         'yii\web\JqueryAsset',

diff --git a/Menu.php b/Menu.php
@@ -54,10 +54,7 @@ public function run()
         parent::run();
 
         $view = $this->getView();
-        MenuAsset::register($view);
-        /* @var $themeAsset \yii\web\AssetBundle */
-        $themeAsset = Widget::$theme;
-        $themeAsset::register($view);
+        JuiAsset::register($view);
 
         $id = $this->options['id'];
         if ($this->clientOptions !== false) {

diff --git a/MenuAsset.php b/MenuAsset.php
diff --git a/ProgressBar.php b/ProgressBar.php
@@ -55,6 +55,6 @@ public function init()
     public function run()
     {
         echo Html::endTag('div') . "\n";
-        $this->registerWidget('progressbar', ProgressBarAsset::className());
+        $this->registerWidget('progressbar');
     }
 }
diff --git a/ProgressBarAsset.php b/ProgressBarAsset.php
diff --git a/Resizable.php b/Resizable.php
@@ -47,6 +47,6 @@ public function init()
     public function run()
     {
         echo Html::endTag('div') . "\n";
-        $this->registerWidget('resizable', ResizableAsset::className());
+        $this->registerWidget('resizable');
     }
 }
diff --git a/ResizableAsset.php b/ResizableAsset.php