Merge pull request #2876 from ether/drag-and-drop-between-frames-sandbox

Drag and drop between frames

5 files changed, 1 insertions, 15 deletions

diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index 026ce020..870c954a 100644
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@@ -291,9 +291,6 @@ exports.doImport = function(req, res, padId)
       </head> \
       <script> \
         $(window).load(function(){ \
-          if(navigator.userAgent.indexOf('MSIE') === -1){ \
-            document.domain = document.domain; \
-          } \
           var impexp = window.parent.padimpexp.handleFrameCall('" + directDatabaseAccess +"', '" + status + "'); \
         }) \
       </script>"
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index ccc16668..0cfdec3f 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -5006,7 +5006,6 @@ function Ace2Inner(){
       });
     })
 
-
     $(root).on("drop", function(e){
       if(e.target.a || e.target.localName === "a"){
         e.preventDefault();
@@ -5021,7 +5020,6 @@ function Ace2Inner(){
       });
     });
 
-
     // CompositionEvent is not implemented below IE version 8
     if ( !(browser.msie && parseInt(browser.version <= 9)) && document.documentElement)
     {
diff --git a/src/static/js/domline.js b/src/static/js/domline.js
index 03f1b9c8..ed3f147a 100644
--- a/src/static/js/domline.js
+++ b/src/static/js/domline.js
@@ -80,7 +80,7 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
   }
 
   var html = [];
-  var preHtml = '', 
+  var preHtml = '',
   postHtml = '';
   var curHTML = null;
 
diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index eb90a883..d54f9c88 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -513,7 +513,6 @@ var pad = {
   _afterHandshake: function()
   {
     pad.clientTimeOffset = new Date().getTime() - clientVars.serverTimestamp;
-  
     //initialize the chat
     chat.init(this);
     getParams();
@@ -522,11 +521,6 @@ var pad = {
     pad.initTime = +(new Date());
     pad.padOptions = clientVars.initialOptions;
 
-    if ((!browser.msie) && (!(browser.firefox && browser.version.indexOf("1.8.") == 0)))
-    {
-      document.domain = document.domain; // for comet
-    }
-
     // for IE
     if (browser.msie)
     {
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 7e38b472..767c1ec9 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -391,9 +391,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 hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');