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

New pad creation screen

Browse Source
pull/1/head
yflory 7 years ago
parent 7c99397e60
commit c9ed6d6bf8
14 changed files with 535 additions and 269 deletions
Show Stats Download Patch File Download Diff File

7
customize.dist/pages.js
Unescape Escape View File

@ -384,7 +384,8 @@ define([
var item = faq[c][q]; var item = faq[c][q];
if (typeof item !== "object") { return; } if (typeof item !== "object") { return; }
var answer = h('p.cp-faq-questions-a'); var answer = h('p.cp-faq-questions-a');
var question = h('p.cp-faq-questions-q'); var hash = c + '-' + q;
var question = h('p.cp-faq-questions-q#' + hash);
$(question).click(function () { $(question).click(function () {
if ($(answer).is(':visible')) { if ($(answer).is(':visible')) {
return void $(answer).slideUp(); return void $(answer).slideUp();
@ -401,6 +402,10 @@ define([
h('div.cp-faq-category-questions', questions) h('div.cp-faq-category-questions', questions)
])); ]));
}); });
var hash = window.location.hash;
if (hash) {
$(categories).find(hash).click();
}
return h('div#cp-main', [ return h('div#cp-main', [
infopageTopbar(), infopageTopbar(),
h('div.container.cp-container', [ h('div.container.cp-container', [

67
customize.dist/src/less2/include/checkmark.less
Unescape Escape View File

@ -0,0 +1,67 @@
@import (once) "./colortheme-all.less";
.checkmark_main(@size) {
@width: round(@size / 8);
@dim1: round(@size / 3);
@dim2: round(2 * @size / 3);
@top: round(@size / 12);
// <label.cp-checkmark><input><span.cp-checkmark-mark></span>Text</label>
.cp-checkmark {
margin: 0;
display: flex;
align-items: center;
position: relative;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
&.cp-checkmark-secondary {
.cp-checkmark-mark {
&:after {
border-color: @colortheme_checkmark-col2;
}
}
input {
&:checked ~ .cp-checkmark-mark {
background-color: @colortheme_checkmark-back2;
}
}
}
&:hover .cp-checkmark-mark {
background-color: @colortheme_checkmark-back0-active;
}
input {
display: none;
&:checked ~ .cp-checkmark-mark {
background-color: @colortheme_checkmark-back1;
&:after {
display: block;
}
}
}
.cp-checkmark-mark {
margin-right: 10px;
position: relative;
height: @size;
width: @size;
background-color: @colortheme_checkmark-back0;
display: flex;
justify-content: center;
&:after {
content: "";
display: none;
margin-top: @top;
width: @dim1;
height: @dim2;
transform: rotate(45deg);
border: solid @colortheme_checkmark-col1;
border-width: 0 @width @width 0;
}
}
}
}

7
customize.dist/src/less2/include/colortheme.less
Unescape Escape View File

@ -109,3 +109,10 @@
@cryptpad_color_grey: #999999; @cryptpad_color_grey: #999999;
@cryptpad_header_col: #1E1F1F; @cryptpad_header_col: #1E1F1F;
@cryptpad_text_col: #3F4141; @cryptpad_text_col: #3F4141;
@colortheme_checkmark-back0: #ffffff;
@colortheme_checkmark-back0-active: #bbbbbb;
@colortheme_checkmark-back1: #FF0073;
@colortheme_checkmark-col1: #ffffff;
@colortheme_checkmark-back2: #FFFFFF;
@colortheme_checkmark-col2: #000000;

288
customize.dist/src/less2/include/creation.less
Unescape Escape View File

@ -1,5 +1,7 @@
@import (once) "./colortheme-all.less"; @import (once) "./colortheme-all.less";
@import (once) "./tools.less"; @import (once) "./tools.less";
@import (once) "./checkmark.less";
@import (once) './icon-colors.less';
.creation_main() { .creation_main() {
.tippy-popper { .tippy-popper {
@ -31,149 +33,211 @@
max-width: 100%; max-width: 100%;
margin: 40px auto; margin: 40px auto;
text-align: left; text-align: left;
display: flex;
flex-wrap: wrap;
justify-content: center;
align-items: center;
h2 {
width: 100%;
display: flex;
margin-bottom: 20px;
justify-content: space-between;
.cp-creation-help {
display: none;
}
}
.cp-creation-help-container {
width: 100%;
display: flex;
justify-content: space-between;
p {
padding: 0 20px;
flex-grow: 0;
flex-shrink: 0;
flex-basis: 50%;
text-align: justify;
}
}
@media screen and (max-width: 500px) {
width: ~"calc(100% - 30px)";
}
@media screen and (max-height: 800px), screen and (max-width: 500px) {
h2 .cp-creation-help {
display: inline;
}
.cp-creation-help-container {
display: none;
}
}
@media screen and (min-height: 601px) {
@media screen and (min-width: 501px) {
p {
display: block !important;
}
}
}
} }
.cp-creation-create, .cp-creation-settings { .cp-creation-create, .cp-creation-settings {
@creation-button: #FF0073;
button { button {
.tools_unselectable(); .tools_unselectable();
padding: 15px; padding: 15px;
background: darken(@colortheme_loading-bg, 10%); //background: @creation-button;
background: spin(@colortheme_loading-bg, 180);
background: #60ff6b;
background: #30b239;
color: @colortheme_loading-color; color: @colortheme_loading-color;
color: spin(#60ff6b, 180);
color: #000;
color: #FFF;
font-weight: bold;
margin: 3px 10px; margin: 3px 10px;
border: none; border: none;
cursor: pointer; cursor: pointer;
outline: none; outline: none;
&:hover { &:hover {
background: darken(@colortheme_loading-bg, 5%); background: darken(@creation-button, 5%);
}
&.cp-creation-button-selected {
color: darken(@colortheme_loading-bg, 10%);
background: @colortheme_loading-color;
} }
} }
} }
.cp-creation-create {
text-align: center;
}
input[type="radio"] { #cp-creation-form {
display: none; display: flex;
&:checked { flex-flow: column;
& + label { align-items: center;
font-weight: bold; & > div {
background-color: lighten(@colortheme_loading-bg, 20%); width: 400px;
cursor: default; max-width: 100%;
border: 1px solid #c1158e; display: flex;
&:hover { align-items: center;
background-color: lighten(@colortheme_loading-bg, 20%); flex-wrap: wrap;
font-size: 16px;
margin: 10px 0;
label {
flex: 1;
}
input[type="checkbox"] {
&+ label {
margin-bottom: 0;
flex: 1;
padding: 0 10px;
} }
} }
} .cp-creation-help {
} font-size: 18px;
input[type="radio"] + label { color: white;
.tools_unselectable(); &:hover {
display: inline-flex; color: #AAA;
align-items: center; text-decoration: none;
justify-content: center;
width: 200px;
height: 50px;
padding: 5px;
margin: 0 20px;
border: 1px solid @colortheme_loading-color;
cursor: pointer;
&:hover {
background-color: lighten(@colortheme_loading-bg, 10%);
}
}
.cp-creation-expire {
#cp-creation-expire-true {
display: none;
&:checked {
& + label {
height: 100px;
.cp-creation-expire-picker {
display: inline;
}
} }
} }
} }
label[for="cp-creation-expire-true"] { .cp-creation-expire {
flex-wrap: wrap;
.cp-creation-expire-picker { .cp-creation-expire-picker {
display: none; display: block;
overflow: hidden;
max-height: 0px;
transition: max-height 0.5s ease-in-out;
width: 100%;
text-align: center;
margin-top: 10px;
input {
width: 100px;
}
} }
input { .cp-creation-expire-picker.active {
width: 70px; max-height: 40px;
} }
select { }
width: 100px; .cp-creation-settings {
button {
margin: 0;
padding: 0;
} }
input, select { .cp-filler { flex: 1; }
border: none; }
height: 30px;
background: @colortheme_loading-bg; div.cp-creation-template {
color: @colortheme_loading-color; width: 100%;
border-radius: 3px; background-color: darken(@colortheme_modal-bg, 3%);
padding: 20px;
margin: 30px 0;
}
.cp-creation-template-container {
width: 100%;
display: flex;
flex-wrap: wrap;
justify-content: center;
overflow-y: auto;
align-items: center;
.cp-creation-template-element {
@darker: darken(@colortheme_modal-fg, 30%);
width: 125px;
padding: 10px;
margin: 5px;
display: inline-flex;
flex-flow: column;
box-sizing: content-box;
text-align: left;
line-height: 1em;
cursor: pointer;
background-color: #111;
color: @darker;
border: 1px solid transparent;
&.cp-creation-template-selected {
border: 1px solid white;
background-color: #222;
}
transition: all 0.1s;
&:hover {
color: @colortheme_modal-fg;
}
align-items: center;
img {
max-width: 100px;
max-height: 100px;
background: #fff;
}
.cp-creation-template-element-name {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 20px;
line-height: 20px;
margin-top: 5px;
max-width: 100%;
}
.fa {
cursor: pointer;
width: 100px;
height: 100px;
font-size: 70px;
text-align: center;
line-height: 100px;
}
} }
} }
} }
.cp-creation-settings {
justify-content: left; .cp-creation-deleted-container {
a { text-align: center;
color: #0275d8; .cp-creation-deleted {
&:hover { background: #111;
color: lighten(#0275d8, 10%); padding: 10px;
} text-align: center;
font-weight: bold;
display: inline-block;
} }
&> span.fa { }
margin-left: 15px;
.checkmark_main(30px);
@media screen and (max-width: @browser_media-narrow-screen) {
& > div {
width: 95%;
margin: 10px auto;
} }
} }
.cp-creation-deleted { @media screen and (max-width: @browser_media-medium-screen) {
background: #111; #cp-creation-form {
padding: 10px; div.cp-creation-template {
text-align: justify; margin: 0;
font-weight: bold; padding: 5px;
.cp-creation-template-container {
.cp-creation-template-element {
flex-flow: row;
margin: 1px;
padding: 5px;
img {
display: none;
}
.fa {
font-size: 18px;
width: 20px;
height: 20px;
line-height: 20px;
display: inline !important;
}
.cp-creation-template-element-name {
margin: 0;
margin-left: 5px;
}
}
}
}
}
} }
} }
} }

2
customize.dist/template.js
Unescape Escape View File

@ -108,6 +108,8 @@ $(function () {
require([ '/customize/main.js', ], function () {}); require([ '/customize/main.js', ], function () {});
} else if (/invite/.test(pathname)) { } else if (/invite/.test(pathname)) {
require([ '/invite/main.js'], function () {}); require([ '/invite/main.js'], function () {});
} else if (/faq/.test(pathname)) {
window.location.hash = window.location.hash;
} else { } else {
require([ '/customize/main.js', ], function () {}); require([ '/customize/main.js', ], function () {});
} }

5
www/common/common-interface.js
Unescape Escape View File

@ -638,9 +638,10 @@ define([
var $icon = UI.getIcon(); var $icon = UI.getIcon();
if (!data) { return $icon; } if (!data) { return $icon; }
var href = data.href; var href = data.href;
if (!href) { return $icon; } var type = data.type;
if (!href && !type) { return $icon; }
var type = Hash.parsePadUrl(href).type; if (!type) { type = Hash.parsePadUrl(href).type; }
$icon = UI.getIcon(type); $icon = UI.getIcon(type);
return $icon; return $icon;

3
www/common/common-thumbnail.js
Unescape Escape View File

@ -237,6 +237,9 @@ define([
$span.prepend(img); $span.prepend(img);
cb($(img)); cb($(img));
}; };
Thumb.addThumbnail = function(thumb, $span, cb) {
return addThumbnail(null, thumb, $span, cb);
};
var getKey = function (href) { var getKey = function (href) {
var parsed = Hash.parsePadUrl(href); var parsed = Hash.parsePadUrl(href);
return 'thumbnail-' + parsed.type + '-' + parsed.hashData.channel; return 'thumbnail-' + parsed.type + '-' + parsed.hashData.channel;

319
www/common/common-ui-elements.js
Unescape Escape View File

@ -1792,6 +1792,7 @@ define([
UIElements.setExpirationValue = function (val, $expire) { UIElements.setExpirationValue = function (val, $expire) {
if (val && typeof (val) === "number") { if (val && typeof (val) === "number") {
$expire.find('#cp-creation-expire').attr('checked', true).trigger('change');
$expire.find('#cp-creation-expire-true').attr('checked', true); $expire.find('#cp-creation-expire-true').attr('checked', true);
if (val % (3600 * 24 * 30) === 0) { if (val % (3600 * 24 * 30) === 0) {
$expire.find('#cp-creation-expire-unit').val("month"); $expire.find('#cp-creation-expire-unit').val("month");
@ -1828,16 +1829,21 @@ define([
}; };
// Title // Title
$creation.append(h('h1.cp-creation-title', Messages['button_new'+type])); $creation.append(h('h1.cp-creation-title', 'Create a new pad')); // XXX
// Deleted pad warning // Deleted pad warning
if (metadataMgr.getPrivateData().isDeleted) { if (metadataMgr.getPrivateData().isDeleted || true) { // XXX
$creation.append(h('div.cp-creation-deleted', Messages.creation_404)); $creation.append(h('div.cp-creation-deleted-container',
h('div.cp-creation-deleted', Messages.creation_404)
));
} }
var createHelper = function (text) { var origin = common.getMetadataMgr().getPrivateData().origin;
var q = h('span.cp-creation-help.fa.fa-question', { var createHelper = function (href, text) {
title: text var q = h('a.cp-creation-help.fa.fa-question', {
title: text,
href: origin + href,
target: "_blank"
}); });
return q; return q;
}; };
@ -1845,78 +1851,145 @@ define([
// Owned pads // Owned pads
// Default is Owned pad // Default is Owned pad
var owned = h('div.cp-creation-owned', [ var owned = h('div.cp-creation-owned', [
h('h2', [ h('label.cp-checkmark', [
Messages.creation_ownedTitle, h('input', {
createHelper(Messages.creation_owned1 + '\n' + Messages.creation_owned2) type: 'checkbox',
]), id: 'cp-creation-owned',
h('div.cp-creation-help-container', [ checked: 'checked'
setHTML(h('p'), Messages.creation_owned1), }),
setHTML(h('p'), Messages.creation_owned2) h('span.cp-checkmark-mark'),
]), 'Owned pad'
h('input#cp-creation-owned-true.cp-creation-owned-value', { ]), // XXX
type: 'radio', createHelper('/faq.html#keywords-owned', Messages.creation_owned1)
name: 'cp-creation-owned',
value: 1,
checked: 'checked'
}),
h('label', { 'for': 'cp-creation-owned-true' }, Messages.creation_ownedTrue),
h('input#cp-creation-owned-false.cp-creation-owned-value', {
type: 'radio',
name: 'cp-creation-owned',
value: 0
}),
h('label', { 'for': 'cp-creation-owned-false' }, Messages.creation_ownedFalse)
]); ]);
$creation.append(owned);
// If set to "open pad", check "open pad"
if (!cfg.owned && typeof cfg.owned !== "undefined") {
$creation.find('#cp-creation-owned-false').attr('checked', true);
}
// Life time // Life time
var expire = h('div.cp-creation-expire', [ var expire = h('div.cp-creation-expire', [
h('h2', [ //Messages.creation_ownedTitle,
Messages.creation_expireTitle, h('label.cp-checkmark', [
createHelper(Messages.creation_expire1, Messages.creation_expire2) h('input', {
]), type: 'checkbox',
h('div.cp-creation-help-container', [ id: 'cp-creation-expire'
setHTML(h('p'), Messages.creation_expire1), }),
setHTML(h('p'), Messages.creation_expire2) h('span.cp-checkmark-mark'),
]), 'Expiring pad'
h('input#cp-creation-expire-false.cp-creation-expire-value', { ]), // XXX
type: 'radio', createHelper('faq.html#keywords-expiring', Messages.creation_expire1),
name: 'cp-creation-expire', h('div.cp-creation-expire-picker', [
value: 0, h('input#cp-creation-expire-val', {
checked: 'checked' type: "number",
}), min: 1,
h('label', { 'for': 'cp-creation-expire-false' }, Messages.creation_expireFalse), max: 100,
h('input#cp-creation-expire-true.cp-creation-expire-value', { value: 3
type: 'radio', }),
name: 'cp-creation-expire', h('select#cp-creation-expire-unit', [
value: 1 h('option', { value: 'hour' }, Messages.creation_expireHours),
}), h('option', { value: 'day' }, Messages.creation_expireDays),
h('label', { 'for': 'cp-creation-expire-true' }, [ h('option', {
Messages.creation_expireTrue, value: 'month',
h('span.cp-creation-expire-picker', [ selected: 'selected'
h('input#cp-creation-expire-val', { }, Messages.creation_expireMonths)
type: "number",
min: 1,
max: 100,
value: 3
}),
h('select#cp-creation-expire-unit', [
h('option', { value: 'hour' }, Messages.creation_expireHours),
h('option', { value: 'day' }, Messages.creation_expireDays),
h('option', {
value: 'month',
selected: 'selected'
}, Messages.creation_expireMonths)
])
]) ])
]) ])
]); ]);
$creation.append(expire);
var templates = h('div.cp-creation-template', [
h('div.cp-creation-template-container', [
h('span.fa.fa-circle-o-notch.fa-spin.fa-4x.fa-fw')
])
]);
var settings = h('div.cp-creation-remember', [
h('label.cp-checkmark.cp-checkmark-secondary', [
h('input', {
type: 'checkbox',
id: 'cp-creation-remember',
checked: 'checked'
}),
h('span.cp-checkmark-mark'),
'Save settings'
]), // XXX
createHelper('/settings/#creation', "View more settings")
]);
$(h('div#cp-creation-form', [
owned,
expire,
templates,
settings
])).appendTo($creation);
// Display templates
var selected = 0;
sframeChan.query("Q_CREATE_TEMPLATES", type, function (err, res) {
if (!res.data || !Array.isArray(res.data)) {
return void console.error("Error: get the templates list");
}
var data = res.data.slice().sort(function (a, b) {
if (a.name === b.name) { return 0; }
return a.name < b.name ? -1 : 1;
});
data.unshift({
name: "No template",
id: 0,
icon: h('span.fa.fa-times')
});
data.push({
name: "New template",
id: -1,
icon: h('span.fa.fa-plus')
});
var $container = $(templates).find('.cp-creation-template-container').html('');
data.forEach(function (obj, idx) {
var name = obj.name;
var $span = $('<span>', {
'class': 'cp-creation-template-element',
'title': name,
}).appendTo($container);
console.log(obj.id);
$span.data('id', obj.id);
if (idx === 0) { $span.addClass('cp-creation-template-selected') }
$span.append(obj.icon || UI.getFileIcon({type: type}));
$('<span>', {'class': 'cp-creation-template-element-name'}).text(name)
.appendTo($span);
$span.click(function () {
$container.find('.cp-creation-template-selected')
.removeClass('cp-creation-template-selected');
$span.addClass('cp-creation-template-selected');
selected = idx;
});
// Add thumbnail if it exists
if (obj.thumbnail) {
common.addThumbnail(obj.thumbnail, $span, function () {});
}
});
});
// Change template selection when Tab is pressed
var next = function (revert) {
var max = $creation.find('.cp-creation-template-element').length;
selected = revert ?
(--selected < 0 ? max-1 : selected) :
++selected % max;
$creation.find('.cp-creation-template-element')
.removeClass('cp-creation-template-selected');
$($creation.find('.cp-creation-template-element').get(selected))
.addClass('cp-creation-template-selected');
};
// Display expiration form when checkbox checked
$creation.find('#cp-creation-expire').on('change', function () {
if ($(this).is(':checked')) {
$creation.find('.cp-creation-expire-picker:not(.active)').addClass('active');
$creation.find('#cp-creation-expire-val').focus();
return;
}
$creation.find('.cp-creation-expire-picker').removeClass('active');
$creation.focus();
});
// Keyboard shortcuts
$creation.find('#cp-creation-expire-val').keydown(function (e) { $creation.find('#cp-creation-expire-val').keydown(function (e) {
if (e.which === 9) { if (e.which === 9) {
e.stopPropagation(); e.stopPropagation();
@ -1928,15 +2001,20 @@ define([
} }
}); });
// Initial values
if (!cfg.owned && typeof cfg.owned !== "undefined") {
$creation.find('#cp-creation-owned').attr('checked', false);
}
UIElements.setExpirationValue(cfg.expire, $creation); UIElements.setExpirationValue(cfg.expire, $creation);
// Create the pad // Create the pad
var getFormValues = function (template) { var getFormValues = function (template) {
// Type of pad // Type of pad
var ownedVal = parseInt($('input[name="cp-creation-owned"]:checked').val()); var ownedVal = $('#cp-creation-owned').is(':checked') ? 1 : 0;
// Life time // Life time
var expireVal = 0; var expireVal = 0;
if(parseInt($('input[name="cp-creation-expire"]:checked').val())) { if($('#cp-creation-expire').is(':checked')) {
var unit = 0; var unit = 0;
switch ($('#cp-creation-expire-unit').val()) { switch ($('#cp-creation-expire-unit').val()) {
case "hour" : unit = 3600; break; case "hour" : unit = 3600; break;
@ -1947,62 +2025,45 @@ define([
expireVal = ($('#cp-creation-expire-val').val() || 0) * unit; expireVal = ($('#cp-creation-expire-val').val() || 0) * unit;
} }
var $template = $creation.find('.cp-creation-template-selected');
var template = $template.data('id') || undefined;
return { return {
owned: ownedVal, owned: ownedVal,
expire: expireVal, expire: expireVal,
template: template templateId: template
}; };
}; };
var create = function (template) { var create = function () {
$creationContainer.remove(); var val = getFormValues();
common.createPad(getFormValues(template), function () { if ($('#cp-creation-remember').is(':checked')) {
common.setAttribute(['general', 'creation', 'owned'],
val.owned, function (e) {
if (e) { return void console.error(e); }
});
common.setAttribute(['general', 'creation', 'expire'],
val.expire, function (e) {
if (e) { return void console.error(e); }
});
}
$creationContainer.remove();
common.createPad(val, function () {
cb(); cb();
}); });
}; };
var $create = $(h('div.cp-creation-create', [ var $create = $(h('div.cp-creation-create')).appendTo($creation);
h('h2', Messages.creation_createTitle)
])).appendTo($creation);
// Pick a template?
sframeChan.query("Q_TEMPLATE_EXIST", type, function (err, data) {
if (!data) { return; }
var $templateButton = $('<button>').text(Messages.creation_createFromTemplate)
.appendTo($create);
var pickerCfg = {
types: [type],
where: ['template'],
hidden: true
};
common.openFilePicker(pickerCfg);
$templateButton.click(function () {
// Show the template picker
delete pickerCfg.hidden;
common.openFilePicker(pickerCfg);
var first = true; // We can only pick a template once (for a new document)
var fileDialogCfg = {
onSelect: function (data) {
if (data.type === type && first) {
create(data.href);
first = false;
}
}
};
common.initFilePicker(fileDialogCfg);
});
});
var $button = $('<button>').text(Messages.creation_createFromScratch).appendTo($create); var $button = $('<button>').text('Create').appendTo($create);
$button.addClass('cp-creation-button-selected'); $button.addClass('cp-creation-button-selected');
$button.click(function () { $button.click(function () {
create(); create();
}); });
// Settings button // Save settings button
var origin = common.getMetadataMgr().getPrivateData().origin; /*var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved}).hide();
var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved}).hide();
var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'}).hide(); var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'}).hide();
var okTo; var okTo;
var $saveButton = $('<button>').text(Messages.creation_saveSettings).click(function () { var $saveButton = $('<button>').text(Messages.creation_saveSettings).click(function () {
@ -2025,35 +2086,29 @@ define([
}, 5000); }, 5000);
}); });
}); });
$(h('div.cp-creation-settings', [
$saveButton[0], var settings = h('div.cp-creation-settings', [
h('br'), h('button.cp-creation-settings-save', Messages.creation_saveSettings),
h('a', {
href: origin + '/settings/#creation',
target: '_blank'
}, Messages.creation_settings),
$ok[0], $ok[0],
$spinner[0] $spinner[0],
])).appendTo($creation); h('span.cp-filler'),
createHelper('/settings/#creation')
//h('a', {
// href: origin + '/settings/#creation',
// target: '_blank'
//}, Messages.creation_settings),
]);*/
var selected = 0;
var next = function () {
selected = ++selected % $creation.find('button').length;
$creation.find('button').removeClass('cp-creation-button-selected');
$($creation.find('button').get(selected)).addClass('cp-creation-button-selected');
};
$creation.keydown(function (e) { $creation.keydown(function (e) {
if (e.which === 9) { if (e.which === 9) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
next(); next(e.shiftKey);
return; return;
} }
if (e.which === 13) { if (e.which === 13) {
if ($creation.find('.cp-creation-button-selected').length === 1) { $button.click();
$creation.find('.cp-creation-button-selected').click();
}
return; return;
} }
}); });

18
www/common/cryptpad-common.js
Unescape Escape View File

@ -75,13 +75,7 @@ define([
cb(); cb();
}); });
}; };
// Settings and drive // Settings and drive and auth
common.getUserObject = function (cb) {
postMessage("GET", [], function (obj) {
cb(obj);
});
};
// Settings and auth
common.getUserObject = function (cb) { common.getUserObject = function (cb) {
postMessage("GET", [], function (obj) { postMessage("GET", [], function (obj) {
cb(obj); cb(obj);
@ -468,6 +462,16 @@ define([
cb(void 0, list); cb(void 0, list);
}); });
}; };
// Get a template href from its id
common.getPadData = function (id, cb) {
postMessage("GET_PAD_DATA", id, function (data) {
cb(void 0, data);
});
};
// Set initial path when creating a pad from pad creation screen
common.setInitialPath = function (path) {
postMessage("SET_INITIAL_PATH", path);
};
// Messaging (manage friends from the userlist) // Messaging (manage friends from the userlist)
common.inviteFromUserlist = function (netfluxId, cb) { common.inviteFromUserlist = function (netfluxId, cb) {

7
www/common/outer/async-store.js
Unescape Escape View File

@ -678,6 +678,13 @@ define([
}); });
cb(list); cb(list);
}; };
Store.getPadData = function (id, cb) {
cb(store.userObject.getFileData(id));
};
Store.setInitialPath = function (path) {
if (!store.data) { return; }
store.data.initialPath = path;
};
// Messaging (manage friends from the userlist) // Messaging (manage friends from the userlist)
var getMessagingCfg = function () { var getMessagingCfg = function () {

6
www/common/outer/store-rpc.js
Unescape Escape View File

@ -117,6 +117,12 @@ define([
case 'GET_SECURE_FILES_LIST': { case 'GET_SECURE_FILES_LIST': {
Store.getSecureFilesList(data, cb); break; Store.getSecureFilesList(data, cb); break;
} }
case 'GET_PAD_DATA': {
Store.getPadData(data, cb); break;
}
case 'SET_INITIAL_PATH': {
Store.setInitialPath(data); break;
}
case 'GET_STRONGER_HASH': { case 'GET_STRONGER_HASH': {
Store.getStrongerHash(data, cb); break; Store.getStrongerHash(data, cb); break;
} }

69
www/common/sframe-common-outer.js
Unescape Escape View File

@ -469,6 +469,35 @@ define([
cb(templates.length > 0); cb(templates.length > 0);
}); });
}); });
var getKey = function (href) {
var parsed = Utils.Hash.parsePadUrl(href);
return 'thumbnail-' + parsed.type + '-' + parsed.hashData.channel;
};
sframeChan.on('Q_CREATE_TEMPLATES', function (type, cb) {
Cryptpad.getSecureFilesList({
types: [type],
where: ['template']
}, function (err, data) {
// NOTE: Never return data directly!
if (err) { return void cb({error: err}); }
var res = [];
nThen(function (waitFor) {
Object.keys(data).map(function (el) {
var k = getKey(data[el].href);
Utils.LocalStore.getThumbnail(k, waitFor(function (e, thumb) {
res.push({
id: el,
name: data[el].filename || data[el].title || '?',
thumbnail: thumb
});
}));
});
}).nThen(function () {
cb({data: res});
});
});
});
sframeChan.on('EV_GOTO_URL', function (url) { sframeChan.on('EV_GOTO_URL', function (url) {
if (url) { if (url) {
@ -584,7 +613,7 @@ define([
var replaceHash = function (hash) { var replaceHash = function (hash) {
if (window.history && window.history.replaceState) { if (window.history && window.history.replaceState) {
if (!/^#/.test(hash)) { hash = '#' + hash; } if (!/^#/.test(hash)) { hash = '#' + hash; }
void window.history.replaceState({}, window.document.title, hash); window.history.replaceState({}, window.document.title, hash);
if (typeof(window.onhashchange) === 'function') { if (typeof(window.onhashchange) === 'function') {
window.onhashchange(); window.onhashchange();
} }
@ -646,19 +675,31 @@ define([
if (data.expire) { if (data.expire) {
rtConfig.expire = data.expire; rtConfig.expire = data.expire;
} }
if (data.template) { nThen(function(waitFor) {
// Pass rtConfig to useTemplate because Cryptput will create the file and if (data.templateId) {
// we need to have the owners and expiration time in the first line on the if (data.templateId === -1) {
// server Cryptpad.setInitialPath(['template']);
Cryptpad.useTemplate(data.template, Cryptget, function () { return;
startRealtime(); }
cb(); Cryptpad.getPadData(data.templateId, waitFor(function (err, d) {
}, rtConfig); data.template = d.href;
return; }));
} }
// Start realtime outside the iframe and callback }).nThen(function () {
startRealtime(rtConfig); if (data.template) {
cb(); // Pass rtConfig to useTemplate because Cryptput will create the file and
// we need to have the owners and expiration time in the first line on the
// server
Cryptpad.useTemplate(data.template, Cryptget, function () {
startRealtime();
cb();
}, rtConfig);
return;
}
// Start realtime outside the iframe and callback
startRealtime(rtConfig);
cb();
});
}); });
sframeChan.ready(); sframeChan.ready();

4
www/common/sframe-common.js
Unescape Escape View File

@ -97,6 +97,7 @@ define([
// Thumb // Thumb
funcs.displayThumbnail = callWithCommon(Thumb.displayThumbnail); funcs.displayThumbnail = callWithCommon(Thumb.displayThumbnail);
funcs.addThumbnail = Thumb.addThumbnail;
// History // History
funcs.getHistory = callWithCommon(History.create); funcs.getHistory = callWithCommon(History.create);
@ -196,7 +197,8 @@ define([
ctx.sframeChan.query("Q_CREATE_PAD", { ctx.sframeChan.query("Q_CREATE_PAD", {
owned: cfg.owned, owned: cfg.owned,
expire: cfg.expire, expire: cfg.expire,
template: cfg.template template: cfg.template,
templateId: cfg.templateId
}, cb); }, cb);
}; };

2
www/common/sframe-protocol.js
Unescape Escape View File

@ -220,6 +220,8 @@ define({
// Pad creation screen: create a pad with the selected attributes (owned, expire) // Pad creation screen: create a pad with the selected attributes (owned, expire)
'Q_CREATE_PAD': true, 'Q_CREATE_PAD': true,
// Get the available templates
'Q_CREATE_TEMPLATES': true,
// This is for sending data out of the iframe when we are in testing mode // This is for sending data out of the iframe when we are in testing mode
// The exact protocol is defined in common/test.js // The exact protocol is defined in common/test.js

Write Preview
Loading…
Cancel
Save