mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 16:06:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Made jquery browser usable in testframework

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2013-02-10 21:49:00 +00:00
parent bd33061c8a
commit 8d8487dfa6
2 changed files with 40 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/static/js/jquery_browser.js vendored
View file

@ -2,10 +2,11 @@
Copied from jQuery 1.8, the last jquery version with browser recognition support Copied from jQuery 1.8, the last jquery version with browser recognition support
*/ */
// Use of jQuery.browser is frowned upon. (function(){
// More details: http://api.jquery.com/jQuery.browser // Use of jQuery.browser is frowned upon.
// jQuery.uaMatch maintained for back-compat // More details: http://api.jquery.com/jQuery.browser
var uaMatch = function( ua ) { // jQuery.uaMatch maintained for back-compat
var uaMatch = function( ua ) {
ua = ua.toLowerCase(); ua = ua.toLowerCase();
var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) || var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
@ -19,26 +20,31 @@ var uaMatch = function( ua ) {
browser: match[ 1 ] || "", browser: match[ 1 ] || "",
version: match[ 2 ] || "0" version: match[ 2 ] || "0"
}; };
}; };
var userAgent = navigator.userAgent; var userAgent = navigator.userAgent;
var matched = uaMatch(userAgent); var matched = uaMatch(userAgent);
var browser = {}; var browser = {};
if ( matched.browser ) { if ( matched.browser ) {
browser[ matched.browser ] = true; browser[ matched.browser ] = true;
browser.version = matched.version; browser.version = matched.version;
} }
// Chrome is Webkit, but Webkit is also Safari. // Chrome is Webkit, but Webkit is also Safari.
if ( browser.chrome ) { if ( browser.chrome ) {
browser.webkit = true; browser.webkit = true;
} else if ( browser.webkit ) { } else if ( browser.webkit ) {
browser.safari = true; browser.safari = true;
} }
//custom extensions, the original jquery didn't have these //custom extensions, the original jquery didn't have these
browser.windows = /windows/.test(userAgent); browser.windows = /windows/.test(userAgent);
browser.mobile = /mobile/.test(userAgent) || /android/.test(userAgent); browser.mobile = /mobile/.test(userAgent) || /android/.test(userAgent);
exports.browser = browser; if(typeof exports !== 'undefined'){
exports.browser = browser;
} else{
$.browser = browser;
}
})();

1
tests/frontend/index.html
View file

@ -10,6 +10,7 @@
<div id="iframe-container"></div> <div id="iframe-container"></div>
<script src="/static/js/jquery.js"></script> <script src="/static/js/jquery.js"></script>
<script src="/static/js/jquery_browser.js"></script>
<script src="lib/underscore.js"></script> <script src="lib/underscore.js"></script>
<script src="lib/mocha.js"></script> <script src="lib/mocha.js"></script>