diff options
| author | John McLear <john@mclear.co.uk> | 2014-11-27 16:58:04 +0000 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2014-11-27 16:58:04 +0000 |
| commit | ff58897679892f23d53f3372f40b40ccbacb7df5 (patch) | |
| tree | a351a2cd174888760aef3828a78e7ca1bb9c7d1e | |
| parent | 3ca48ed97572b5ca697f8206df2d7bc3db61b4cc (diff) | |
| download | etherpad-lite-ff58897679892f23d53f3372f40b40ccbacb7df5.zip | |
fix frontend tests
| -rw-r--r-- | tests/frontend/index.html | 3 | ||||
| -rw-r--r-- | tests/frontend/lib/jquery.iframe.js | 5 | ||||
| -rw-r--r-- | tests/frontend/runner.js | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/tests/frontend/index.html b/tests/frontend/index.html index ac85a136..1bf10495 100644 --- a/tests/frontend/index.html +++ b/tests/frontend/index.html @@ -10,7 +10,7 @@ <div id="iframe-container"></div> <script src="/static/js/jquery.js"></script> - <script src="/static/js/jquery_browser.js"></script> + <script src="/static/js/browser.js"></script> <script src="lib/underscore.js"></script> <script src="lib/mocha.js"></script> @@ -22,6 +22,5 @@ <script src="helper.js"></script> <script src="specs_list.js"></script> - <script src="runner.js"></script> </html> diff --git a/tests/frontend/lib/jquery.iframe.js b/tests/frontend/lib/jquery.iframe.js index 3c3b7b05..604ae1bc 100644 --- a/tests/frontend/lib/jquery.iframe.js +++ b/tests/frontend/lib/jquery.iframe.js @@ -2,8 +2,9 @@ (function($) { $.fn.purgeFrame = function() { var deferred; + var browser = bowser; - if ($.browser.msie && parseFloat($.browser.version, 10) < 9) { + if (browser.msie && parseFloat(browser.version, 10) < 9) { deferred = purge(this); } else { this.remove(); @@ -36,4 +37,4 @@ return deferred.promise(); } -})(jQuery);
\ No newline at end of file +})(jQuery); diff --git a/tests/frontend/runner.js b/tests/frontend/runner.js index 8f722125..4801b95c 100644 --- a/tests/frontend/runner.js +++ b/tests/frontend/runner.js @@ -162,7 +162,8 @@ $(function(){ } //allow cross iframe access - if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0))) { + var browser = bowser; + if ((!browser.msie) && (!(browser.mozilla && browser.version.indexOf("1.8.") == 0))) { document.domain = document.domain; // for comet } |