diff options
| author | Stefan <mu.stefan@googlemail.com> | 2016-03-29 16:16:22 +0200 |
|---|---|---|
| committer | Stefan <mu.stefan@googlemail.com> | 2016-03-29 16:16:22 +0200 |
| commit | 103e07e8287eccd312a6db4c0694c5964c9043b4 (patch) | |
| tree | 0e5bd0bea3756eb49cf15814dbb7fbdc259c5b5b | |
| parent | 8f2f01dff81de3de2979e0cafd23c0e091bedb0e (diff) | |
| download | etherpad-lite-103e07e8287eccd312a6db4c0694c5964c9043b4.zip | |
Fix document.domain error in frontend tests
| -rw-r--r-- | src/templates/timeslider.html | 4 | ||||
| -rw-r--r-- | tests/frontend/runner.js | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html index af0a8f02..f52c0c50 100644 --- a/src/templates/timeslider.html +++ b/src/templates/timeslider.html @@ -246,10 +246,6 @@ $ = jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery; // Expose jQuery #HACK 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 socket = require('ep_etherpad-lite/static/js/timeslider').socket; BroadcastSlider = require('ep_etherpad-lite/static/js/timeslider').BroadcastSlider; diff --git a/tests/frontend/runner.js b/tests/frontend/runner.js index 4801b95c..e77f6707 100644 --- a/tests/frontend/runner.js +++ b/tests/frontend/runner.js @@ -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 var getURLParameter = function (name) { return decodeURI( |