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

Move base64 migration prompt to corner and only when the pad is stored

Browse Source
This commit is contained in:
yflory
2018-08-30 11:21:33 +02:00
parent 7b06626581
commit 264f7dc6a1
5 changed files with 46 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
www/common/common-interface.js
View File

@@ -879,7 +879,9 @@ define([
UI.createRadio = Pages.createRadio;
UI.cornerPopup = function (text, actions, footer, startHidden) {
UI.cornerPopup = function (text, actions, footer, opts) {
opts = opts || {};
var minimize = h('div.cp-corner-minimize.fa.fa-window-minimize');
var maximize = h('div.cp-corner-maximize.fa.fa-window-maximize');
var popup = h('div.cp-corner-container', [
@@ -902,9 +904,12 @@ define([
$(popup).removeClass('cp-minimized');
});
if (startHidden) {
if (opts.hidden) {
$(popup).addClass('cp-minimized');
}
if (opts.big) {
$(popup).addClass('cp-corner-big');
}
var hide = function () {
$(popup).hide();

7
www/common/common-ui-elements.js
View File

@@ -2335,13 +2335,10 @@ define([
var hide = h('button.cp-corner-cancel', Messages.autostore_hide);
var store = h('button.cp-corner-primary', Messages.autostore_store);
var actions = h('div', [
store,
hide,
]);
var actions = h('div', [store, hide]);
var initialHide = data && data.autoStore && data.autoStore === -1;
var modal = UI.cornerPopup(text, actions, footer, initialHide);
var modal = UI.cornerPopup(text, actions, footer, {hidden: initialHide});
$(modal.popup).find('.cp-corner-footer a').click(function (e) {
e.preventDefault();