extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-09 08:25:03 +02:00
Code Issues 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

24
etemplate/js/nextmatch_action.js
View File

@ -29,7 +29,7 @@ function nextmatchRowAOI(_node, _selectMode)
aoi.node = _node;
aoi.selectMode = _selectMode;
aoi.checkBox = ($(":checkbox", aoi.node))[0];
aoi.checkBox = ($j(":checkbox", aoi.node))[0];
// Rows without a checkbox OR an id set are unselectable
if (typeof aoi.checkBox != "undefined" || _node.id)
@ -40,7 +40,7 @@ function nextmatchRowAOI(_node, _selectMode)
// Prevent the browser from selecting the content of the element, when
// a special key is pressed.
$(_node).mousedown(egwPreventSelect);
$j(_node).mousedown(egwPreventSelect);
// Now append some action code to the node
selectHandler = function(e) {
@ -76,15 +76,15 @@ function nextmatchRowAOI(_node, _selectMode)
if (egwIsMobile()) {
_node.ontouchend = selectHandler;
} else {
$(_node).click(selectHandler);
$j(_node).click(selectHandler);
}
$(aoi.checkBox).change(function() {
$j(aoi.checkBox).change(function() {
aoi.updateState(EGW_AO_STATE_SELECTED, this.checked, EGW_AO_SHIFT_STATE_MULTI);
});
// Don't execute the default action when double clicking on an entry
$(aoi.checkBox).dblclick(function() {
$j(aoi.checkBox).dblclick(function() {
return false;
});
@ -96,9 +96,9 @@ function nextmatchRowAOI(_node, _selectMode)
this.checkBox.checked = selected;
}
$(this.node).toggleClass('focused',
$j(this.node).toggleClass('focused',
egwBitIsSet(_state, EGW_AO_STATE_FOCUSED));
$(this.node).toggleClass('selected',
$j(this.node).toggleClass('selected',
selected);
}
}
@ -235,7 +235,7 @@ function nm_action(_action, _senders)
*/
function nm_not_disableClass(_action, _senders, _target)
{
return !$(_target.iface.getDOMNode()).hasClass(_action.data.disableClass);
return !$j(_target.iface.getDOMNode()).hasClass(_action.data.disableClass);
}
/**
@ -248,7 +248,7 @@ function nm_not_disableClass(_action, _senders, _target)
*/
function nm_enableClass(_action, _senders, _target)
{
return $(_target.iface.getDOMNode()).hasClass(_action.data.enableClass);
return $j(_target.iface.getDOMNode()).hasClass(_action.data.enableClass);
}
/**
@ -283,7 +283,7 @@ function nm_compare_field(_action, _senders, _target)
if (!field) return false;
var value = $(field).val();
var value = $j(field).val();
if (_action.data.fieldValue.substr(0,1) == '!')
return value != _action.data.fieldValue.substr(1);
@ -346,9 +346,9 @@ function nm_hide_popup(element, div_id)
*/
function nm_activate_link(_action, _senders)
{
// $(_senders[0].iface.getDOMNode()).find('a:first').trigger('click'); not sure why this is NOT working
// $j(_senders[0].iface.getDOMNode()).find('a:first').trigger('click'); not sure why this is NOT working
var a_href = $(_senders[0].iface.getDOMNode()).find('a:first');
var a_href = $j(_senders[0].iface.getDOMNode()).find('a:first');
if (typeof a_href != undefined)
{