Skip to content

Auto regenerate nls* when sources changed (optional) #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ngonhan2k5 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Auto regenerate nls* when sources changed (optional) #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fda123f
Set 'auto' for appVersion will allow auto regenerate nls when sources…
ngonhan2k5 Jun 8, 2016
8c341e6
Move to Utils
ngonhan2k5 Jun 9, 2016
a306d51
Update NLSClientScript.php
ngonhan2k5 Jun 9, 2016
eb0be74
Fix: trim #? trailing when prepare filepath
ngonhan2k5 Jun 9, 2016
6643cd9
Update NLSUtils.php
ngonhan2k5 Jun 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/nlac/NLSClientScript.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ class NLSClientScript extends \CClientScript {
/**
* @param string $appVersion
* Optional, version of the application.
* Set 'auto' will allow auto regenerate when source changed
* If set to not empty, will be appended to the merged js/css urls (helps to handle cached resources).
**/
public $appVersion = '';
Expand Down Expand Up @@ -188,10 +189,16 @@ class NLSClientScript extends \CClientScript {
protected $cssMerger = null;


protected $isAutoAppVersion = false;

public function init() {
parent::init();

if ($this->appVersion == 'auto'){
$this->isAutoAppVersion = true;
$this->appVersion = 0;
}

if (is_numeric($this->nlsScriptPosition))
//-> we need jquery
$this->registerCoreScript('jquery');
Expand Down Expand Up @@ -224,6 +231,14 @@ public function init() {
}

protected function addAppVersion($url) {
// if auto version flag is set (appVersion='auto')
// get file modified time and use as version before hashing
if ($this->isAutoAppVersion && !NLSUtils::isAbsoluteUrl($url)) {
$ver = NLSUtils::getFileMTime($url);
$this->appVersion = max($this->appVersion, $ver);
return NLSUtils::addUrlParams($url, array('nlsver' => $ver));
}
// original none auto
if (!empty($this->appVersion) && !NLSUtils::isAbsoluteUrl($url))
$url = NLSUtils::addUrlParams($url, array('nlsver' => $this->appVersion));
return $url;
Expand Down Expand Up @@ -478,4 +493,5 @@ protected function _putnlscode() {

$this->registerScript('fixDuplicateResources', $js, $this->nlsScriptPosition);
}
}

}
8 changes: 7 additions & 1 deletion src/nlac/NLSUtils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,11 @@ public static function addUrlParams($url, $params) {
public static function isAbsoluteUrl($url) {
return preg_match('@^https?://@', $url);
}

public static function getFileMTime($path){
// append doc root and remove trailing
$path = $_SERVER['DOCUMENT_ROOT'].preg_replace('@[\?#].*$@', '', $path);
return file_exists($path) ? filemtime($path) : 0;
}

}
}