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

seems to work

This commit is contained in:
John McLear 2016-01-08 13:26:46 +00:00
parent 34a46d6318
commit f16616d23b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -524,7 +524,7 @@ var pad = {
if ((!browser.msie) && (!(browser.firefox && browser.version.indexOf("1.8.") == 0))) 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 // for IE

2
src/templates/pad.html
View File

@ -392,7 +392,7 @@
$ = 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))) { 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'); var plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');