extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 17:04:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,229 Commits 32 Branches 355 Tags 194 MiB
6b06546565
Commit Graph

49 Commits

Author SHA1 Message Date
Ralf Becker
9db4fa8625 * jQuery: changed $ to $j to work around mootools use in Joomla templates and other js code in imported projects 
required to change $ --> $j:
phpgwapi/*
jdots/*
etemplate/*
stylite/*
felamimail/*
admin/*
news_admin/*
projectmanager/*
importexport/*
infolog/*
ranking/*

required, but not automatic:
importexport/setup/etemplates.inc.php
phpgwapi/js/jquery/*

negative, not to touch or revert later:
phpgwapi/inc/savant2/Savant2/Savant2_Compiler_basic.php:		'(\$(.+))'            => 'print $1',
phpgwapi/js/dhtmlxtree/libCompiler/core.js
sitemgr/*
phpfreechat/*
gallery/*
activesync/include/smb.php:        '^\tIPC\\\$(.*)[ ]+IPC' => 'skip',
etemplate/inc/class.bo_merge.inc.php: if ($this->table_plugins && preg_match_all('/\\$\\$table\\/([A-Za-z0-9_]+)\\$\\$(.*?)\\$\\$endtable\\$\\$/s',$content,$matches,PREG_SET_ORDER))

find phpgwapi jdots etemplate stylite felamimail admin news_admin projectmanager importexport infolog ranking \
	\( -name '*.php' -o -name '*.js' \) -exec grep -q '\$(' {} \; -print \
	-exec sed -i '' 's|\$(|$j(|g' {} \;
svn revert phpgwapi/inc/savant2/Savant2/Savant2_Compiler_basic.php phpgwapi/js/dhtmlxtree/libCompiler/core.js \
	importexport/setup/etemplates.inc.php phpgwapi/js/jquery/jquery.js etemplate/inc/class.bo_merge.inc.php
	
additional changes:
phpgwapi/js/jquery/jquery.js:	window.$ --> window.$j
phpgwapi/js/egw_json.js:291	this.request = $j.ajax({url: this.url,
jdots/templates/jdots/head.tpl:59			$j(document).ready(function() {
phpgwapi/js/egw_action/egw_grid_view.js: $.browser --> $j.browser
importexport/setup/etemplates.inc.php: etemplate editor importexport.wizard_basic_export_csv.choose_fields onclick of check icon changed
phpgwapi/js/egw_action/tests/*.html
phpgwapi/js/egw_action/tests/js/jquery.js:	window.$ --> window.$j
 2011-07-03 09:12:55 +00:00
Andreas Stöckel
49ece38c6c Don't send a location header if we currently handle an ajax response/request - use the corresponding json function instead. Doing this on the server side is neccessary as the location header is one of the few ones which is handled by the browser before any XMLHttpRequest event is fired (according to W3C specification) 2011-06-11 21:27:15 +00:00
Andreas Stöckel
9eb51b8b74 Removed accidently commited debug message 2011-05-31 20:12:51 +00:00
Andreas Stöckel
fc622875d4 Added forgotten aoi file for dhtmlx menus 2011-05-31 20:10:30 +00:00
Andreas Stöckel
fbb5551dca Fixed problem with requesting already loaded JS and CSS files, fixed problem with icon height not being updated for table rows in IE 2011-05-22 18:42:23 +00:00
Nathan Gray
19dd8d19bd Send ajax errors to console.error instead of alert 2011-05-10 14:49:25 +00:00
Andreas Stöckel
e19cc44fcb Removed base64-encoding from egw_instant_load.html, added code to egw_json which inserts script tags seperately when content is assigned to the innerHTML property 2011-03-17 18:00:24 +00:00
Andreas Stöckel
1f751b452a Implemented egw_popup_action, tested, got it working with IE 2011-02-26 18:04:28 +00:00
Andreas Stöckel
0d88ac8799 Reversed most changes made for egw-stylite #8295, commited changes proposed by Ingo Ratsdorf in egroupware.org #2834, probably fixes egroupware.org #2831 2011-02-04 14:28:12 +00:00
Andreas Stöckel
0f0e57f398 Got remote applications in the jdots template finally working as they should - this unfortunately required a lot of 'dirty' hacks, as egroupware had not been designed to do this. So e.g. there had to be a litte bit code added to the login page, which prevented it from redirecting to a page with a full framework rebuild. 2011-01-20 14:11:47 +00:00
Ralf Becker
d7d719a73d do NOT return buttons, unless they are pressed 2010-10-12 13:56:40 +00:00
Nathan Gray
8728ba5512 - Implement request.abort() to cancel a request 
- Check that the response is there before trying to access a key inside it
- Don't return null for encoding 0
 2010-08-10 14:58:54 +00:00
Andreas Stöckel
408a9ece4f Fixed typo which prevented IE js load from working correctly 2010-07-21 10:52:18 +00:00
Andreas Stöckel
9615c33fe8 Fixed JS loadFinished notification on IE 2010-07-21 10:26:54 +00:00
Andreas Stöckel
70319aefd6 Added some docu and checks for console.log being defined 2010-07-20 10:54:56 +00:00
Andreas Stöckel
7ad65804d5 Added onLoadFinish event to egw_json_response on the js side, which gets triggered when all javascript code which should be included has been loaded and evaluated on the client 2010-07-20 10:20:32 +00:00
Nathan Gray
80706f34b7 If error details are included, show them in the log 2010-07-09 13:00:46 +00:00
Andreas Stöckel
b5e33eab09 - Fixed etemplate input dirty handling 
- Now generating an widget object tree in widget.js
- Added generic response to egw_json
- Moved "getFramework" function to jsapi and renamed it to "egw_getFramework"
- Added plugin system to egw_json
- Transformed the jQuery "replaceWith" call form class.etemplate_form.inc.php into an own json plugin
- Fixed label creation for et_html
 2010-07-08 12:03:13 +00:00
Andreas Stöckel
47a7fc9337 - Added "beforeSubmit" callback handler to the PHP json class 
- Added "clientCall" and "clientSetOption" function to the base etemplate widget class
- Got the client side HTML area widget work with the new functions described above
 2010-06-30 09:13:17 +00:00
Ralf Becker
bf7b241b0c Added error message, if ajax request failed 2010-06-22 10:19:33 +00:00
Andreas Stöckel
01826c38b2 Added exception and error messages to egw_json 2010-06-21 08:39:21 +00:00
Andreas Stöckel
262460ac0c Added ability for restricting the jquery context when the request is made 2010-06-18 14:23:51 +00:00
Andreas Stöckel
3da1f7b585 Added includeScript and includeCSS functions to json classes 2010-06-18 08:36:33 +00:00
Andreas Stöckel
c953709866 - Added server side implementation of application sorting 
- Filtering "remove"-function from arrays before sending them via json
 2010-06-16 12:07:50 +00:00
Ralf Becker
b576d88a5f got sending of only dirty form elements working, thought I am not happy with it 2010-06-16 07:30:16 +00:00
Andreas Stöckel
631c19a83e Added ability to filter elements in egw_getFormValues by a css class 2010-06-15 15:27:04 +00:00
Andreas Stöckel
c4ed458d53 Made egw_json_getFormValues a global function 2010-06-15 09:47:39 +00:00
Andreas Stöckel
aca6fc8c5d Fixed compatibility issues with IE 2010-06-14 16:04:39 +00:00
Andreas Stöckel
ee9e4c4d47 Removed debug message 2010-06-11 15:10:39 +00:00
Andreas Stöckel
740bff5557 Added escaping for json strings 2010-06-11 15:06:13 +00:00
Andreas Stöckel
4b108026c6 Fixed problem with generation of numerical indices in _egw_json_getFormValue, using the new global parameter of egw_json_response.redirect in json.php 2010-06-11 10:23:13 +00:00
Andreas Stöckel
04267ed34d Added handling for global redirect and handling of ?cd=10 in redirect url, which should trigger the url to be loaded inside the top window 2010-06-11 08:08:07 +00:00
Andreas Stöckel
ad1c1f1f06 Added 'jquery' method to the json handler which allows it to call functions of jquery object from the server 2010-06-10 12:24:50 +00:00
Andreas Stöckel
bd023081e6 Fixed handling of json requests using etemplate.process_exec and fixes in the json encoding of hierarchical values 2010-06-10 10:33:00 +00:00
Andreas Stöckel
d4549782e5 Removed debug message 2010-06-10 09:33:55 +00:00
Andreas Stöckel
918d086eed Fixed correct handling for form element names with square brackets in xajax.getFormValues, added egw_json_request.getFormValues method 2010-06-10 09:33:00 +00:00
Ralf Becker
d897357e7f upps, missed some comments 2010-06-10 07:18:39 +00:00
Ralf Becker
4da762e40e removing xajax, as we no longer need it (get emulated by our new json stuff) 2010-06-10 06:59:54 +00:00
Ralf Becker
feaab09818 calling jquery as part of a response, eg. ->call('#123','addClass',array('valid')); 2010-06-09 14:41:40 +00:00
Andreas Stöckel
7eb21252af Removed code which might interrupt XAJAX from working 2010-06-09 13:52:38 +00:00
Andreas Stöckel
506d9753be Rewrote encoding of the json code, prevented "script"-handler from breaking on errors 2010-06-09 13:24:59 +00:00
Nathan Gray
9d4c60bc42 Use a javascript object instead of building a JSON string 2010-06-09 12:39:32 +00:00
Nathan Gray
b5179882ab Add a check to handle being called from inside a frame 2010-06-09 10:40:17 +00:00
Andreas Stöckel
75651489a7 Allowed empty content to be returned from the server 2010-06-04 15:22:01 +00:00
Andreas Stöckel
7b2aedddb3 Renamed the alert handler to egw_alertHandler 2010-06-04 08:16:45 +00:00
Andreas Stöckel
ca263fc6d8 - Rewrote redirect function 
- Setting the webserver url in head
 2010-06-02 08:10:43 +00:00
Ralf Becker
a3bb4afe1b documenting and adding exception and redirect handler to json handler 2010-06-01 18:54:31 +00:00
Andreas Stöckel
0c243b49a3 - Updated JS and PHP egw_json code 
- Added array_stripslashes() to common_functions.inc.php
- Added json handler (json.php)
 2010-06-01 14:20:55 +00:00
Andreas Stöckel
2bbe2e1203 Added PHP and JS JSON libraries for replacement of XAJAX 2010-06-01 12:38:41 +00:00