Merge pull request #1815 from bit/patches

Some Patches
clean-css-update
John McLear 2013-06-25 06:54:51 -07:00
commit 53529cd031
5 changed files with 8 additions and 4 deletions

View File

@ -126,6 +126,7 @@ Called from: src/static/js/pad.js
Things in context:
1. ace - the ace object that is applied to this editor.
2. pad - the pad object of the current pad.
There doesn't appear to be any example available of this particular hook being used, but it gets fired after the editor is all set up.

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;
}

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;
}
},

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()

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();
}
}