diff --git a/framework/yii/YiiBase.php b/framework/yii/YiiBase.php index df5f631..4fe0e77 100644 --- a/framework/yii/YiiBase.php +++ b/framework/yii/YiiBase.php @@ -616,6 +616,7 @@ class YiiBase YiiBase::$aliases = array( '@yii' => array( '@yii/bootstrap' => __DIR__ . '/bootstrap', + '@yii/jui' => __DIR__ . '/jui', '@yii' => __DIR__, ), ); diff --git a/framework/yii/jui/assets.php b/framework/yii/jui/assets.php index 1d27cee..c292050 100644 --- a/framework/yii/jui/assets.php +++ b/framework/yii/jui/assets.php @@ -775,7 +775,7 @@ return array( 'css' => array( '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( 'sourcePath' => __DIR__ . '/assets', @@ -796,7 +796,7 @@ return array( 'css' => array( '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( 'sourcePath' => __DIR__ . '/assets', @@ -838,7 +838,7 @@ return array( 'css' => array( '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( 'sourcePath' => __DIR__ . '/assets',