From 3412e50b54e3daac8745234e21ab6e72be0ed165 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 04 Jun 2014 11:20:33 -0400
Subject: [PATCH] Fix attachment menu structure and aria-attributes
---
plugins/legacy_browser/legacy_browser.php | 34 +++++++++++++---------------------
1 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/plugins/legacy_browser/legacy_browser.php b/plugins/legacy_browser/legacy_browser.php
index c910d76..0dc0794 100644
--- a/plugins/legacy_browser/legacy_browser.php
+++ b/plugins/legacy_browser/legacy_browser.php
@@ -23,10 +23,12 @@
function send_page($args)
{
// replace jQuery 2.x with 1.x
- $ts = filemtime($this->home . '/js/jquery.min.js');
+ $ts1 = filemtime($this->home . '/js/jquery.min.js');
+ $ts2 = filemtime($this->home . '/js/iehacks.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>'."\n"
+ .'<script src="plugins/legacy_browser/js/iehacks.js?s=' . $ts2 . '" type="text/javascript"></script>',
$args['content'], 1);
return $args;
@@ -38,32 +40,22 @@
$skin = $this->skin();
if ($skin == 'classic') {
+ $minified = file_exists(INSTALL_PATH . '/plugins/legacy_browser/skins/classic/iehacks.min.css') ? '.min' : '';
$rcube->output->add_header(
- '<link rel="stylesheet" type="text/css" href="plugins/legacy_browser/classic/iehacks.css" />'
+ '<link rel="stylesheet" type="text/css" href="plugins/legacy_browser/skins/classic/iehacks' . $minified . '.css" />'
);
}
else if ($skin == 'larry') {
+ $minified = file_exists(INSTALL_PATH . '/plugins/legacy_browser/skins/larry/iehacks.min.css') ? '.min' : '';
+ $rcube->output->add_header(
+ '<link rel="stylesheet" type="text/css" href="plugins/legacy_browser/skins/larry/iehacks' . $minified . '.css" />'
+ );
+
if ($rcube->output->browser->ver < 8) {
$rcube->output->add_header(
- '<link rel="stylesheet" type="text/css" href="plugins/legacy_browser/larry/ie7hacks.css" />'
+ '<link rel="stylesheet" type="text/css" href="plugins/legacy_browser/skins/larry/ie7hacks' . $minified . '.css" />'
);
}
- else {
- $rcube->output->add_header(
- '<link rel="stylesheet" type="text/css" href="plugins/legacy_browser/larry/iehacks.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>'
- )));
}
}
--
Gitblit v1.9.1