fix silly resource publishing! closes clevertech#97

Antonio Ramirez · Antonio Ramirez · commit f3bb857b8d5a · 2012-11-07T15:53:09.000+01:00
diff --git a/widgets/TbBox.php b/widgets/TbBox.php
@@ -180,9 +180,7 @@ public function renderContentEnd()
 	 */
 	public function registerClientScript()
 	{
-		$assetsUrl = Yii::app()->getAssetManager()->publish(dirname(__FILE__) . '/../assets', false, -1, true);
-
-		Yii::app()->getClientScript()->registerCssFile($assetsUrl . '/css/bootstrap-box.css');
+		Yii::app()->bootstrap->registerAssetCss('bootstrap-box.css');
 
 	}
 }
diff --git a/widgets/TbJEditableColumn.php b/widgets/TbJEditableColumn.php
@@ -162,7 +162,7 @@ protected function getPrimaryKey($data)
 	public function registerClientScript()
 	{
 		$cs = Yii::app()->getClientScript();
-		$assetsUrl = Yii::app()->getAssetManager()->publish(dirname(__FILE__) . '/../assets', false, -1, true);
+		$assetsUrl = Yii::app()->bootstrap->getAssetsUrl();
 		$cs->registerScriptFile($assetsUrl . '/js/jquery.jeditable.js', CClientScript::POS_END);
 
 		$cs->registerCss('TbJEditableColumnTimepickerCSS#' . $this->id, "
diff --git a/widgets/TbJsonGridView.php b/widgets/TbJsonGridView.php
@@ -366,7 +366,7 @@ public function registerClientScript()
 		$cs->registerCoreScript('bbq');
 		if ($this->enableHistory)
 			$cs->registerCoreScript('history');
-		$assetsUrl = Yii::app()->getAssetManager()->publish(dirname(__FILE__) . '/../assets', false, -1, true);
+		$assetsUrl = Yii::app()->bootstrap->getAssetsUrl();
 		// jqote2 template engine
 		$cs->registerScriptFile($assetsUrl . '/js/jquery.jqote2.min.js', CClientScript::POS_END);
 		// ajax cache
diff --git a/widgets/TbJsonPickerColumn.php b/widgets/TbJsonPickerColumn.php
@@ -70,7 +70,7 @@ public function registerClientScript()
 		$class = preg_replace('/\s+/', '.', $this->class);
 
 		$cs = Yii::app()->getClientScript();
-		$assetsUrl = Yii::app()->getAssetManager()->publish(dirname(__FILE__) . '/../assets', false, -1, true);
+		$assetsUrl = Yii::app()->bootstrap->getAssetsUrl();
 
 		$cs->registerCssFile($assetsUrl . '/css/bootstrap-picker.css');
 		$cs->registerScriptFile($assetsUrl . '/js/bootstrap.picker.js');
diff --git a/widgets/TbPickerColumn.php b/widgets/TbPickerColumn.php
@@ -67,7 +67,7 @@ public function registerClientScript()
 		$class = preg_replace('/\s+/', '.', $this->class);
 
 		$cs = Yii::app()->getClientScript();
-		$assetsUrl = Yii::app()->getAssetManager()->publish(dirname(__FILE__) . '/../assets', false, -1, true);
+		$assetsUrl = Yii::app()->bootstrap->getAssetsUrl();
 
 		$cs->registerCssFile($assetsUrl . '/css/bootstrap-picker.css');
 		$cs->registerScriptFile($assetsUrl . '/js/bootstrap.picker.js');

Original file line number	Diff line number	Diff line change
`@@ -180,9 +180,7 @@ public function renderContentEnd()`
`180`	`180`	`*/`
`181`	`181`	`public function registerClientScript()`
`182`	`182`	`{`
`183`		`- $assetsUrl = Yii::app()->getAssetManager()->publish(dirname(__FILE__) . '/../assets', false, -1, true);`
`184`		`-`
`185`		`- Yii::app()->getClientScript()->registerCssFile($assetsUrl . '/css/bootstrap-box.css');`
	`183`	`+ Yii::app()->bootstrap->registerAssetCss('bootstrap-box.css');`
`186`	`184`
`187`	`185`	`}`
`188`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ protected function getPrimaryKey($data)`
`162`	`162`	`public function registerClientScript()`
`163`	`163`	`{`
`164`	`164`	`$cs = Yii::app()->getClientScript();`
`165`		`- $assetsUrl = Yii::app()->getAssetManager()->publish(dirname(__FILE__) . '/../assets', false, -1, true);`
	`165`	`+ $assetsUrl = Yii::app()->bootstrap->getAssetsUrl();`
`166`	`166`	`$cs->registerScriptFile($assetsUrl . '/js/jquery.jeditable.js', CClientScript::POS_END);`
`167`	`167`
`168`	`168`	`$cs->registerCss('TbJEditableColumnTimepickerCSS#' . $this->id, "`