Changeset 2934 for trunk/phpgwapi
- Timestamp:
- 06/16/10 16:17:30 (14 years ago)
- Location:
- trunk/phpgwapi
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/phpgwapi/inc/class.common.inc.php
r2931 r2934 401 401 . 'var ExpressoLivre = function ExpressoLivre( ) { return String( \'' . $expressolivre -> configuration( ) . '\' ); };' 402 402 . 'keys = ['.$rsa->get_publKey().','.$rsa->get_mod().'];' 403 . '</script>' ;404 405 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'ckeditor', 'ckeditor', NULL, true ); 403 . '</script>' 404 . '<script src="' . $GLOBALS[ 'phpgw' ] -> link( '/phpgwapi/js/ckeditor/ckeditor.js' ) . '"></script>'; 405 406 406 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'wz_dragdrop', 'wz_dragdrop', NULL, true ); 407 407 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'expressoAjax', 'expressoAjax', NULL, true ); -
trunk/phpgwapi/inc/class.javascript.inc.php
r2748 r2934 128 128 foreach($packages as $pkg => $files) 129 129 { 130 $script = ''; 130 131 if(!empty($files) && is_array($files)) 131 132 { … … 153 154 } 154 155 155 if ( $GLOBALS['phpgw_info']['server']['jspacker'] == "True")156 if ( $script && $GLOBALS['phpgw_info']['server']['jspacker'] == "True") 156 157 { 157 158 if (!file_exists($packFilePath) || $regeratePack) -
trunk/phpgwapi/js/expressolivre/expressolivre.js
r2923 r2934 206 206 207 207 if ( arguments.length > 1 ) 208 for ( var j = 1; j < arguments.length; j++ )209 if ( arguments[ j ] && ( arguments[ j ].constructor == String || arguments[ j ].constructor == Number))208 for ( var j = 1; j < ( arguments.length ); j++ ) 209 if ( arguments[ j ] && ( arguments[ j ].constructor == String || arguments[ j ].constructor == Number)) 210 210 _phrase = _phrase.replace( "%" + j, arguments[ j ] ); 211 211
Note: See TracChangeset
for help on using the changeset viewer.