mirror of https://github.com/xwiki-labs/cryptpad
Fix autostore not displaying the error message when over pin limit
This commit is contained in:
parent
c1ef8243a1
commit
179df27e3c
|
@ -113,6 +113,7 @@
|
|||
padding: 5px;
|
||||
color: @colortheme_base;
|
||||
margin-left: 5px;
|
||||
outline: none;
|
||||
&.cp-corner-primary {
|
||||
background-color: @corner-button-ok;
|
||||
font-weight: bold;
|
||||
|
|
|
@ -2396,13 +2396,16 @@ define([
|
|||
modal.delete();
|
||||
});
|
||||
$(store).click(function () {
|
||||
UIElements.displayCrowdfunding(common);
|
||||
modal.delete();
|
||||
common.getSframeChannel().query("Q_AUTOSTORE_STORE", null, function (err, obj) {
|
||||
if (err || (obj && obj.error)) {
|
||||
console.error(err || obj.error);
|
||||
var error = err || (obj && obj.error);
|
||||
if (error) {
|
||||
if (error === 'E_OVER_LIMIT') {
|
||||
return void UI.warn(Messages.pinLimitReached);
|
||||
}
|
||||
return void UI.warn(Messages.autostore_error);
|
||||
}
|
||||
modal.delete();
|
||||
UIElements.displayCrowdfunding(common);
|
||||
UI.log(Messages.autostore_saved);
|
||||
});
|
||||
});
|
||||
|
|
|
@ -345,6 +345,9 @@ define([
|
|||
};
|
||||
common.getPadAttribute = function (attr, cb, href) {
|
||||
href = Hash.getRelativeHref(href || window.location.href);
|
||||
if (!href) {
|
||||
return void cb('E404');
|
||||
}
|
||||
postMessage("GET_PAD_ATTRIBUTE", {
|
||||
href: href,
|
||||
attr: attr,
|
||||
|
|
|
@ -465,7 +465,7 @@ define([
|
|||
if (data.password) { pad.password = data.password; }
|
||||
if (data.channel) { pad.channel = data.channel; }
|
||||
store.manager.addPad(data.path, pad, function (e) {
|
||||
if (e) { return void cb({error: "Error while adding the pad:"+ e}); }
|
||||
if (e) { return void cb({error: e}); }
|
||||
sendDriveEvent('DRIVE_CHANGE', {
|
||||
path: ['drive', UserObject.FILES_DATA]
|
||||
}, clientId);
|
||||
|
|
|
@ -371,7 +371,7 @@ define([
|
|||
forceSave: true
|
||||
};
|
||||
Cryptpad.setPadTitle(data, function (err) {
|
||||
cb(err);
|
||||
cb({error: err});
|
||||
});
|
||||
});
|
||||
sframeChan.on('Q_IS_PAD_STORED', function (data, cb) {
|
||||
|
|
|
@ -107,6 +107,7 @@
|
|||
.cp-app-slide-viewer {
|
||||
width: 50vw;
|
||||
overflow: hidden;
|
||||
z-index: 998;
|
||||
div#cp-app-slide-modal:not(.cp-app-slide-shown) {
|
||||
position: relative;
|
||||
top: auto;
|
||||
|
@ -417,4 +418,4 @@
|
|||
pre.cp-slide-css-error {
|
||||
color: white;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue