mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2942 from Gared/fix_frontend_tests

Browse source 
Fix document.domain error in frontend tests
This commit is contained in:
Stefan 2016-04-01 21:51:23 +02:00
commit 474e5c42d1
2 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/templates/timeslider.html
View file

@ -246,10 +246,6 @@
$ = jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery; // Expose jQuery #HACK $ = jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery; // Expose jQuery #HACK
browser = require('ep_etherpad-lite/static/js/browser'); browser = require('ep_etherpad-lite/static/js/browser');
if ((!browser.msie) && (!(browser.mozilla && browser.version.indexOf("1.8.") == 0))) {
document.domain = document.domain; // for comet
}
var plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins'); var plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');
var socket = require('ep_etherpad-lite/static/js/timeslider').socket; var socket = require('ep_etherpad-lite/static/js/timeslider').socket;
BroadcastSlider = require('ep_etherpad-lite/static/js/timeslider').BroadcastSlider; BroadcastSlider = require('ep_etherpad-lite/static/js/timeslider').BroadcastSlider;

6
tests/frontend/runner.js
View file

@ -161,12 +161,6 @@ $(function(){
} }
} }
//allow cross iframe access
var browser = bowser;
if ((!browser.msie) && (!(browser.mozilla && browser.version.indexOf("1.8.") == 0))) {
document.domain = document.domain; // for comet
}
//http://stackoverflow.com/questions/1403888/get-url-parameter-with-jquery //http://stackoverflow.com/questions/1403888/get-url-parameter-with-jquery
var getURLParameter = function (name) { var getURLParameter = function (name) {
return decodeURI( return decodeURI(