uicontacts::get_rows(".print_r($query,true).")
\n"; if (!$id_only) diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php index dbddfc9ab8..0f668f65a6 100644 --- a/etemplate/inc/class.etemplate.inc.php +++ b/etemplate/inc/class.etemplate.inc.php @@ -260,15 +260,19 @@ class etemplate extends boetemplate self::$request->java_script = self::$java_script; self::$request->java_script_from_flags = $GLOBALS['egw_info']['flags']['java_script']; - self::$request->java_script_body_tags = $GLOBALS['egw']->js->body; - self::$request->java_script_files = $GLOBALS['egw']->js->files; + self::$request->java_script_body_tags = array( + 'onload' => egw_framework::set_onload(), + 'onunload' => egw_framework::set_onunload(), + 'onresize' => egw_framework::set_onresize(), + ); + self::$request->java_script_files = egw_framework::js_files(); self::$request->include_xajax = $GLOBALS['egw_info']['flags']['include_xajax']; // check if application of template has a app.js file --> load it list($app) = explode('.',$this->name); if (file_exists(EGW_SERVER_ROOT.'/'.$app.'/js/app.js')) { - $GLOBALS['egw']->js->validate_file('.','app',$app,false); + egw_framework::validate_file('.','app',$app,false); } if (!$this->sitemgr) @@ -515,14 +519,21 @@ class etemplate extends boetemplate { foreach (self::$request->java_script_body_tags as $tag => $code) { - //error_log($GLOBALS['egw']->js->body[$tag]); - $GLOBALS['egw']->js->body[$tag] .= $code; + call_user_func('egw_framework::set_'.$tag,$code); } } if (is_array(self::$request->java_script_files)) { - $GLOBALS['egw']->js->files = !is_array($GLOBALS['egw']->js->files) ? self::$request->java_script_files : - self::complete_array_merge($GLOBALS['egw']->js->files,self::$request->java_script_files); + $files = egw_framework::js_files(); + if (is_array($files)) + { + $files = array_unique(array_merge($files,self::$request->java_script_files)); + } + else + { + $files = self::$request->java_script_files; + } + egw_framework::js_files($files); } //echo "process_exec($this->name): loop is set, content=
\n"; _debug_array(self::complete_array_merge(self::$request->content,$content)); diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php index 1acd2f44ea..ab22d51250 100644 --- a/phpgwapi/inc/class.egw_framework.inc.php +++ b/phpgwapi/inc/class.egw_framework.inc.php @@ -925,43 +925,70 @@ abstract class egw_framework protected static $body_tags = array(); /** - * Sets an onLoad action for a page - * - * @param string javascript to be used - * @return string content of onXXX tag after adding code - */ - static function set_onload($code) + * Sets an onLoad action for a page + * + * @param string $code='' javascript to be used + * @param boolean $replace=false false: append to existing, true: replace existing tag + * @return string content of onXXX tag after adding code + */ + static function set_onload($code='',$replace=false) { - return self::$body_tags['onLoad'] .= $code; + if ($replace) + { + self::$body_tags['onLoad'] = $code; + } + else + { + self::$body_tags['onLoad'] .= $code; + } + return self::$body_tags['onLoad']; } /** - * Sets an onUnload action for a page - * - * @param string javascript to be used - * @return string content of onXXX tag after adding code - */ - static function set_onunload($code) + * Sets an onUnload action for a page + * + * @param string $code='' javascript to be used + * @param boolean $replace=false false: append to existing, true: replace existing tag + * @return string content of onXXX tag after adding code + */ + static function set_onunload($code='',$replace=false) { - return self::$body_tags['onUnload'] .= $code; + if ($replace) + { + self::$body_tags['onUnload'] = $code; + } + else + { + self::$body_tags['onUnload'] .= $code; + } + return self::$body_tags['onUnload']; } /** * Sets an onResize action for a page * - * @param string javascript to be used + * @param string $code='' javascript to be used + * @param boolean $replace=false false: append to existing, true: replace existing tag * @return string content of onXXX tag after adding code */ - static function set_onresize($code) + static function set_onresize($code='',$replace=false) { - return self::$body_tags['onResize'] .= $code; + if ($replace) + { + self::$body_tags['onResize'] = $code; + } + else + { + self::$body_tags['onResize'] .= $code; + } + return self::$body_tags['onResize']; } - + /** - * Adds on(Un)Load= attributes to the body tag of a page - * - * @returns string the attributes to be used - */ + * Adds on(Un)Load= attributes to the body tag of a page + * + * @returns string the attributes to be used + */ static protected function _get_body_attribs() { $js = ''; @@ -1016,6 +1043,21 @@ abstract class egw_framework return False; } + /** + * Set or return all javascript files set via validate_file + * + * @param array $files=null array with pathes relative to EGW_SERVER_ROOT, eg. /phpgwapi/js/jquery/jquery.js + * @return array with pathes relative to EGW_SERVER_ROOT + */ + static function js_files(array $files=null) + { + if (isset($files) && is_array($files)) + { + self::$js_include_files = $files; + } + return self::$js_include_files; + } + /** * Used for generating the list of external js files to be included in the head of a page *