infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Improve title and state toolbar in history and snapshot views

pull/1/head
yflory 2020-09-25 17:54:04 +02:00
parent ac4322cfab
commit 8d6fe7120f
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
customize.dist/src/less2/include/toolbar.less
View File

@ -663,6 +663,20 @@
display: inline-flex;
align-items: center;
}
&.cp-toolbar-unsync {
.cp-toolbar-title-edit, .cp-toolbar-title-save {
display: none !important;
}
.cp-toolbar-title-unsync {
display: inline-flex;
}
.cp-toolbar-title-editable, .cp-toolbar-title-edit {
border: none !important;
}
}
.cp-toolbar-title-unsync {
display: none;
}
.cp-toolbar-title-hoverable {
display: inline-flex;
overflow: hidden;

6
www/common/sframe-app-framework.js
View File

@ -162,6 +162,8 @@ define([
} else {
state = newState;
}
} else if (state === STATE.READY) {
// Refreshing ready state
}
switch (state) {
case STATE.DISCONNECTED:
@ -311,6 +313,7 @@ define([
};
var closeSnapshot = function (restore) {
if (restore && state !== STATE.READY) { return false; }
toolbar.setSnapshot(false);
setUnsyncMode(false); // Unlock onLocal and onRemote
if (restore) { onLocal(); } // Restore? commit the content
onRemote(); // Make sure we're back to the realtime content
@ -318,6 +321,7 @@ define([
};
var loadSnapshot = function (hash, data) {
setUnsyncMode(true);
toolbar.setSnapshot(true);
Snapshots.create(common, {
readOnly: readOnly,
$toolbar: $(toolbarContainer),
@ -326,10 +330,8 @@ define([
close: closeSnapshot,
applyVal: function (val) {
var newContent = JSON.parse(val);
/*
var meta = extractMetadata(newContent);
cpNfInner.metadataMgr.updateMetadata(meta);
*/
contentUpdate(normalize(newContent) || ["BODY",{},[]], function (h) {
return h;
});

14
www/common/toolbar.js
View File

@ -661,6 +661,8 @@ MessengerUI, Messages) {
.text('('+Messages.readonly+')'));
return $titleContainer;
}
$hoverable.append($('<span>', {'class': 'cp-toolbar-title-readonly cp-toolbar-title-unsync'})
.text('('+Messages.readonly+')'));
var $input = $('<input>', {
type: 'text',
placeholder: placeholder
@ -1348,10 +1350,22 @@ MessengerUI, Messages) {
}
};
toolbar.setSnapshot = function (bool) {
toolbar.history = bool;
toolbar.title.toggleClass('cp-toolbar-unsync', bool);
if (bool && toolbar.spinner) {
toolbar.spinner.text("SNAPSHOT"); // XXX
} else {
kickSpinner(toolbar, config);
}
};
toolbar.setHistory = function (bool) {
toolbar.history = bool;
toolbar.title.toggleClass('cp-toolbar-unsync', bool);
if (bool && toolbar.spinner) {
toolbar.spinner.text("HISTORY"); // XXX
} else {
kickSpinner(toolbar, config);
}
};