extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-05 05:29:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate $j global variable used in php files and replace them all with standard jQuery

Browse Source
This commit is contained in:
Hadi Nategh 2016-06-02 17:30:53 +02:00
parent 033ba0159f
commit d040534a1f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Html.php
View File

@ -214,7 +214,7 @@ class Html
if($enhanced) { if($enhanced) {
Framework::includeJS('/api/js/jquery/chosen/chosen.jquery.js'); Framework::includeJS('/api/js/jquery/chosen/chosen.jquery.js');
Framework::includeCSS('/api/js/jquery/chosen/chosen.css',null,false); Framework::includeCSS('/api/js/jquery/chosen/chosen.css',null,false);
$out .= "<script>var lab = egw_LAB || \$LAB; lab.wait(function() {\$j(function() {if(\$j().chosen) \$j('select[name=\"$name\"]').chosen({width: '100%'});});})</script>\n"; $out .= "<script>var lab = egw_LAB || \$LAB; lab.wait(function() {\jQuery(function() {if(\jQuery().chosen) \jQuery('select[name=\"$name\"]').chosen({width: '100%'});});})</script>\n";
} }
return $out; return $out;
} }

2
api/src/Json/Msg.php
View File

@ -104,7 +104,7 @@ abstract class Msg
} }
/** /**
* Allows to call a jquery function on a selector with given parameters: $j($selector).$func($parmeters) * Allows to call a jquery function on a selector with given parameters: jQuery($selector).$func($parmeters)
* *
* @param string $selector jquery selector * @param string $selector jquery selector
* @param string $method name of the jquery to call * @param string $method name of the jquery to call

2
calendar/sitemgr/class.module_calendar_planner.inc.php
View File

@ -336,7 +336,7 @@ class module_calendar_planner extends Module
$tmpl->exec(__METHOD__, $content,$sel_options, array('__ALL__' => true),array(),2); $tmpl->exec(__METHOD__, $content,$sel_options, array('__ALL__' => true),array(),2);
$html .= ob_get_contents(); $html .= ob_get_contents();
$html .= '<script>' $html .= '<script>'
. ' window.egw_LAB.wait(function() {$j(function() {' . ' window.egw_LAB.wait(function() {jQuery(function() {'
. 'app.calendar.set_state(' . json_encode(array( . 'app.calendar.set_state(' . json_encode(array(
'owner' => $search_params['owner'], 'owner' => $search_params['owner'],
'sortby' => $ui->sortby, 'sortby' => $ui->sortby,