fuwafuwa/etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ensure we don't inject a second jquery

Browse Source
This commit is contained in:
Peter 'Pita' Martischka 2012-10-08 14:07:08 +02:00
parent d4c851875a
commit 27f9906b1e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/frontend/helper.js
View File

@ -7,7 +7,8 @@ var helper = {};
$iframeContainer = $("#iframe-container"); $iframeContainer = $("#iframe-container");
$.get('/static/js/jquery.js').done(function(code){ $.get('/static/js/jquery.js').done(function(code){
jsLibraries["jquery"] = code; // make sure we don't override existing jquery
jsLibraries["jquery"] = "if(typeof $ === 'undefined') {\n" + code + "\n}";
$.get('/tests/frontend/sendkeys.js').done(function(code){ $.get('/tests/frontend/sendkeys.js').done(function(code){
jsLibraries["sendkeys"] = code; jsLibraries["sendkeys"] = code;