From 103e07e8287eccd312a6db4c0694c5964c9043b4 Mon Sep 17 00:00:00 2001
From: Stefan <mu.stefan@googlemail.com>
Date: Tue, 29 Mar 2016 16:16:22 +0200
Subject: [PATCH] Fix document.domain error in frontend tests

---
 src/templates/timeslider.html | 4 ----
 tests/frontend/runner.js      | 6 ------
 2 files changed, 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(