[FIX] web: reintroduce $.bbq to keep compatibility with jquery.ba-bbq

4 files changed, 41 insertions, 4 deletions

diff --git a/addons/web/static/lib/jquery/jquery.browser.js b/addons/web/static/lib/jquery/jquery.browser.js
new file mode 100644
index 00000000000..acf9077caa3
--- /dev/null
+++ b/addons/web/static/lib/jquery/jquery.browser.js
@@ -0,0 +1,37 @@
+(function() {
+    /** reimport deprecated $.browser, remove me when jquery.ba-bqq is dropped */
+    $.uaMatch = function( ua ) {
+        var ua = ua.toLowerCase();
+
+        var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
+            /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
+            /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
+            /(msie) ([\w.]+)/.exec( ua ) ||
+            ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
+            [];
+
+        return {
+            browser: match[ 1 ] || "",
+            version: match[ 2 ] || "0"
+        };
+    };
+    // Don't clobber any existing jQuery.browser in case it's different
+    if ( !$.browser ) {
+        var matched = $.uaMatch( navigator.userAgent );
+        var browser = {};
+
+        if ( matched.browser ) {
+            browser[ matched.browser ] = true;
+            browser.version = matched.version;
+        }
+
+        // Chrome is Webkit, but Webkit is also Safari.
+        if ( browser.chrome ) {
+            browser.webkit = true;
+        } else if ( browser.webkit ) {
+            browser.safari = true;
+        }
+
+        $.browser = browser;
+    }
+})();
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index ca13482caa8..2e92bd95954 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -538,10 +538,6 @@ instance.web.TranslationDataBase.include({
 });
 
 /** Custom jQuery plugins */
-$.browser = $.browser || {};
-if(navigator.appVersion.indexOf("MSIE") !== -1) {
-    $.browser.msie = 1;
-}
 $.fn.getAttributes = function() {
     var o = {};
     if (this.length) {
diff --git a/addons/web/views/database_manager.html b/addons/web/views/database_manager.html
index 964fa1b19b3..a6a91a3a4c3 100644
--- a/addons/web/views/database_manager.html
+++ b/addons/web/views/database_manager.html
@@ -11,12 +11,15 @@
         <script src="/web/static/lib/underscore.string/lib/underscore.string.js" type="text/javascript"></script>
         <script src="/web/static/lib/spinjs/spin.js" type="text/javascript"></script>
         <script src="/web/static/lib/jquery/jquery.js" type="text/javascript"></script>
+        <script src="/web/static/lib/jquery/jquery.browser.js" type="text/javascript"></script>
         <script src="/web/static/lib/jquery.blockUI/jquery.blockUI.js" type="text/javascript"></script>
         <script src="/web/static/lib/jquery.hotkeys/jquery.hotkeys.js" type="text/javascript"></script>
         <script src="/web/static/lib/jquery.placeholder/jquery.placeholder.js" type="text/javascript"></script>
         <script src="/web/static/lib/jquery.timeago/jquery.timeago.js" type="text/javascript"></script>
         <script src="/web/static/lib/jquery.form/jquery.form.js" type="text/javascript"></script>
+
         <script src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js" type="text/javascript"></script>
+
         <script src="/web/static/lib/jquery.validate/jquery.validate.js" type="text/javascript"></script>
         <script src="/web/static/lib/jquery.autosize/jquery.autosize.js" type="text/javascript"></script>
         <script src="/web/static/lib/jquery.scrollTo/jquery.scrollTo-min.js" type="text/javascript"></script>
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index b7f383d61a0..6825087ef3f 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -11,6 +11,7 @@
 
             <!-- jQuery stuff -->
             <script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script>
+            <script type="text/javascript" src="/web/static/lib/jquery/jquery.browser.js"></script>
             <script type="text/javascript" src="/web/static/lib/jquery.blockUI/jquery.blockUI.js"></script>
             <script type="text/javascript" src="/web/static/lib/jquery.hotkeys/jquery.hotkeys.js"></script>
             <script type="text/javascript" src="/web/static/lib/jquery.placeholder/jquery.placeholder.js"></script>