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

db/ReadOnlyManager.js: completed conversion

Browse source 
Requires temporary hack within `Pad.remove()` to allow for the lack of
callback on the rewritten version.
This commit is contained in:
Ray Bellis 2019-01-30 16:19:51 +00:00
parent bb80325d2c
commit 5192a0c498
2 changed files with 30 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/node/db/Pad.js
View file

@ -19,6 +19,7 @@ var crypto = require("crypto");
var randomString = require("../utils/randomstring");
var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
const thenify = require("thenify").withCallback;
const nodeify = require("nodeify");
// serialization/deserialization attributes
var attributeBlackList = ["id"];
@ -621,7 +622,12 @@ Pad.prototype.remove = thenify(function remove(callback) {
// remove the readonly entries
function(callback) {
readOnlyManager.getReadOnlyId(padID, function(err, readonlyID) {
// @TODO - temporary until surrounding code is Promisified
function getReadOnlyId(padID, callback) {
return nodeify(readOnlyManager.getReadOnlyId(padID), callback);
}
getReadOnlyId(padID, function(err, readonlyID) {
if (ERR(err, callback)) return;
db.remove("pad2readonly:" + padID);