mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-14 11:06:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 59

Merge 858d8e6e71 into 96989e63c7

Browse source
This commit is contained in:
Jordan Hollinger 2013-01-18 08:15:27 -08:00
commit 83a3fdbab0
2 changed files with 4 additions and 4 deletions
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()};
} }
} }