Merge pull request #715 from redhog/master

Bugfix for IE and document.domain
pull/703/merge
John McLear 2012-05-18 10:19:44 -07:00
commit f3036eb124
3 changed files with 15 additions and 3 deletions

View File

@ -130,7 +130,11 @@
<script src="static/custom/index.js"></script> <script src="static/custom/index.js"></script>
<script> <script>
document.domain = document.domain; if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0)))
{
document.domain = document.domain; // for comet
}
function go2Name() function go2Name()
{ {
var padname = document.getElementById("padname").value; var padname = document.getElementById("padname").value;

View File

@ -283,7 +283,11 @@
<script type="text/javascript" src="../socket.io/socket.io.js"></script> <script type="text/javascript" src="../socket.io/socket.io.js"></script>
<script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script> <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script>
<script type="text/javascript"> <script type="text/javascript">
document.domain = document.domain; if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0)))
{
document.domain = document.domain; // for comet
}
var clientVars = {}; var clientVars = {};
(function () { (function () {

View File

@ -130,7 +130,11 @@
<script type="text/javascript" src="../../static/custom/timeslider.js"></script> <script type="text/javascript" src="../../static/custom/timeslider.js"></script>
<script type="text/javascript" > <script type="text/javascript" >
document.domain = document.domain; if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0)))
{
document.domain = document.domain; // for comet
}
var clientVars = {}; var clientVars = {};
(function () { (function () {