GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Revert "move scripts to just before </body>, add event for scripts that need to be in <head>"

Browse Source 
This reverts commit a5ed805aea.

It shouldn't have gone on the stable branch.
This commit is contained in:
Evan Prodromou 2009-09-24 17:14:04 -04:00
parent a5ed805aea
commit d7e43c732e
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
EVENTS.txt
View File

@ -134,9 +134,3 @@ StartAddressData: Allows the site owner to provide additional information about
EndAddressData: At the end of <address> EndAddressData: At the end of <address>
- $action: the current action - $action: the current action
StartShowHeadElements: Right after the <head> tag
- $action: the current action
EndShowHeadElements: Right before the </head> tag; put <script>s here if you need them in <head>
- $action: the current action

19
lib/action.php
View File

@ -120,16 +120,14 @@ class Action extends HTMLOutputter // lawsuit
{ {
// XXX: attributes (profile?) // XXX: attributes (profile?)
$this->elementStart('head'); $this->elementStart('head');
if (Event::handle('StartShowHeadElements', array($this))) { $this->showTitle();
$this->showTitle(); $this->showShortcutIcon();
$this->showShortcutIcon(); $this->showStylesheets();
$this->showStylesheets(); $this->showScripts();
$this->showOpenSearch(); $this->showOpenSearch();
$this->showFeeds(); $this->showFeeds();
$this->showDescription(); $this->showDescription();
$this->extraHead(); $this->extraHead();
Event::handle('EndShowHeadElements', array($this));
}
$this->elementEnd('head'); $this->elementEnd('head');
} }
@ -354,7 +352,6 @@ class Action extends HTMLOutputter // lawsuit
Event::handle('EndShowFooter', array($this)); Event::handle('EndShowFooter', array($this));
} }
$this->elementEnd('div'); $this->elementEnd('div');
$this->showScripts();
$this->elementEnd('body'); $this->elementEnd('body');
} }