ensure we don't inject a second jquery

2012-10-08 14:07:08 +02:00 · 2012-10-08 14:07:08 +02:00 · 27f9906b1e
parent d4c851875a
commit 27f9906b1e
1 changed files with 2 additions and 1 deletions
--- a/tests/frontend/helper.js
+++ b/tests/frontend/helper.js
@ -7,7 +7,8 @@ var helper = {};
    $iframeContainer = $("#iframe-container");

    $.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){ 
        jsLibraries["sendkeys"] = code;