Skip to content

Y
yii2
Commit fbada2e8 by Qiang Xue
Options

Merge pull request #375 from creocoder/yii-base-jui-fix

[READY] YiiBase jQuery UI alias + asset.php css dependencies fixes
parents 0884a70b 9d3fe872
Showing with 4 additions and 3 deletions
framework/yii/YiiBase.php
...@@ -616,6 +616,7 @@ class YiiBase ...@@ -616,6 +616,7 @@ class YiiBase
YiiBase::$aliases = array( YiiBase::$aliases = array(
'@yii' => array( '@yii' => array(
'@yii/bootstrap' => __DIR__ . '/bootstrap', '@yii/bootstrap' => __DIR__ . '/bootstrap',
'@yii/jui' => __DIR__ . '/jui',
'@yii' => __DIR__, '@yii' => __DIR__,
), ),
); );
framework/yii/jui/assets.php
...@@ -775,7 +775,7 @@ return array( ...@@ -775,7 +775,7 @@ return array(
'css' => array( 'css' => array(
'themes/base/jquery.ui.autocomplete.css', 'themes/base/jquery.ui.autocomplete.css',
), ),
'depends' => array('yii/jui/theme/base/core'), 'depends' => array('yii/jui/theme/base/core', 'yii/jui/theme/base/menu'),
), ),
'yii/jui/theme/base/button' => array( 'yii/jui/theme/base/button' => array(
'sourcePath' => __DIR__ . '/assets', 'sourcePath' => __DIR__ . '/assets',
...@@ -796,7 +796,7 @@ return array( ...@@ -796,7 +796,7 @@ return array(
'css' => array( 'css' => array(
'themes/base/jquery.ui.dialog.css', 'themes/base/jquery.ui.dialog.css',
), ),
'depends' => array('yii/jui/theme/base/core'), 'depends' => array('yii/jui/theme/base/core', 'yii/jui/theme/base/button', 'yii/jui/theme/base/resizeable'),
), ),
'yii/jui/theme/base/menu' => array( 'yii/jui/theme/base/menu' => array(
'sourcePath' => __DIR__ . '/assets', 'sourcePath' => __DIR__ . '/assets',
...@@ -838,7 +838,7 @@ return array( ...@@ -838,7 +838,7 @@ return array(
'css' => array( 'css' => array(
'themes/base/jquery.ui.spinner.css', 'themes/base/jquery.ui.spinner.css',
), ),
'depends' => array('yii/jui/theme/base/core'), 'depends' => array('yii/jui/theme/base/core', 'yii/jui/theme/base/button'),
), ),
'yii/jui/theme/base/tabs' => array( 'yii/jui/theme/base/tabs' => array(
'sourcePath' => __DIR__ . '/assets', 'sourcePath' => __DIR__ . '/assets',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment