From 56d0d76f0f44434bf12d863c10d16cfb145a2e23 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Fri, 20 Jan 2006 08:54:07 +0000 Subject: - Patch #27884 by gordon: js addLoadEvent not working. --- includes/theme.inc | 24 +----------------------- themes/bluemarine/page.tpl.php | 2 +- themes/chameleon/chameleon.theme | 2 +- themes/engines/phptemplate/phptemplate.engine | 1 - themes/pushbutton/page.tpl.php | 2 +- 5 files changed, 4 insertions(+), 27 deletions(-) diff --git a/includes/theme.inc b/includes/theme.inc index 5cb18985a..9207e937e 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -395,7 +395,7 @@ function theme_page($content) { $output .= theme_get_styles(); $output .= ' '; - $output .= ' '; + $output .= ' '; $output .= '

'; $output .= theme('blocks', 'all'); @@ -909,28 +909,6 @@ function theme_closure($main = 0) { return implode("\n", $footer); } -/** - * Call hook_onload() in all modules to enable modules to insert JavaScript that - * will get run once the page has been loaded by the browser. - * - * @param $theme_onloads - * Additional onload directives. - * @return - * A string containing the onload attributes. - */ -function theme_onload_attribute($theme_onloads = array()) { - if (!is_array($theme_onloads)) { - $theme_onloads = array($theme_onloads); - } - // Merge theme onloads (javascript rollovers, image preloads, etc.) - // with module onloads (htmlarea, etc.) - $onloads = array_merge(module_invoke_all('onload'), $theme_onloads); - if (count($onloads)) { - return ' onload="' . implode('; ', $onloads) . '"'; - } - return ''; -} - /** * Return a set of blocks available for the current user. * diff --git a/themes/bluemarine/page.tpl.php b/themes/bluemarine/page.tpl.php index 9683955bf..f75ea826a 100644 --- a/themes/bluemarine/page.tpl.php +++ b/themes/bluemarine/page.tpl.php @@ -8,7 +8,7 @@ -> + diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme index da80828f4..bd6d865c6 100644 --- a/themes/chameleon/chameleon.theme +++ b/themes/chameleon/chameleon.theme @@ -38,7 +38,7 @@ function chameleon_page($content) { $output .= " \n"; $output .= theme_get_styles(); $output .= ""; - $output .= "\n"; + $output .= "\n"; $output .= "

"; if ($logo = theme_get_setting('logo')) { diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine index ac98567f7..e7ddc86a2 100644 --- a/themes/engines/phptemplate/phptemplate.engine +++ b/themes/engines/phptemplate/phptemplate.engine @@ -197,7 +197,6 @@ function phptemplate_page($content) { 'logo' => theme_get_setting('logo'), 'messages' => theme('status_messages'), 'mission' => isset($mission) ? $mission : '', - 'onload_attributes' => theme('onload_attribute'), 'primary_links' => menu_primary_links(), 'search_box' => (theme_get_setting('toggle_search') ? search_box() : ''), 'secondary_links' => menu_secondary_links(), diff --git a/themes/pushbutton/page.tpl.php b/themes/pushbutton/page.tpl.php index c986023ca..56faa28b4 100644 --- a/themes/pushbutton/page.tpl.php +++ b/themes/pushbutton/page.tpl.php @@ -7,7 +7,7 @@ -> + -- cgit v1.2.3