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

Merge branch 'develop' of github.com:ether/etherpad-lite into develop

This commit is contained in:
John McLear 2013-01-20 13:43:14 +00:00
parent 37c55effd6 b282547dbf
commit 280359a36d
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/node/db/API.js
View File

@ -46,7 +46,7 @@ exports.createGroupPad = groupManager.createGroupPad;
/**PADLIST FUNCTION****/ /**PADLIST FUNCTION****/
/**********************/ /**********************/
exports.listAllPads = padManager.getPads; exports.listAllPads = padManager.listAllPads;
/**********************/ /**********************/
/**AUTHOR FUNCTIONS****/ /**AUTHOR FUNCTIONS****/

6
src/node/db/PadManager.js
View File

@ -158,12 +158,12 @@ exports.getPad = function(id, text, callback)
} }
} }
exports.getPads = function(callback) exports.listAllPads = function(callback)
{ {
if(callback != null){ if(callback != null){
callback(null,padList.getPads()); callback(null,{padIDs: padList.getPads()});
}else{ }else{
return padList.getPads(); return {padIDs: padList.getPads()};
} }
} }

2
src/package.json
View File

@ -16,7 +16,7 @@
"require-kernel" : "1.0.5", "require-kernel" : "1.0.5",
"resolve" : "0.2.x", "resolve" : "0.2.x",
"socket.io" : "0.9.x", "socket.io" : "0.9.x",
"ueberDB" : "0.1.x", "ueberDB" : "0.1.9",
"async" : "0.1.x", "async" : "0.1.x",
"express" : "3.x", "express" : "3.x",
"connect" : "2.4.x", "connect" : "2.4.x",

2
src/templates/pad.html
View File

@ -153,6 +153,7 @@
</div> </div>
<div id="users"> <div id="users">
<% e.begin_block("userlist"); %>
<div id="connectionstatus"></div> <div id="connectionstatus"></div>
<div id="myuser"> <div id="myuser">
<div id="mycolorpicker"> <div id="mycolorpicker">
@ -173,6 +174,7 @@
<div id="nootherusers"></div> <div id="nootherusers"></div>
</div> </div>
<div id="userlistbuttonarea"></div> <div id="userlistbuttonarea"></div>
<% e.end_block(); %>
</div> </div>
<div id="editorcontainerbox"> <div id="editorcontainerbox">