NoLog.cz/etherpad
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

fix frontend tests

Browse source
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> <div id="iframe-container"></div>
<script src="/static/js/jquery.js"></script> <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/underscore.js"></script>
<script src="lib/mocha.js"></script> <script src="lib/mocha.js"></script>
@ -22,6 +22,5 @@
<script src="helper.js"></script> <script src="helper.js"></script>
<script src="specs_list.js"></script> <script src="specs_list.js"></script>
<script src="runner.js"></script> <script src="runner.js"></script>
</html> </html>

3
tests/frontend/lib/jquery.iframe.js
View file

@ -2,8 +2,9 @@
(function($) { (function($) {
$.fn.purgeFrame = function() { $.fn.purgeFrame = function() {
var deferred; var deferred;
var browser = bowser;
if ($.browser.msie && parseFloat($.browser.version, 10) < 9) { if (browser.msie && parseFloat(browser.version, 10) < 9) {
deferred = purge(this); deferred = purge(this);
} else { } else {
this.remove(); this.remove();

3
tests/frontend/runner.js
View file

@ -162,7 +162,8 @@ $(function(){
} }
//allow cross iframe access //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 document.domain = document.domain; // for comet
} }