diff options
| author | Peter 'Pita' Martischka <petermartischka@googlemail.com> | 2012-10-08 14:07:08 +0200 |
|---|---|---|
| committer | Peter 'Pita' Martischka <petermartischka@googlemail.com> | 2012-10-08 14:07:08 +0200 |
| commit | 27f9906b1edd5d6acb779630ca90d338603956c0 (patch) | |
| tree | eb85ea7403347c8fabef9589ea2cf7605c7e4223 /tests/frontend/helper.js | |
| parent | d4c851875acf5cd6451e2478ded5a61faa519ec4 (diff) | |
| download | etherpad-lite-27f9906b1edd5d6acb779630ca90d338603956c0.zip | |
ensure we don't inject a second jquery
Diffstat (limited to 'tests/frontend/helper.js')
| -rw-r--r-- | tests/frontend/helper.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/frontend/helper.js b/tests/frontend/helper.js index 196414a9..ec4bd19c 100644 --- 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; |