Changeset 2934

Timestamp:

06/16/10 16:17:30 (14 years ago)

Author:

amuller

Message:

Ticket #1036 - Arrumando compactador de javascript

Location:

trunk/phpgwapi

Files:

• inc/class.common.inc.php (modified) (1 diff)
• inc/class.javascript.inc.php (modified) (2 diffs)
• js/expressolivre/expressolivre.js (modified) (1 diff)

trunk/phpgwapi/inc/class.common.inc.php

@@ -401 +401 @@
                                                 . 'var ExpressoLivre = function ExpressoLivre( ) { return String( \'' . $expressolivre -> configuration( ) . '\' ); };'
                                                 . 'keys = ['.$rsa->get_publKey().','.$rsa->get_mod().'];'
-                                                . '</script>';
-
-                                        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'ckeditor', 'ckeditor', NULL, true );
+                                                . '</script>'
+                                                . '<script src="' . $GLOBALS[ 'phpgw' ] ->  link( '/phpgwapi/js/ckeditor/ckeditor.js' ) . '"></script>';
+
                                         $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'wz_dragdrop', 'wz_dragdrop', NULL, true );
                                         $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'expressoAjax', 'expressoAjax', NULL, true );

trunk/phpgwapi/inc/class.javascript.inc.php

@@ -128 +128 @@
                                                 foreach($packages as $pkg => $files)
                                                 {
+                                                        $script = '';
                                                         if(!empty($files) && is_array($files))
                                                         {
@@ -153 +154 @@
                                                         }
 
-                                                        if ($GLOBALS['phpgw_info']['server']['jspacker'] == "True")
+                                                        if ( $script && $GLOBALS['phpgw_info']['server']['jspacker'] == "True")
                                                         {
                                                                 if (!file_exists($packFilePath) || $regeratePack)

trunk/phpgwapi/js/expressolivre/expressolivre.js

@@ -206 +206 @@
 
                 if ( arguments.length > 1 )
-                        for ( var j = 1; j < arguments.length; j++ )
-                                if ( arguments[ j ] && (arguments[ j ].constructor == String || arguments[ j ].constructor == Number))
+                        for ( var j = 1; j < ( arguments.length ); j++ )
+                                if ( arguments[ j ] && ( arguments[ j ].constructor == String || arguments[ j ].constructor == Number))
                                         _phrase = _phrase.replace( "%" + j, arguments[ j ] );