Skip to content

Y
yii2
Commit 362f71b1 by Alexander Kochetov
Options

Widget::$transition removed, bundles depency fixed

parent 0e12aee8
Showing with 11 additions and 19 deletions
yii/bootstrap/Widget.php
...@@ -26,10 +26,6 @@ class Widget extends \yii\base\Widget ...@@ -26,10 +26,6 @@ class Widget extends \yii\base\Widget
*/ */
public static $responsive = true; 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. * @var array the HTML attributes for the widget container tag.
*/ */
public $options = array(); public $options = array();
...@@ -72,10 +68,6 @@ class Widget extends \yii\base\Widget ...@@ -72,10 +68,6 @@ class Widget extends \yii\base\Widget
$view = $this->getView(); $view = $this->getView();
$view->registerAssetBundle(static::$responsive ? 'yii/bootstrap/responsive' : 'yii/bootstrap'); $view->registerAssetBundle(static::$responsive ? 'yii/bootstrap/responsive' : 'yii/bootstrap');
if (static::$transition) {
$view->registerAssetBundle('yii/bootstrap/transition');
}
if ($this->pluginOptions !== false) { if ($this->pluginOptions !== false) {
$options = empty($this->pluginOptions) ? '' : Json::encode($this->pluginOptions); $options = empty($this->pluginOptions) ? '' : Json::encode($this->pluginOptions);
$js = "jQuery('#$id').$name($options);"; $js = "jQuery('#$id').$name($options);";
......
yii/bootstrap/assets.php
...@@ -19,49 +19,49 @@ return array( ...@@ -19,49 +19,49 @@ return array(
'js' => array( 'js' => array(
'js/bootstrap-affix.js', 'js/bootstrap-affix.js',
), ),
'depends' => array('yii/jquery', 'yii/bootstrap'), 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'),
), ),
'yii/bootstrap/alert' => array( 'yii/bootstrap/alert' => array(
'sourcePath' => __DIR__ . '/assets', 'sourcePath' => __DIR__ . '/assets',
'js' => array( 'js' => array(
'js/bootstrap-alert.js', 'js/bootstrap-alert.js',
), ),
'depends' => array('yii/jquery', 'yii/bootstrap'), 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'),
), ),
'yii/bootstrap/button' => array( 'yii/bootstrap/button' => array(
'sourcePath' => __DIR__ . '/assets', 'sourcePath' => __DIR__ . '/assets',
'js' => array( 'js' => array(
'js/bootstrap-button.js', 'js/bootstrap-button.js',
), ),
'depends' => array('yii/jquery', 'yii/bootstrap'), 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'),
), ),
'yii/bootstrap/carousel' => array( 'yii/bootstrap/carousel' => array(
'sourcePath' => __DIR__ . '/assets', 'sourcePath' => __DIR__ . '/assets',
'js' => array( 'js' => array(
'js/bootstrap-carousel.js', 'js/bootstrap-carousel.js',
), ),
'depends' => array('yii/jquery', 'yii/bootstrap'), 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'),
), ),
'yii/bootstrap/collapse' => array( 'yii/bootstrap/collapse' => array(
'sourcePath' => __DIR__ . '/assets', 'sourcePath' => __DIR__ . '/assets',
'js' => array( 'js' => array(
'js/bootstrap-collapse.js', 'js/bootstrap-collapse.js',
), ),
'depends' => array('yii/jquery', 'yii/bootstrap'), 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'),
), ),
'yii/bootstrap/dropdown' => array( 'yii/bootstrap/dropdown' => array(
'sourcePath' => __DIR__ . '/assets', 'sourcePath' => __DIR__ . '/assets',
'js' => array( 'js' => array(
'js/bootstrap-dropdown.js', 'js/bootstrap-dropdown.js',
), ),
'depends' => array('yii/jquery', 'yii/bootstrap'), 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'),
), ),
'yii/bootstrap/modal' => array( 'yii/bootstrap/modal' => array(
'sourcePath' => __DIR__ . '/assets', 'sourcePath' => __DIR__ . '/assets',
'js' => array( 'js' => array(
'js/bootstrap-modal.js', 'js/bootstrap-modal.js',
), ),
'depends' => array('yii/jquery', 'yii/bootstrap'), 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'),
), ),
'yii/bootstrap/popover' => array( 'yii/bootstrap/popover' => array(
'sourcePath' => __DIR__ . '/assets', 'sourcePath' => __DIR__ . '/assets',
...@@ -75,21 +75,21 @@ return array( ...@@ -75,21 +75,21 @@ return array(
'js' => array( 'js' => array(
'js/bootstrap-scrollspy.js', 'js/bootstrap-scrollspy.js',
), ),
'depends' => array('yii/jquery', 'yii/bootstrap'), 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'),
), ),
'yii/bootstrap/tab' => array( 'yii/bootstrap/tab' => array(
'sourcePath' => __DIR__ . '/assets', 'sourcePath' => __DIR__ . '/assets',
'js' => array( 'js' => array(
'js/bootstrap-tab.js', 'js/bootstrap-tab.js',
), ),
'depends' => array('yii/jquery', 'yii/bootstrap'), 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'),
), ),
'yii/bootstrap/tooltip' => array( 'yii/bootstrap/tooltip' => array(
'sourcePath' => __DIR__ . '/assets', 'sourcePath' => __DIR__ . '/assets',
'js' => array( 'js' => array(
'js/bootstrap-tooltip.js', 'js/bootstrap-tooltip.js',
), ),
'depends' => array('yii/jquery', 'yii/bootstrap'), 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'),
), ),
'yii/bootstrap/transition' => array( 'yii/bootstrap/transition' => array(
'sourcePath' => __DIR__ . '/assets', 'sourcePath' => __DIR__ . '/assets',
...@@ -103,6 +103,6 @@ return array( ...@@ -103,6 +103,6 @@ return array(
'js' => array( 'js' => array(
'js/bootstrap-typeahead.js', 'js/bootstrap-typeahead.js',
), ),
'depends' => array('yii/jquery', 'yii/bootstrap'), 'depends' => array('yii/jquery', 'yii/bootstrap', 'yii/bootstrap/transition'),
), ),
); );
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