dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

This commit is contained in:
ansuz 2017-04-28 13:57:50 +02:00
parent 4d48c88807 0ef1c14d7f
commit e7c4c37130
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/common/cryptpad-common.js
View File

@ -574,7 +574,7 @@ define([
getStore().pushData(data, function (e, state) { getStore().pushData(data, function (e, state) {
if (e) { if (e) {
if (e === 'E_OVER_LIMIT') { if (e === 'E_OVER_LIMIT') {
Cryptpad.alert(Messages.pinLimitNotPinned, null, true); common.alert(Messages.pinLimitNotPinned, null, true);
return; return;
} }
else { throw new Error("Cannot push this pad to CryptDrive", e); } else { throw new Error("Cannot push this pad to CryptDrive", e); }
@ -722,6 +722,7 @@ define([
}; };
var isOverPinLimit = common.isOverPinLimit = function (cb) { var isOverPinLimit = common.isOverPinLimit = function (cb) {
var usage;
var andThen = function (e, limit) { var andThen = function (e, limit) {
if (e) { return void cb(e); } if (e) { return void cb(e); }
if (usage > limit) { if (usage > limit) {

1
www/common/userObject.js
View File

@ -437,7 +437,6 @@ define([
if (!Cryptpad.isLoggedIn() || !AppConfig.enablePinning) { todo(); } if (!Cryptpad.isLoggedIn() || !AppConfig.enablePinning) { todo(); }
Cryptpad.pinPads([Cryptpad.hrefToHexChannelId(data.href)], function (e, hash) { Cryptpad.pinPads([Cryptpad.hrefToHexChannelId(data.href)], function (e, hash) {
if (e) { return void cb(e); } if (e) { return void cb(e); }
cb('E_OVER_LIMIT'); return; //TODO
todo(); todo();
}); });
}; };

2
www/drive/main.js
View File

@ -290,7 +290,7 @@ define([
sel.down = true; sel.down = true;
if (!e.ctrlKey) { removeSelected(); } if (!e.ctrlKey) { removeSelected(); }
var rect = e.currentTarget.getBoundingClientRect(); var rect = e.currentTarget.getBoundingClientRect();
sel.startX = e.clientX - rect.left, sel.startX = e.clientX - rect.left;
sel.startY = e.clientY - rect.top + $content.scrollTop(); sel.startY = e.clientY - rect.top + $content.scrollTop();
sel.$selectBox.show().css({ sel.$selectBox.show().css({
left: sel.startX + 'px', left: sel.startX + 'px',