diff options
| -rw-r--r-- | src/node/handler/ImportHandler.js | 3 | ||||
| -rw-r--r-- | src/static/js/ace.js | 6 | ||||
| -rw-r--r-- | src/static/js/ace2_inner.js | 7 | ||||
| -rw-r--r-- | src/static/js/pad.js | 5 |
4 files changed, 1 insertions, 20 deletions
diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js index 9f96a926..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/ace.js b/src/static/js/ace.js index 0e81974c..a5e365ce 100644 --- a/src/static/js/ace.js +++ b/src/static/js/ace.js @@ -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; diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index 4473126c..9586de1d 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -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) diff --git a/src/static/js/pad.js b/src/static/js/pad.js index b4f3c1b6..877ef45d 100644 --- a/src/static/js/pad.js +++ b/src/static/js/pad.js @@ -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) { |