refs #3813 readding jQuery.browser plugin, as it has been removed in 1.9

matomo-org · Mar 29, 2013 · f3806a2 · f3806a2
1 parent 174228a
commit f3806a2
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 21 deletions.
diff --git a/core/AssetManager.php b/core/AssetManager.php
@@ -24,7 +24,7 @@
  * JavaScript and CSS files.
  *
  * It performs the following actions:
- *    - Identifies required assets
+ *  - Identifies required assets
  *  - Includes assets in the rendered HTML page
  *  - Manages asset merging and minifying
  *  - Manages server-side cache
@@ -282,6 +282,7 @@ private static function sortJsFiles($jsFiles)
         $priorityJsOrdered = array(
             'libs/jquery/jquery.js',
             'libs/jquery/jquery-ui.js',
+            'libs/jquery/jquery.browser.js',
             'libs/',
             'themes/default/common.js',
             'themes/default/',

diff --git a/libs/jquery/MIT-LICENSE-tooltip.txt b/libs/jquery/MIT-LICENSE-tooltip.txt
diff --git a/libs/jquery/jquery.browser.js b/libs/jquery/jquery.browser.js
diff --git a/libs/jquery/jquery.history.js b/libs/jquery/jquery.history.js
@@ -168,7 +168,7 @@
 
     var self = $.extend({}, implementations.base);
 
-    if($.browser && $.browser.msie && ($.browser.version < 8 || document.documentMode < 8)) {
+    if($.browser.msie && ($.browser.version < 8 || document.documentMode < 8)) {
         self.type = 'iframeTimer';
     } else if("onhashchange" in window) {
         self.type = 'hashchangeEvent';

diff --git a/plugins/CoreAdminHome/CoreAdminHome.php b/plugins/CoreAdminHome/CoreAdminHome.php
@@ -82,6 +82,7 @@ function getJsFiles($notification)
 
         $jsFiles[] = "libs/jquery/jquery.js";
         $jsFiles[] = "libs/jquery/jquery-ui.js";
+        $jsFiles[] = "libs/jquery/jquery.browser.js";
         $jsFiles[] = "libs/javascript/sprintf.js";
         $jsFiles[] = "themes/default/common.js";
         $jsFiles[] = "themes/default/ajaxHelper.js";

diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
@@ -72,6 +72,7 @@ function getJsFiles($notification)
 
         $jsFiles[] = "libs/jquery/jquery.js";
         $jsFiles[] = "libs/jquery/jquery-ui.js";
+        $jsFiles[] = "libs/jquery/jquery.browser.js";
         $jsFiles[] = "libs/jquery/jquery.truncate.js";
         $jsFiles[] = "libs/jquery/jquery.scrollTo.js";
         $jsFiles[] = "libs/jquery/jquery.history.js";

diff --git a/plugins/Widgetize/templates/js.tpl b/plugins/Widgetize/templates/js.tpl
@@ -14,6 +14,8 @@ document.write('
 document.write('
 <scr'+'ipt type="text/javascript" src="{$piwikUrl}libs/jquery/jquery-ui.js"></scr'+'ipt>');
 document.write('
+<scr'+'ipt type="text/javascript" src="{$piwikUrl}libs/jquery/jquery.browser.js"></scr'+'ipt>');
+document.write('
 <scr'+'ipt type="text/javascript" src="{$piwikUrl}libs/jquery/jquery.truncate.js"></scr'+'ipt>');
 document.write('
 <scr'+'ipt type="text/javascript" src="{$piwikUrl}libs/javascript/sprintf.js"></scr'+'ipt>');