mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-24 01:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #1815 from bit/patches

Browse source 
Some Patches
This commit is contained in:
John McLear 2013-06-25 06:54:51 -07:00
commit 53529cd031
5 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/static/css/pad.css
View file

@ -168,9 +168,9 @@ a img {
}
#editorcontainer {
position: absolute;
width: 100%;
top: 37px; /* + 1px border */
left: 0px;
right: 0px;
bottom: 0px;
z-index: 1;
}

4
src/static/js/chat.js
View file

@ -42,13 +42,13 @@ var chat = (function()
padcookie.setPref("chatAlwaysVisible", true);
$('#chatbox').addClass("stickyChat");
$('#chattext').css({"top":"0px"});
$('#editorcontainer').css({"right":"192px", "width":"auto"});
$('#editorcontainer').css({"right":"192px"});
isStuck = true;
} else { // Unstick it
padcookie.setPref("chatAlwaysVisible", false);
$('#chatbox').removeClass("stickyChat");
$('#chattext').css({"top":"25px"});
$('#editorcontainer').css({"right":"0px", "width":"100%"});
$('#editorcontainer').css({"right":"0px"});
isStuck = false;
}
},

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

@ -524,7 +524,7 @@ var pad = {
if(padcookie.getPref("showAuthorshipColors") == false){
pad.changeViewOption('showAuthorColors', false);
}
hooks.aCallAll("postAceInit", {ace: padeditor.ace});
hooks.aCallAll("postAceInit", {ace: padeditor.ace, pad: pad});
}
},
dispose: function()

3
src/static/js/pad_userlist.js
View file

@ -633,6 +633,9 @@ var paduserlist = (function()
otherUsersInfo.splice(newExistingIndex, 1);
otherUsersData.splice(newExistingIndex, 1);
rowManager.removeRow(newExistingIndex);
hooks.callAll('userLeave', {
userInfo: info
});
updateInviteNotice();
}
}