fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hrm, removal

This commit is contained in:
John McLear 2016-01-08 13:39:32 +00:00
parent f16616d23b
commit 793b34d17b
4 changed files with 1 additions and 20 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> \
<script> \
$(window).load(function(){ \
if(navigator.userAgent.indexOf('MSIE') === -1){ \
// document.domain = document.domain; \
} \
var impexp = window.parent.padimpexp.handleFrameCall('" + directDatabaseAccess +"', '" + status + "'); \
}) \
</script>"

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

@ -286,7 +286,6 @@ window.onload = function () {\n\
iframe.name = "ace_inner";\n\
iframe.title = "pad";\n\
iframe.scrolling = "no";\n\
iframe.setAttribute("sandbox", "allow-same-origin allow-scripts allow-popups allow-forms allow-modals");\n\
var outerdocbody = document.getElementById("outerdocbody");\n\
iframe.frameBorder = 0;\n\
iframe.allowTransparency = true; // for IE\n\
@ -326,13 +325,10 @@ window.onload = function () {\n\
// bizarrely, in FF2, a file with no "external" dependencies won't finish loading properly
// (throbs busy while typing)
var testHTML = '<span>WONT WORK in Chrome</span><iframe src="/editable2.html" style="position:fixed;left:200px;right:0;top:250px;bottom:0;width:400px;height:200px;z-index:90999" sandbox="allow-same-origin allow-scripts allow-popups allow-forms allow-modals"></iframe>';
outerHTML.push('<style type="text/css" title="dynamicsyntax"></style>', '<link rel="stylesheet" type="text/css" href="data:text/css,"/>', scriptTag(outerScript), '</head><body id="outerdocbody" class="outerdocbody"><div id="sidediv" class="sidediv"><!-- --></div><div id="linemetricsdiv">x</div>'+testHTML+'</body></html>');
outerHTML.push('<style type="text/css" title="dynamicsyntax"></style>', '<link rel="stylesheet" type="text/css" href="data:text/css,"/>', scriptTag(outerScript), '</head><body id="outerdocbody" class="outerdocbody"><div id="sidediv" class="sidediv"><!-- --></div><div id="linemetricsdiv">x</div></body></html>');
var outerFrame = document.createElement("IFRAME");
outerFrame.name = "ace_outer";
outerFrame.setAttribute("sandbox", "allow-same-origin allow-scripts allow-popups allow-forms allow-modals");
outerFrame.frameBorder = 0; // for IE
outerFrame.title = "Ether";
info.frame = outerFrame;

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

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

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

@ -522,11 +522,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)
{