mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-09 15:38:27 +01:00
always include some common javascript functions
This commit is contained in:
parent
35d6232281
commit
e2f6eb9b06
@ -1314,6 +1314,14 @@
|
|||||||
function get_java_script()
|
function get_java_script()
|
||||||
{
|
{
|
||||||
$java_script = '';
|
$java_script = '';
|
||||||
|
|
||||||
|
if(!@is_object($GLOBALS['egw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['egw']->js =& CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
|
||||||
|
// always include javascript helper functions
|
||||||
|
$GLOBALS['egw']->js->validate_file('jsapi','jsapi');
|
||||||
|
|
||||||
//viniciuscb: in Concisus this condition is inexistent, and in all
|
//viniciuscb: in Concisus this condition is inexistent, and in all
|
||||||
//pages the javascript globals are inserted. Today, because
|
//pages the javascript globals are inserted. Today, because
|
||||||
@ -1324,11 +1332,6 @@
|
|||||||
{
|
{
|
||||||
if (!$GLOBALS['egw_info']['flags']['nojsapi'])
|
if (!$GLOBALS['egw_info']['flags']['nojsapi'])
|
||||||
{
|
{
|
||||||
if(!@is_object($GLOBALS['egw']->js))
|
|
||||||
{
|
|
||||||
$GLOBALS['egw']->js =& CreateObject('phpgwapi.javascript');
|
|
||||||
}
|
|
||||||
|
|
||||||
$GLOBALS['egw']->js->validate_jsapi();
|
$GLOBALS['egw']->js->validate_jsapi();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user