web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed poll which was not working with automated testing

Browse Source
This commit is contained in:
Caleb James DeLisle 2018-01-11 15:57:09 +01:00
parent 05ad38cfe1
commit 4808c8b374
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/poll/inner.js
View File

@ -967,7 +967,6 @@ define([
}); });
APP.$createRow = $('#cp-app-poll-create-option').click(function () { APP.$createRow = $('#cp-app-poll-create-option').click(function () {
var uncommittedCopy = { content: getUncommitted('row') }; var uncommittedCopy = { content: getUncommitted('row') };
console.log(uncommittedCopy);
mergeUncommitted(proxy, uncommittedCopy, true); mergeUncommitted(proxy, uncommittedCopy, true);
change(null, null, null, null, function() { change(null, null, null, null, function() {
var newId = APP.uncommitted.content.rowsOrder[0]; var newId = APP.uncommitted.content.rowsOrder[0];
@ -1111,7 +1110,7 @@ define([
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
$('#cp-app-poll-create-user').click(); $('#cp-app-poll-create-user').click();
setTimeout(waitFor()); setTimeout(waitFor());
}).nThen(function (waitFor) { }).nThen(function (/*waitFor*/) {
passIfOk(t); passIfOk(t);
}); });
}); });
@ -1257,6 +1256,7 @@ define([
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
common.getSframeChannel().onReady(waitFor()); common.getSframeChannel().onReady(waitFor());
}).nThen(function (/* waitFor */) { }).nThen(function (/* waitFor */) {
Test.registerInner(common.getSframeChannel());
var metadataMgr = common.getMetadataMgr(); var metadataMgr = common.getMetadataMgr();
APP.locked = APP.readOnly = metadataMgr.getPrivateData().readOnly; APP.locked = APP.readOnly = metadataMgr.getPrivateData().readOnly;
APP.loggedIn = common.isLoggedIn(); APP.loggedIn = common.isLoggedIn();