From f16616d23bbbf813232bfa80f2796dca1eaf072c Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Fri, 8 Jan 2016 13:26:46 +0000
Subject: [PATCH] seems to work

---
 src/node/handler/ImportHandler.js | 2 +-
 src/static/js/pad.js              | 2 +-
 src/templates/pad.html            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index 026ce020..9f96a926 100644
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@@ -292,7 +292,7 @@ exports.doImport = function(req, res, padId)
       <script> \
         $(window).load(function(){ \
           if(navigator.userAgent.indexOf('MSIE') === -1){ \
-            document.domain = document.domain; \
+//            document.domain = document.domain; \
           } \
           var impexp = window.parent.padimpexp.handleFrameCall('" + directDatabaseAccess +"', '" + status + "'); \
         }) \
diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index 394d853e..b4f3c1b6 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -524,7 +524,7 @@ var pad = {
 
     if ((!browser.msie) && (!(browser.firefox && browser.version.indexOf("1.8.") == 0)))
     {
-      document.domain = document.domain; // for comet
+//      document.domain = document.domain; // for comet
     }
 
     // for IE
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 7e38b472..ecec5a00 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -392,7 +392,7 @@
               $ = 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
+//                document.domain = document.domain; // for comet
               }
 
               var plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');