diff --git a/yii/bootstrap/Widget.php b/yii/bootstrap/Widget.php index 75cad9b..2243bae 100644 --- a/yii/bootstrap/Widget.php +++ b/yii/bootstrap/Widget.php @@ -26,10 +26,6 @@ class Widget extends \yii\base\Widget */ public static $responsive = true; /** - * @var boolean whether to use the transition effects. - */ - public static $transition = true; - /** * @var array the HTML attributes for the widget container tag. */ public $options = array(); @@ -72,10 +68,6 @@ class Widget extends \yii\base\Widget $view = $this->getView(); $view->registerAssetBundle(static::$responsive ? 'yii/bootstrap/responsive' : 'yii/bootstrap'); - if (static::$transition) { - $view->registerAssetBundle('yii/bootstrap/transition'); - } - if ($this->pluginOptions !== false) { $options = empty($this->pluginOptions) ? '' : Json::encode($this->pluginOptions); $js = "jQuery('#$id').$name($options);"; diff --git a/yii/bootstrap/assets.php b/yii/bootstrap/assets.php index a35db79..95b8d40 100644 --- a/yii/bootstrap/assets.php +++ b/yii/bootstrap/assets.php @@ -19,49 +19,49 @@ return array( 'js' => array( 'js/bootstrap-affix.js', ), - 'depends' => array('yii/jquery', 'yii/bootstrap'), + 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'), ), 'yii/bootstrap/alert' => array( 'sourcePath' => __DIR__ . '/assets', 'js' => array( 'js/bootstrap-alert.js', ), - 'depends' => array('yii/jquery', 'yii/bootstrap'), + 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'), ), 'yii/bootstrap/button' => array( 'sourcePath' => __DIR__ . '/assets', 'js' => array( 'js/bootstrap-button.js', ), - 'depends' => array('yii/jquery', 'yii/bootstrap'), + 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'), ), 'yii/bootstrap/carousel' => array( 'sourcePath' => __DIR__ . '/assets', 'js' => array( 'js/bootstrap-carousel.js', ), - 'depends' => array('yii/jquery', 'yii/bootstrap'), + 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'), ), 'yii/bootstrap/collapse' => array( 'sourcePath' => __DIR__ . '/assets', 'js' => array( 'js/bootstrap-collapse.js', ), - 'depends' => array('yii/jquery', 'yii/bootstrap'), + 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'), ), 'yii/bootstrap/dropdown' => array( 'sourcePath' => __DIR__ . '/assets', 'js' => array( 'js/bootstrap-dropdown.js', ), - 'depends' => array('yii/jquery', 'yii/bootstrap'), + 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'), ), 'yii/bootstrap/modal' => array( 'sourcePath' => __DIR__ . '/assets', 'js' => array( 'js/bootstrap-modal.js', ), - 'depends' => array('yii/jquery', 'yii/bootstrap'), + 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'), ), 'yii/bootstrap/popover' => array( 'sourcePath' => __DIR__ . '/assets', @@ -75,21 +75,21 @@ return array( 'js' => array( 'js/bootstrap-scrollspy.js', ), - 'depends' => array('yii/jquery', 'yii/bootstrap'), + 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'), ), 'yii/bootstrap/tab' => array( 'sourcePath' => __DIR__ . '/assets', 'js' => array( 'js/bootstrap-tab.js', ), - 'depends' => array('yii/jquery', 'yii/bootstrap'), + 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'), ), 'yii/bootstrap/tooltip' => array( 'sourcePath' => __DIR__ . '/assets', 'js' => array( 'js/bootstrap-tooltip.js', ), - 'depends' => array('yii/jquery', 'yii/bootstrap'), + 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'), ), 'yii/bootstrap/transition' => array( 'sourcePath' => __DIR__ . '/assets', @@ -103,6 +103,6 @@ return array( 'js' => array( 'js/bootstrap-typeahead.js', ), - 'depends' => array('yii/jquery', 'yii/bootstrap'), + 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'), ), );