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

fix frontend tests

This commit is contained in:
John McLear 2014-11-27 16:58:04 +00:00
parent 3ca48ed975
commit ff58897679
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/frontend/index.html
View File

@ -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>

5
tests/frontend/lib/jquery.iframe.js
View File

@ -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);
})(jQuery);

3
tests/frontend/runner.js
View File

@ -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
}