mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-28 11:26:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Bugfixed a broken merge

Browse source
This commit is contained in:
Egil Moeller 2015-04-24 21:04:52 +02:00
parent 2cd280a44b
commit 0ec2592c53
1 changed files with 1 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/static/js/pad.js
View file

@ -375,7 +375,6 @@ define([
}, },
getIsDebugEnabled: function() getIsDebugEnabled: function()
{ {
<<<<<<< HEAD
return clientVars.debugEnabled; return clientVars.debugEnabled;
}, },
getPrivilege: function(name) getPrivilege: function(name)
@ -409,11 +408,10 @@ define([
var newHref = "/p/" + padId; var newHref = "/p/" + padId;
if (options != null) if (options != null)
newHref = newHref + '?' + options; newHref = newHref + '?' + options;
=======
// start the custom js // start the custom js
if (typeof customStart == "function") customStart(); if (typeof customStart == "function") customStart();
handshake(); handshake();
>>>>>>> d31523aa08d123f421248e249e2194f7689f0b06
if(window.history && window.history.pushState) if(window.history && window.history.pushState)
{ {
@ -422,33 +420,7 @@ define([
receivedClientVars = false; receivedClientVars = false;
sendClientReady(false, 'SWITCH_TO_PAD'); sendClientReady(false, 'SWITCH_TO_PAD');
} }
<<<<<<< HEAD
else // fallback else // fallback
=======
});
},
_afterHandshake: function()
{
pad.clientTimeOffset = new Date().getTime() - clientVars.serverTimestamp;
//initialize the chat
chat.init(this);
getParams();
padcookie.init(); // initialize the cookies
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)
{
try
>>>>>>> d31523aa08d123f421248e249e2194f7689f0b06
{ {
window.location.href = newHref; window.location.href = newHref;
} }