From 8d8487dfa68cb9cf543336d3555559ebffdc4c61 Mon Sep 17 00:00:00 2001
From: Peter 'Pita' Martischka <petermartischka@googlemail.com>
Date: Sun, 10 Feb 2013 21:49:00 +0000
Subject: [PATCH] Made jquery browser usable in testframework

---
 src/static/js/jquery_browser.js | 72 ++++++++++++++++++---------------
 tests/frontend/index.html       |  1 +
 2 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/src/static/js/jquery_browser.js b/src/static/js/jquery_browser.js
index 2bf694074..6a441486e 100644
--- a/src/static/js/jquery_browser.js
+++ b/src/static/js/jquery_browser.js
@@ -2,43 +2,49 @@
   Copied from jQuery 1.8, the last jquery version with browser recognition support
 */
 
-// Use of jQuery.browser is frowned upon.
-// More details: http://api.jquery.com/jQuery.browser
-// jQuery.uaMatch maintained for back-compat
-var uaMatch = function( ua ) {
-    ua = ua.toLowerCase();
+(function(){
+  // Use of jQuery.browser is frowned upon.
+  // More details: http://api.jquery.com/jQuery.browser
+  // jQuery.uaMatch maintained for back-compat
+  var uaMatch = function( ua ) {
+      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 ) ||
-        [];
+      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"
-    };
-};
+      return {
+          browser: match[ 1 ] || "",
+          version: match[ 2 ] || "0"
+      };
+  };
 
-var userAgent = navigator.userAgent;
-var matched = uaMatch(userAgent);
-var browser = {};
+  var userAgent = navigator.userAgent;
+  var matched = uaMatch(userAgent);
+  var browser = {};
 
-if ( matched.browser ) {
-    browser[ matched.browser ] = true;
-    browser.version = matched.version;
-}
+  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;
-}
+  // Chrome is Webkit, but Webkit is also Safari.
+  if ( browser.chrome ) {
+      browser.webkit = true;
+  } else if ( browser.webkit ) {
+      browser.safari = true;
+  }
 
-//custom extensions, the original jquery didn't have these
-browser.windows = /windows/.test(userAgent);
-browser.mobile = /mobile/.test(userAgent) || /android/.test(userAgent);
+  //custom extensions, the original jquery didn't have these
+  browser.windows = /windows/.test(userAgent);
+  browser.mobile = /mobile/.test(userAgent) || /android/.test(userAgent);
 
-exports.browser = browser;
\ No newline at end of file
+  if(typeof exports !== 'undefined'){
+    exports.browser = browser;
+  } else{
+    $.browser = browser;
+  }
+})();
\ No newline at end of file
diff --git a/tests/frontend/index.html b/tests/frontend/index.html
index f89f419e4..ac85a1360 100644
--- a/tests/frontend/index.html
+++ b/tests/frontend/index.html
@@ -10,6 +10,7 @@
     <div id="iframe-container"></div>
 
     <script src="/static/js/jquery.js"></script>
+    <script src="/static/js/jquery_browser.js"></script>
     <script src="lib/underscore.js"></script>
 
     <script src="lib/mocha.js"></script>