From 378efddbbe776cdfd9be8c5904afeb4eecf33291 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 2 May 2014 11:01:18 +0200
Subject: MOve more IE<9 code to legacy_browser

---
 plugins/legacy_browser/legacy_browser.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'plugins/legacy_browser/legacy_browser.php')

diff --git a/plugins/legacy_browser/legacy_browser.php b/plugins/legacy_browser/legacy_browser.php
index 0dc0794f3..9378cdc3e 100644
--- a/plugins/legacy_browser/legacy_browser.php
+++ b/plugins/legacy_browser/legacy_browser.php
@@ -25,10 +25,17 @@ class legacy_browser extends rcube_plugin
         // replace jQuery 2.x with 1.x
         $ts1 = filemtime($this->home . '/js/jquery.min.js');
         $ts2 = filemtime($this->home . '/js/iehacks.js');
+
+        // put iehacks.js after app.js
+        $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);
+
         $args['content'] = preg_replace(
             '|<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>',
+            '<script src="plugins/legacy_browser/js/jquery.min.js?s=' . $ts1 . '" type="text/javascript"></script>'
+            . ($count ? '' : "\n".'<script src="plugins/legacy_browser/js/iehacks.js?s=' . $ts2 . '" type="text/javascript"></script>'),
             $args['content'], 1);
 
         return $args;
-- 
cgit v1.2.3