Merge remote-tracking branch 'upstream/master' into 331-bootstrap-carousel

framework/yii/bootstrap/Alert.php

@@ -77,7 +77,6 @@ class Alert extends Widget
 	{
 		parent::init();
 
-		$this->getView()->registerAssetBundle('yii/bootstrap/alert');
 		$this->initOptions();
 
 		echo Html::beginTag('div', $this->options) . "\n";

framework/yii/bootstrap/Modal.php

@@ -102,7 +102,6 @@ class Modal extends Widget
 	{
 		parent::init();
 
-		$this->getView()->registerAssetBundle('yii/bootstrap/modal');
 		$this->initOptions();
 
 		echo $this->renderToggleButton() . "\n";

framework/yii/bootstrap/TypeAhead.php

@@ -68,7 +68,6 @@ class TypeAhead extends Widget
 	 */
 	public function run()
 	{
-		$this->getView()->registerAssetBundle('yii/bootstrap/typeahead');
 		echo $this->renderField();
 		$this->registerPlugin('typeahead');
 	}

framework/yii/bootstrap/Widget.php

@@ -67,6 +67,7 @@ class Widget extends \yii\base\Widget
 		$id = $this->options['id'];
 		$view = $this->getView();
 		$view->registerAssetBundle(static::$responsive ? 'yii/bootstrap/responsive' : 'yii/bootstrap');
+		$view->registerAssetBundle("yii/bootstrap/$name");
 
 		if ($this->pluginOptions !== false) {
 			$options = empty($this->pluginOptions) ? '' : Json::encode($this->pluginOptions);