Skip to content
This repository has been archived by the owner on Jul 27, 2023. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
* origin/master:
  Update WhAceEditor.php
  Update WhDatePicker.php
  Update WhRedactor.php
  • Loading branch information
tonydspaniard committed Aug 10, 2013
2 parents 92212c2 + 90614f1 commit a2387cc
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions widgets/ace/WhAceEditor.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public function registerClientScript()
/* @var $cs CClientScript */
$cs = Yii::app()->getClientScript();

$cs->registerScriptFile($assetsUrl . '/js/ace.js');
$cs->registerScriptFile($assetsUrl . '/js/ace.js', CClientScript::POS_END);

$id = TbArray::getValue('id', $this->htmlOptions, $this->getId());

Expand All @@ -134,4 +134,4 @@ public function registerClientScript()

$cs->registerScript(uniqid(__CLASS__ . '#ReadyJS' . $id, true), ob_get_clean());
}
}
}
4 changes: 2 additions & 2 deletions widgets/datepicker/WhDatePicker.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function registerClientScript()
$cs = Yii::app()->getClientScript();

$cs->registerCssFile($assetsUrl . '/css/datepicker.css');
$cs->registerScriptFile($assetsUrl . '/js/bootstrap-datepicker.js');
$cs->registerScriptFile($assetsUrl . '/js/bootstrap-datepicker.js', CClientScript::POS_END);

if ($language = TbArray::getValue('language', $this->pluginOptions)) {
$cs->registerScriptFile(
Expand All @@ -101,4 +101,4 @@ public function registerClientScript()
$this->getApi()->registerEvents($selector, $this->events);

}
}
}
4 changes: 2 additions & 2 deletions widgets/redactor/WhRedactor.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public function registerClientScript()
: 'redactor.min.js';

$cs->registerCssFile($assetsUrl . '/css/redactor.css');
$cs->registerScriptFile($assetsUrl . '/js/' . $script);
$cs->registerScriptFile($assetsUrl . '/js/' . $script, CClientScript::POS_END);

/* register language */
$language = TbArray::getValue('lang', $this->pluginOptions);
Expand Down Expand Up @@ -128,4 +128,4 @@ protected function registerPlugins($assetsUrl)
}
}
}
}
}

0 comments on commit a2387cc

Please sign in to comment.