holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* jQuery: changed $ to $j to work around mootools use in Joomla templates and other js code in imported projects

Browse Source 
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
This commit is contained in:
Ralf Becker
2011-07-03 09:00:36 +00:00
parent a7aef6a4da
commit 03e379e570
19 changed files with 130 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
phpgwapi/js/egw_json.js
View File

@ -125,13 +125,13 @@ var egw_json_files = {};
/**
* Initialize the egw_json_files object with all files which are already bound in
*/
$(document).ready(function() {
$("script, link").each(function() {
$j(document).ready(function() {
$j("script, link").each(function() {
var file = false;
if ($(this).attr("src")) {
file = $(this).attr("src");
} else if ($(this).attr("href")) {
file = $(this).attr("href");
if ($j(this).attr("src")) {
file = $j(this).attr("src");
} else if ($j(this).attr("href")) {
file = $j(this).attr("href");
}
if (file) {
egw_json_files[file] = true;
@ -288,7 +288,7 @@ egw_json_request.prototype.sendRequest = function(_async, _callback, _sender)
};
//Send the request via the jquery AJAX interface to the server
this.request = $.ajax({url: this.url,
this.request = $j.ajax({url: this.url,
async: is_async,
context: this,
data: request_obj,
@ -407,7 +407,7 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
{
try
{
var jQueryObject = $(res.data.select, this.context);
var jQueryObject = $j(res.data.select, this.context);
jQueryObject[res.data.func].apply(jQueryObject, res.data.parms);
}
catch (e)
@ -653,7 +653,7 @@ function _egw_json_getFormValues(serialized, children, _filterClass)
if (typeof child.childNodes != "undefined")
_egw_json_getFormValues(serialized, child.childNodes, _filterClass);
if ((!_filterClass || $(child).hasClass(_filterClass)) && typeof child.name != "undefined")
if ((!_filterClass || $j(child).hasClass(_filterClass)) && typeof child.name != "undefined")
{
//alert('_egw_json_getFormValues(,,'+_filterClass+') calling _egw_json_getFormValue for name='+child.name+', class='+child.class+', value='+child.value);
_egw_json_getFormValue(serialized, child);