diff options
| author | ctrlaltca@gmail.com <> | 2012-02-12 17:39:19 +0000 |
|---|---|---|
| committer | ctrlaltca@gmail.com <> | 2012-02-12 17:39:19 +0000 |
| commit | fec8722dbf0e3b7f1a1c7ad09e544ac4103a2684 (patch) | |
| tree | 1af7442a0c0881a747a345d45c2407b0914c3eec | |
| parent | 84e41104845e80a429d6ac983a45de69dd71ecb1 (diff) | |
patch for #387
| -rw-r--r-- | .gitattributes | 2 | ||||
| -rw-r--r-- | framework/Web/Javascripts/JSMin.php (renamed from framework/Web/Javascripts/jsmin.php) | 0 | ||||
| -rw-r--r-- | framework/Web/Javascripts/TJavaScript.php | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes index 58f1b322..6af78f0d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3405,9 +3405,9 @@ framework/Util/TParameterModule.php -text framework/Util/TRpcClient.php -text framework/Util/TSimpleDateFormatter.php -text framework/Util/TVarDumper.php -text +framework/Web/Javascripts/JSMin.php -text framework/Web/Javascripts/TJSON.php -text framework/Web/Javascripts/TJavaScript.php -text -framework/Web/Javascripts/jsmin.php -text framework/Web/Javascripts/packages.php -text framework/Web/Javascripts/source/.htaccess -text framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js -text diff --git a/framework/Web/Javascripts/jsmin.php b/framework/Web/Javascripts/JSMin.php index 6ed24033..6ed24033 100644 --- a/framework/Web/Javascripts/jsmin.php +++ b/framework/Web/Javascripts/JSMin.php diff --git a/framework/Web/Javascripts/TJavaScript.php b/framework/Web/Javascripts/TJavaScript.php index 236924bc..6ef3b466 100644 --- a/framework/Web/Javascripts/TJavaScript.php +++ b/framework/Web/Javascripts/TJavaScript.php @@ -286,7 +286,7 @@ class TJavaScript */
public static function JSMin($code)
{
- include_once('jsmin.php');
+ Prado::using('System.Web.Javascripts.JSMin');
return JSMin::minify($code);
}
}
|