diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-03-12 00:13:28 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-03-12 00:13:28 -0400 |
| commit | e185c0395a6cd250ccd7c8e385c54830be73f937 (patch) | |
| tree | 5e6807b33f8d622c67d4178652b7ca6819d4a84c /lib/action.php | |
| parent | 93030ae7b65f9a6b508dac0365dbcff302b65b90 (diff) | |
Revert "trac #201 Add flowplayer to enable multimedia playback capability."
This reverts commit 9c9b6790ce78296c0b182f03b5f6f2c035e43a7c.
This code wasn't ready for release, so I've reverted it for now.
Conflicts:
lib/action.php
lib/util.php
Diffstat (limited to 'lib/action.php')
| -rw-r--r-- | lib/action.php | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/lib/action.php b/lib/action.php index 45ce56ac0..975c2bfcb 100644 --- a/lib/action.php +++ b/lib/action.php @@ -156,17 +156,12 @@ class Action extends HTMLOutputter // lawsuit { if (Event::handle('StartShowStyles', array($this))) { if (Event::handle('StartShowLaconicaStyles', array($this))) { - $this->element('link', array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => theme_path('css/display.css', 'base') . '?version=' . LACONICA_VERSION, 'media' => 'screen, projection, tv')); $this->element('link', array('rel' => 'stylesheet', 'type' => 'text/css', - 'href' => theme_path('css/modal.css', 'base') . '?version=' . LACONICA_VERSION, - 'media' => 'screen, projection, tv')); - $this->element('link', array('rel' => 'stylesheet', - 'type' => 'text/css', 'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION, 'media' => 'screen, projection, tv')); if (common_config('site', 'mobile')) { @@ -215,11 +210,6 @@ 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.simplemodal-1.2.2.pack.js')), - ' '); - Event::handle('EndShowJQueryScripts', array($this)); } if (Event::handle('StartShowLaconicaScripts', array($this))) { @@ -232,14 +222,6 @@ class Action extends HTMLOutputter // lawsuit // 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; }'); - - $this->element('script', array('type' => 'text/javascript', - 'src' => common_path('js/flowplayer-3.0.5.min.js')), - ' '); - - $this->element('script', array('type' => 'text/javascript', - 'src' => common_path('js/video.js')), - ' '); Event::handle('EndShowLaconicaScripts', array($this)); } Event::handle('EndShowScripts', array($this)); |