fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

making more improvements in js. files

Browse Source
This commit is contained in:
Fernando Ontiveros
2011-02-23 00:09:55 +00:00
parent 282c491797
commit b749e8959b
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gulliver/system/class.g.php
View File

@@ -986,7 +986,21 @@ class G
$typearray = explode ( '.', $file );
$typefile = $typearray[ count($typearray) -1 ];
$namearray = explode ( '/', $typearray[0] );
$filename = $file;
//trick to generate the translation.language.js file , merging two files and then minified the content.
if ( strtolower ($typefile ) == 'js' && $namearray[ count($namearray) -1 ] == 'translation' ) {
G::sendHeaders ( $filename , 'text/javascript', $download, $downloadFileName );
$output = '';
$locale = $typearray[1]; //here we have the language , for example translation.en.js
G::LoadTranslationObject($locale);
global $translation;
$output .= JSMin::minify ( 'var TRANSLATIONS = ' . G::json_encode($translation) . ';' );
print $output;
return;
}
if ( file_exists ( $filename ) ) {
switch ( strtolower ($typefile ) ) {
case 'swf' :
@@ -1061,9 +1075,11 @@ class G
$pathJs = PATH_GULLIVER_HOME . PATH_SEP . 'js' . PATH_SEP;
$output .= JSMin::minify ( file_get_contents ( $pathJs . 'ext/ext-all.js' ) );
$output .= JSMin::minify ( file_get_contents ( $pathJs . 'ext/ux/ux-all.js' ) );
$output .= JSMin::minify ( file_get_contents ( $pathJs . 'ext/ux/miframe.js' ) );
$output .= JSMin::minify ( file_get_contents ( $pathJs . 'ext/ux.locationbar/Ext.ux.LocationBar.js' ) );
$output .= JSMin::minify ( file_get_contents ( $pathJs . 'ext/ux.statusbar/ext-statusbar.js' ) );
$output .= JSMin::minify ( file_get_contents ( $pathJs . 'ext/ux.treefilterx/Ext.ux.tree.TreeFilterX.js' ) );
$output .= JSMin::minify ( file_get_contents ( $pathJs . 'ext/ux.treefilterx/Ext.ux.tree.TreeFilterX.js' ) );
break;
case 'maborak.js' :
@@ -1203,7 +1219,10 @@ class G
header('Pragma: cache');
$mtime = filemtime($filename);
if ( file_exists($filename) )
$mtime = filemtime($filename);
else
$mtime = date('U');
$gmt_mtime = gmdate("D, d M Y H:i:s", $mtime ) . " GMT";
header('ETag: "' . md5 ($mtime . $filename ) . '"' );
header("Last-Modified: " . $gmt_mtime );

19
gulliver/system/class.headPublisher.php
View File

@@ -185,9 +185,7 @@ class headPublisher {
if ($this->disableHeaderScripts)
return '';
// die(SYS_LANG);
$this->addScriptFile ( "/js/widgets/js-calendar/lang/" . SYS_LANG . ".js" );
//$this->addScriptFile ( '/gulliver/loader?t=js-translations&locale='.SYS_LANG);
$head = '';
$head .= '<TITLE>' . $this->title . "</TITLE>\n";
@@ -276,14 +274,15 @@ class headPublisher {
}
*/
$head .= " <script type='text/javascript' src='/js/ext/draw2d.js'></script>\n";
/*
$head .= " <script type='text/javascript' src='/js/ext/wz_jsgraphics.js'></script>\n";
$head .= " <script type='text/javascript' src='/js/ext/mootools.js'></script>\n";
$head .= " <script type='text/javascript' src='/js/ext/moocanvas.js'></script>\n";
$head .= " <script type='text/javascript' src='/js/ext/draw2d.js'></script>\n";
$head .= " <script type='text/javascript' src='/js/ext/pmos-common.js'></script>\n";
*/
$head .= " <script type='text/javascript' src='/gulliver/loader?t=js-translations&locale=".SYS_LANG."'></script>\n";
//$head .= " <script type='text/javascript' src='/js/ext/wz_jsgraphics.js'></script>\n";
//$head .= " <script type='text/javascript' src='/js/ext/mootools.js'></script>\n";
//$head .= " <script type='text/javascript' src='/js/ext/moocanvas.js'></script>\n";
//$head .= " <script type='text/javascript' src='/js/ext/draw2d.js'></script>\n";
//$head .= " <script type='text/javascript' src='/js/ext/pmos-common.js'></script>\n";
//$head .= " <script type='text/javascript' src='/gulliver/loader?t=js-translations&locale=".SYS_LANG."'></script>\n";
$head .= " <script type='text/javascript' src='/js/ext/translation.".SYS_LANG.".js'></script>\n";
if (! isset ( $this->extJsSkin ) || $this->extJsSkin == '') {
$this->extJsSkin = 'xtheme-gray';