diff --git a/ieducar/lib/Portabilis/View/Helper/Application.php b/ieducar/lib/Portabilis/View/Helper/Application.php
index 113b432..ce76835 100644
--- a/ieducar/lib/Portabilis/View/Helper/Application.php
+++ b/ieducar/lib/Portabilis/View/Helper/Application.php
@@ -82,7 +82,7 @@ class Portabilis_View_Helper_Application extends CoreExt_View_Helper_Abstract {
* @param array ou string $files Lista de scripts a serem carregados.
* @return null
*/
- public static function loadJavascript($viewInstance, $files, $expireCacheDateFormat = 'dmY') {
+ public static function loadJavascript($viewInstance, $files, $appendAssetsVersionParam = true) {
if (! is_array($files))
$files = array($files);
@@ -91,9 +91,8 @@ class Portabilis_View_Helper_Application extends CoreExt_View_Helper_Abstract {
if (! in_array($file, self::$javascriptsLoaded)) {
self::$javascriptsLoaded[] = $file;
- // cache controll
- $file .= '?assets_version=' . Portabilis_Assets_Version::VERSION;
- $file .= $expireCacheDateFormat ? '×tamp=' . date($expireCacheDateFormat) : '';
+ if ($appendAssetsVersionParam)
+ $file .= '?assets_version=' . Portabilis_Assets_Version::VERSION;
$viewInstance->appendOutput("");
}
@@ -112,7 +111,7 @@ class Portabilis_View_Helper_Application extends CoreExt_View_Helper_Abstract {
* @param array ou string $files Lista de estilos a serem carregados.
* @return null
*/
- public static function loadStylesheet($viewInstance, $files, $expireCacheDateFormat = 'dmY') {
+ public static function loadStylesheet($viewInstance, $files, $appendAssetsVersionParam = true) {
if (! is_array($files))
$files = array($files);
@@ -121,9 +120,8 @@ class Portabilis_View_Helper_Application extends CoreExt_View_Helper_Abstract {
if (! in_array($file, self::$stylesheetsLoaded)) {
self::$stylesheetsLoaded[] = $file;
- // cache controll
- $file .= '?assets_version=' . Portabilis_Assets_Version::VERSION;
- $file .= $expireCacheDateFormat ? '×tamp=' . date($expireCacheDateFormat) : '';
+ if ($appendAssetsVersionParam)
+ $file .= '?assets_version=' . Portabilis_Assets_Version::VERSION;
$viewInstance->appendOutput("");
}
@@ -183,4 +181,17 @@ class Portabilis_View_Helper_Application extends CoreExt_View_Helper_Abstract {
// ui-autocomplete fixup
self::embedStylesheet($viewInstance, ".ui-autocomplete { font-size: 11px; }");
}
+
+ public static function loadChosenLib($viewInstance) {
+ self::loadStylesheet($viewInstance, '/modules/Portabilis/Assets/Plugins/Chosen/chosen.css', false);
+ self::loadJavascript($viewInstance, '/modules/Portabilis/Assets/Plugins/Chosen/chosen.jquery.min.js', false);
+ }
+
+ public static function loadAjaxChosenLib($viewInstance) {
+ // AjaxChosen requires this fixup, see https://github.com/meltingice/ajax-chosen
+ $fixupCss = ".chzn-container .chzn-results .group-result { display: list-item; }";
+ Portabilis_View_Helper_Application::embedStylesheet($viewInstance, $fixupCss);
+
+ self::loadJavascript($viewInstance, '/modules/Portabilis/Assets/Plugins/AjaxChosen/ajax-chosen.min.js', false);
+ }
}
diff --git a/ieducar/lib/Portabilis/View/Helper/Input/MultipleSearch.php b/ieducar/lib/Portabilis/View/Helper/Input/MultipleSearch.php
index a07a8eb..2745481 100644
--- a/ieducar/lib/Portabilis/View/Helper/Input/MultipleSearch.php
+++ b/ieducar/lib/Portabilis/View/Helper/Input/MultipleSearch.php
@@ -81,12 +81,10 @@ class Portabilis_View_Helper_Input_MultipleSearch extends Portabilis_View_Helper
protected function loadAssets() {
- $cssFile = '/modules/Portabilis/Assets/Plugins/Chosen/chosen.css';
- Portabilis_View_Helper_Application::loadStylesheet($this->viewInstance, $cssFile);
+ Portabilis_View_Helper_Application::loadChosenLib($this->viewInstance);
- $jsFiles = array('/modules/Portabilis/Assets/Plugins/Chosen/chosen.jquery.min.js',
- '/modules/Portabilis/Assets/Javascripts/Frontend/Inputs/MultipleSearch.js');
- Portabilis_View_Helper_Application::loadJavascript($this->viewInstance, $jsFiles);
+ $jsFile = '/modules/Portabilis/Assets/Javascripts/Frontend/Inputs/MultipleSearch.js';
+ Portabilis_View_Helper_Application::loadJavascript($this->viewInstance, $jsFile);
}
diff --git a/ieducar/lib/Portabilis/View/Helper/Input/MultipleSearchAjax.php b/ieducar/lib/Portabilis/View/Helper/Input/MultipleSearchAjax.php
index b4d54e6..a33be0d 100644
--- a/ieducar/lib/Portabilis/View/Helper/Input/MultipleSearchAjax.php
+++ b/ieducar/lib/Portabilis/View/Helper/Input/MultipleSearchAjax.php
@@ -81,18 +81,11 @@ class Portabilis_View_Helper_Input_MultipleSearchAjax extends Portabilis_View_He
protected function loadAssets() {
- $cssFile = '/modules/Portabilis/Assets/Plugins/Chosen/chosen.css';
- Portabilis_View_Helper_Application::loadStylesheet($this->viewInstance, $cssFile);
+ Portabilis_View_Helper_Application::loadChosenLib($this->viewInstance);
+ Portabilis_View_Helper_Application::loadAjaxChosenLib($this->viewInstance);
- // AjaxChosen requires this fixup, see https://github.com/meltingice/ajax-chosen
- $fixupCss = ".chzn-container .chzn-results .group-result { display: list-item; }";
- Portabilis_View_Helper_Application::embedStylesheet($this->viewInstance, $fixupCss);
-
-
- $jsFiles = array('/modules/Portabilis/Assets/Plugins/Chosen/chosen.jquery.min.js',
- '/modules/Portabilis/Assets/Plugins/AjaxChosen/ajax-chosen.min.js',
- '/modules/Portabilis/Assets/Javascripts/Frontend/Inputs/MultipleSearchAjax.js');
- Portabilis_View_Helper_Application::loadJavascript($this->viewInstance, $jsFiles);
+ $jsFile = '/modules/Portabilis/Assets/Javascripts/Frontend/Inputs/MultipleSearchAjax.js';
+ Portabilis_View_Helper_Application::loadJavascript($this->viewInstance, $jsFile);
}
--
libgit2 0.21.2