libretic
/
etherpad-lite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Drag and drop between frames
This commit is contained in:
John McLear 2016-01-10 14:48:21 +00:00
parent 638757fdb5 935b921c2b
commit eeab7e8958
5 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/node/handler/ImportHandler.js
View File

@ -291,9 +291,6 @@ exports.doImport = function(req, res, padId)
</head> \ </head> \
<script> \ <script> \
$(window).load(function(){ \ $(window).load(function(){ \
if(navigator.userAgent.indexOf('MSIE') === -1){ \
document.domain = document.domain; \
} \
var impexp = window.parent.padimpexp.handleFrameCall('" + directDatabaseAccess +"', '" + status + "'); \ var impexp = window.parent.padimpexp.handleFrameCall('" + directDatabaseAccess +"', '" + status + "'); \
}) \ }) \
</script>" </script>"

2
src/static/js/ace2_inner.js
View File

@ -5006,7 +5006,6 @@ function Ace2Inner(){
}); });
}) })
$(root).on("drop", function(e){ $(root).on("drop", function(e){
if(e.target.a || e.target.localName === "a"){ if(e.target.a || e.target.localName === "a"){
e.preventDefault(); e.preventDefault();
@ -5021,7 +5020,6 @@ function Ace2Inner(){
}); });
}); });
// CompositionEvent is not implemented below IE version 8 // CompositionEvent is not implemented below IE version 8
if ( !(browser.msie && parseInt(browser.version <= 9)) && document.documentElement) if ( !(browser.msie && parseInt(browser.version <= 9)) && document.documentElement)
{ {

2
src/static/js/domline.js
View File

@ -80,7 +80,7 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
} }
var html = []; var html = [];
var preHtml = '', var preHtml = '',
postHtml = ''; postHtml = '';
var curHTML = null; var curHTML = null;

6
src/static/js/pad.js
View File

@ -513,7 +513,6 @@ var pad = {
_afterHandshake: function() _afterHandshake: function()
{ {
pad.clientTimeOffset = new Date().getTime() - clientVars.serverTimestamp; pad.clientTimeOffset = new Date().getTime() - clientVars.serverTimestamp;
//initialize the chat //initialize the chat
chat.init(this); chat.init(this);
getParams(); getParams();
@ -522,11 +521,6 @@ var pad = {
pad.initTime = +(new Date()); pad.initTime = +(new Date());
pad.padOptions = clientVars.initialOptions; pad.padOptions = clientVars.initialOptions;
if ((!browser.msie) && (!(browser.firefox && browser.version.indexOf("1.8.") == 0)))
{
document.domain = document.domain; // for comet
}
// for IE // for IE
if (browser.msie) if (browser.msie)
{ {

3
src/templates/pad.html
View File

@ -391,9 +391,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 hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks'); var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');