Changeset 2537 for trunk/phpgwapi
- Timestamp:
- 04/14/10 16:46:42 (14 years ago)
- Location:
- trunk/phpgwapi
- Files:
-
- 1 added
- 1 deleted
- 3 edited
-
inc/class.JavaScriptPacker.php (added)
-
inc/class.javascript.inc.php (modified) (1 diff)
-
js/expressoAjax/expressoAjax.js (modified) (24 diffs)
-
js/expressoAjax/xtools.js (deleted)
-
js/wz_dragdrop/wz_dragdrop.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/phpgwapi/inc/class.javascript.inc.php
r2169 r2537 132 132 foreach($files as $file => $ignored) 133 133 { 134 $links .= '<script type="text/javascript" src="' 135 . $GLOBALS['phpgw_info']['server']['webserver_url'] 136 . "/$app/js/$pkg/$file" . '.js">' 137 . "</script>\n"; 134 if ($GLOBALS['phpgw_info']['server']['jspacker'] == "True") 135 { 136 require_once('class.JavaScriptPacker.php'); 137 $script = file_get_contents(PHPGW_INCLUDE_ROOT .SEP .$app .SEP .'js' .SEP . $pkg .SEP. $file . '.js'); 138 $packer = new JavaScriptPacker($script, 'Normal', true, false); 139 $packed = $packer->pack(); 140 $links .= "<script>".$packed."</script>\n"; 141 } 142 else 143 { 144 $links .= '<script type="text/javascript" src="' 145 . $GLOBALS['phpgw_info']['server']['webserver_url'] 146 . "/$app/js/$pkg/$file" . '">' 147 . "</script>\n"; 148 } 138 149 } 139 150 } -
trunk/phpgwapi/js/expressoAjax/expressoAjax.js
r2521 r2537 23 23 { 24 24 is_ie = false; 25 is_ie5 = false 25 is_ie5 = false; 26 26 is_moz1_6 = false; 27 27 is_mozilla = false; … … 49 49 this.expurgatedCache = new Array(); // Data to purge from cache 50 50 51 } 51 }; 52 52 cConnector.prototype.verify_session = function(data) { 53 53 if(data && data.nosession){ … … 65 65 else 66 66 return true; 67 } 67 }; 68 68 cConnector.prototype.buildBar = function() 69 69 { … … 105 105 } 106 106 } 107 } 107 }; 108 108 //------------------------------------ BEGIN: Functions for Connector HTTPRequest -------------------------------------------------// 109 109 // Serialize Data Method … … 148 148 showMessage(Element('cc_msg_err_serialize_data_unknown').value); 149 149 break; 150 } 150 }; 151 151 } 152 152 … … 177 177 showMessage(Element('cc_msg_err_serialize_data_unknown').value); 178 178 return null; 179 } 179 }; 180 180 181 181 return str_data; 182 } 182 }; 183 183 184 184 return f(data); 185 } 185 }; 186 186 187 187 … … 210 210 211 211 return nClose; 212 } 212 }; 213 213 214 214 var f = function (str) … … 281 281 var data = str.charAt(2) == '1' ? true : false; 282 282 break; 283 } 283 }; 284 284 return data; 285 } 285 }; 286 286 287 287 return f(str); 288 } 288 }; 289 289 290 290 //Create XMLHTTP object Method … … 311 311 { 312 312 this.oxmlhttp = null; 313 } 314 } 315 } 316 317 } 313 }; 314 }; 315 }; 316 317 }; 318 318 319 319 // Request Constructor Connector … … 377 377 378 378 default: 379 } 379 }; 380 380 } 381 381 } … … 387 387 // View Exception in Javascript Console 388 388 throw(e); 389 } 390 391 } 389 }; 390 391 }; 392 392 393 393 try … … 423 423 // View Exception in Javascript Console 424 424 throw(e); 425 } 425 }; 426 426 427 427 return true; 428 } 428 }; 429 429 // Cancel Request Connector 430 430 cConnector.prototype.cancelRequest = function (){ … … 435 435 this.requests[this.tid].abort(); 436 436 this.hideProgressBar(); 437 } 437 }; 438 438 //------------------------------------ END: Functions for Connector HTTPRequest -------------------------------------------------// 439 439 … … 444 444 div.style.visibility = 'hidden'; 445 445 this.isVisibleBar = false; 446 } 446 }; 447 447 448 448 cConnector.prototype.showProgressBar = function(){ … … 451 451 452 452 this.isVisibleBar = true; 453 } 453 }; 454 454 455 455 cConnector.prototype.loadAllScripts = function(scripts) { … … 457 457 this.loadScript(scripts[i]); 458 458 } 459 } 459 }; 460 460 461 461 cConnector.prototype.loadScript = function(scriptPath) { … … 483 483 head.appendChild(script); 484 484 return; 485 } 485 }; 486 486 //------------------------------------ END: Functions for Progress Bar -------------------------------------------------// 487 487 // Default Controller File … … 500 500 else 501 501 return false; 502 } 502 }; 503 503 cConnector.prototype.purgeCache= function(){ 504 504 if (typeof(preferences) == "undefined" || preferences.use_cache != 'True') … … 513 513 catch (e) { }; 514 514 } 515 } 515 }; 516 516 cConnector.prototype.cacheNextRequest = function(expiration){ 517 517 if (typeof(expiration) == 'undefined') 518 518 expiration=0; 519 519 this.cacheRequest=expiration; 520 } 520 }; 521 521 522 522 cConnector.prototype.addToCache = function(id,data){ … … 544 544 break; 545 545 } 546 } 546 }; 547 547 548 548 // Function executes AJAX … … 573 573 id = url; 574 574 expresso.connector.newRequest(id, url, method, handler, params); 575 } 575 }; 576 576 577 577 // This function executes submit values to Controller (POST) … … 621 621 handlerExecuteForm(data); 622 622 handlerExecuteForm = null; 623 } 623 }; 624 624 divUpload.innerHTML= "<iframe onload=\"cExecute('expressoMail1_2.functions.getReturnExecuteForm',"+form_handler+");\" style='display:"+(debug_controller ? "" : "none")+";width:"+(debug_controller ? 400 : 0)+";height:"+(debug_controller ? 400 : 0)+";' name='uploadFile'></iframe>"; 625 625 form.action = URL_SERVER + "/controller.php"; … … 630 630 el.parentNode.removeChild(el); 631 631 } 632 } 632 }; 633 633 634 634 … … 652 652 return false; 653 653 } 654 } 654 }; 655 655 656 656 function expressoAjax(){ 657 657 this.connector = new cConnector(); 658 658 659 } 659 }; 660 660 expressoAjax.prototype.require = function (module){ 661 661 expresso.connector.loadScript(module); 662 } 662 }; 663 663 var expresso = new expressoAjax(); -
trunk/phpgwapi/js/wz_dragdrop/wz_dragdrop.js
r2439 r2537 1289 1289 { 1290 1290 var d_t0 = (new Date()).getTime(); 1291 while ((new Date()).getTime()-d_t0 < 0x99) ;1291 while ((new Date()).getTime()-d_t0 < 0x99) { } 1292 1292 } 1293 1293 if (!(d_ai = d_a[d_i]).indexOf('c:')) dd.cursor = d_ai.substring(2);
Note: See TracChangeset
for help on using the changeset viewer.
