summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-26 10:33:04 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-08-26 10:33:04 -0400
commit379c80e26e2de30841f7fb49e7e967e675a4951f (patch)
treea30d862654b0d59473e9cfbb9fad942ce13c7f92
parentbe5d113fc684fcbe41b8374c62bfeb0f267216b7 (diff)
add *Laconica* events back in for backwards compatibility
-rw-r--r--EVENTS.txt12
-rw-r--r--lib/action.php10
2 files changed, 20 insertions, 2 deletions
diff --git a/EVENTS.txt b/EVENTS.txt
index 59de6de5f..68cb28603 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -26,6 +26,12 @@ StartShowStatusNetStyles: Showing StatusNet Style links
EndShowStatusNetStyles: End showing StatusNet Style links; good place to add handheld or JavaScript dependant styles
- $action: the current action
+StartShowLaconicaStyles: backwards compatibility; deprecated
+- $action: the current action
+
+EndShowLaconicaStyles: backwards compatibility; deprecated
+- $action: the current action
+
StartShowUAStyles: Showing custom UA Style links
- $action: the current action
@@ -51,6 +57,12 @@ StartShowStatusNetScripts: Showing StatusNet script links (use this to link to a
EndShowStatusNetScripts: End showing StatusNet script links
- $action: the current action
+StartShowLaconicaScripts: backwards compatibility; deprecated
+- $action: the current action
+
+EndShowLaconicaScripts: backwards compatibility; deprecated
+- $action: the current action
+
StartShowSections: Start the list of sections in the sidebar
- $action: the current action
diff --git a/lib/action.php b/lib/action.php
index a99c885dd..cb922f60e 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -192,7 +192,10 @@ class Action extends HTMLOutputter // lawsuit
{
if (Event::handle('StartShowStyles', array($this))) {
- if (Event::handle('StartShowStatusNetStyles', array($this))) {
+ // Use old name for StatusNet for compatibility on events
+
+ if (Event::handle('StartShowStatusNetStyles', array($this)) &&
+ Event::handle('StartShowLaconicaStyles', array($this))) {
$this->cssLink('css/display.css',null,'screen, projection, tv');
if (common_config('site', 'mobile')) {
// TODO: "handheld" CSS for other mobile devices
@@ -200,6 +203,7 @@ class Action extends HTMLOutputter // lawsuit
}
$this->cssLink('css/print.css','base','print');
Event::handle('EndShowStatusNetStyles', array($this));
+ Event::handle('EndShowLaconicaStyles', array($this));
}
if (Event::handle('StartShowUAStyles', array($this))) {
@@ -249,13 +253,15 @@ class Action extends HTMLOutputter // lawsuit
$this->script('js/jquery.joverlay.min.js');
Event::handle('EndShowJQueryScripts', array($this));
}
- if (Event::handle('StartShowStatusNetScripts', array($this))) {
+ if (Event::handle('StartShowStatusNetScripts', array($this)) &&
+ Event::handle('StartShowLaconicaScripts', array($this))) {
$this->script('js/xbImportNode.js');
$this->script('js/util.js');
// Frame-busting code to avoid clickjacking attacks.
$this->element('script', array('type' => 'text/javascript'),
'if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');
Event::handle('EndShowStatusNetScripts', array($this));
+ Event::handle('EndShowLaconicaScripts', array($this));
}
Event::handle('EndShowScripts', array($this));
}