summaryrefslogtreecommitdiff
path: root/lib/action.php
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-05-15 23:17:57 +0000
committerZach Copley <zach@controlyourself.ca>2009-05-15 23:17:57 +0000
commit811cef10083f8b7824b2fd8140f940bf13b54c8d (patch)
tree3d403c3c7e08a79a3a87c5bafacfb3f08fcd4211 /lib/action.php
parent3f44f94c3c3f0c3d46f5025854431f0d2825bb6c (diff)
parent6c4e26fe61a3c1cada4775a42a929eb884150b2d (diff)
Merge branch '0.8.x' into fbconnect
Diffstat (limited to 'lib/action.php')
-rw-r--r--lib/action.php12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/action.php b/lib/action.php
index 3e43ffe3e..fc123a633 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -98,15 +98,15 @@ class Action extends HTMLOutputter // lawsuit
Event::handle('EndShowHTML', array($this));
}
if (Event::handle('StartShowHead', array($this))) {
- $this->showHead();
+ $this->showHead();
Event::handle('EndShowHead', array($this));
}
if (Event::handle('StartShowBody', array($this))) {
- $this->showBody();
+ $this->showBody();
Event::handle('EndShowBody', array($this));
}
if (Event::handle('StartEndHTML', array($this))) {
- $this->endHTML();
+ $this->endHTML();
Event::handle('EndEndHTML', array($this));
}
}
@@ -243,6 +243,12 @@ class Action extends HTMLOutputter // lawsuit
$this->element('script', array('type' => 'text/javascript',
'src' => common_path('js/jquery.form.js')),
' ');
+
+ $this->element('script', array('type' => 'text/javascript',
+ 'src' => common_path('js/jquery.joverlay.min.js')),
+ ' ');
+
+
Event::handle('EndShowJQueryScripts', array($this));
}
if (Event::handle('StartShowLaconicaScripts', array($this))) {