From ced34cb15e095836767971aa4d27b141fb1d7ec9 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 18 Oct 2014 08:47:54 -0400
Subject: [PATCH] Merge pull request #230 from bytesatwork-xx/master
---
plugins/legacy_browser/legacy_browser.php | 75 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 31 deletions(-)
diff --git a/plugins/legacy_browser/legacy_browser.php b/plugins/legacy_browser/legacy_browser.php
index c910d76..a261677 100644
--- a/plugins/legacy_browser/legacy_browser.php
+++ b/plugins/legacy_browser/legacy_browser.php
@@ -1,7 +1,7 @@
<?php
/**
- * Plugin which adds support for legacy browsers (IE 7/8)
+ * Plugin which adds support for legacy browsers (IE 7/8, Firefox < 4)
*
* @author Aleksander Machniak <alec@alec.pl>
* @license GNU GPLv3+
@@ -9,12 +9,18 @@
class legacy_browser extends rcube_plugin
{
public $noajax = true;
+ private $rc;
public function init()
{
- $rcube = rcube::get_instance();
+ $this->rc = $rcube = rcube::get_instance();
- if ($rcube->output->browser->ie && $rcube->output->browser->ver < 9) {
+ if (
+ // IE < 9
+ ($rcube->output->browser->ie && $rcube->output->browser->ver < 9)
+ // Firefox < 4 (Firefox 4 is recognized as 2.0)
+ || ($rcube->output->browser->mz && $rcube->output->browser->ver < 2)
+ ) {
$this->add_hook('send_page', array($this, 'send_page'));
$this->add_hook('render_page', array($this, 'render_page'));
}
@@ -22,11 +28,26 @@
function send_page($args)
{
+ $ts1 = filemtime($this->home . '/js/jquery.min.js');
+ $ts2 = filemtime($this->home . '/js/iehacks.js');
+
+ // put iehacks.js after app.js
+ if ($this->rc->output->browser->ie) {
+ $args['content'] = preg_replace(
+ '|(<script src="program/js/app(\.min)?\.js\?s=[0-9]+" type="text/javascript"></script>)|',
+ '\\1<script src="plugins/legacy_browser/js/iehacks.js?s=' . $ts2 . '" type="text/javascript"></script>',
+ $args['content'], 1, $count);
+ }
+ else {
+ $count = 1;
+ }
+
// replace jQuery 2.x with 1.x
- $ts = filemtime($this->home . '/js/jquery.min.js');
$args['content'] = preg_replace(
- '|"program/js/jquery\.min\.js\?s=[0-9]+"|',
- '"plugins/legacy_browser/js/jquery.min.js?s=' . $ts . '"',
+ '|<script src="program/js/jquery\.min\.js\?s=[0-9]+" type="text/javascript"></script>|',
+ '<script src="plugins/legacy_browser/js/jquery.min.js?s=' . $ts1 . '" type="text/javascript"></script>'
+ // add iehacks.js if it is IE and it wasn't added yet
+ . ($count ? '' : "\n".'<script src="plugins/legacy_browser/js/iehacks.js?s=' . $ts2 . '" type="text/javascript"></script>'),
$args['content'], 1);
return $args;
@@ -34,43 +55,35 @@
function render_page($args)
{
- $rcube = rcube::get_instance();
+ if (!$this->rc->output->browser->ie) {
+ return $args;
+ }
+
$skin = $this->skin();
if ($skin == 'classic') {
- $rcube->output->add_header(
- '<link rel="stylesheet" type="text/css" href="plugins/legacy_browser/classic/iehacks.css" />'
+ $minified = file_exists(INSTALL_PATH . '/plugins/legacy_browser/skins/classic/iehacks.min.css') ? '.min' : '';
+ $this->rc->output->add_header(
+ '<link rel="stylesheet" type="text/css" href="plugins/legacy_browser/skins/classic/iehacks' . $minified . '.css" />'
);
}
else if ($skin == 'larry') {
- if ($rcube->output->browser->ver < 8) {
- $rcube->output->add_header(
- '<link rel="stylesheet" type="text/css" href="plugins/legacy_browser/larry/ie7hacks.css" />'
- );
- }
- else {
- $rcube->output->add_header(
- '<link rel="stylesheet" type="text/css" href="plugins/legacy_browser/larry/iehacks.css" />'
- );
- }
+ $minified = file_exists(INSTALL_PATH . '/plugins/legacy_browser/skins/larry/iehacks.min.css') ? '.min' : '';
+ $this->rc->output->add_header(
+ '<link rel="stylesheet" type="text/css" href="plugins/legacy_browser/skins/larry/iehacks' . $minified . '.css" />'
+ );
- // fix missing :last-child selectors
- $rcube->output->add_footer(implode("\n", array(
- '<script type="text/javascript">',
- '$(document).ready(function() {',
- ' $(\'ul.treelist ul\').each(function(i,ul) {',
- ' $(\'li:last-child\', ul).css(\'border-bottom\', 0);',
- ' });',
- '});',
- '</script>'
- )));
+ if ($this->rc->output->browser->ver < 8) {
+ $this->rc->output->add_header(
+ '<link rel="stylesheet" type="text/css" href="plugins/legacy_browser/skins/larry/ie7hacks' . $minified . '.css" />'
+ );
+ }
}
}
private function skin()
{
- $rcube = rcube::get_instance();
- $skin = $rcube->config->get('skin');
+ $skin = $this->rc->config->get('skin');
// external skin, find if it inherits from other skin
if ($skin != 'larry' && $skin != 'classic') {
--
Gitblit v1.9.1