', {'class': 'cp-icons-name'})
+ .text(Messages.type[p]));
+ $element.attr('data-type', p);
+ $element.click(function () {
+ $modal.hide();
+ if ($advanced && $advanced.is(':checked')) {
+ common.sessionStorage.put(Constants.displayPadCreationScreen, true, function () {
+ common.openURL('/' + p + '/');
+ });
+ return;
+ }
+ common.sessionStorage.put(Constants.displayPadCreationScreen, "", function () {
+ common.openURL('/' + p + '/');
+ });
+ });
+ });
+
+
+ /*var $content = createNewPadIcons($modal, isInRoot);*/
+ $modal.find('.cp-modal').append($container).append($advancedContainer);
+ window.setTimeout(function () { $modal.show(); });
+ //addNewPadHandlers($modal, isInRoot);
+ };
UIElements.initFilePicker = function (common, cfg) {
var onSelect = cfg.onSelect || $.noop;
diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js
index b5fb42466..9e4b1160a 100644
--- a/www/common/sframe-app-framework.js
+++ b/www/common/sframe-app-framework.js
@@ -407,7 +407,7 @@ define([
var priv = common.getMetadataMgr().getPrivateData();
if (priv.isNewFile) {
var c = (priv.settings.general && priv.settings.general.creation) || {};
- if (c.skip) { return void common.createPad(c, waitFor()); }
+ if (c.skip && !priv.forceCreationScreen) { return void common.createPad(c, waitFor()); }
common.getPadCreationScreen(c, waitFor());
}
}).nThen(function (waitFor) {
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 31a29b623..3f9960085 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -148,6 +148,9 @@ define([
if (!parsed.type) { throw new Error(); }
var defaultTitle = Utils.Hash.getDefaultName(parsed);
var edPublic;
+ var forceCreationScreen = cfg.useCreationScreen &&
+ sessionStorage[Utils.Constants.displayPadCreationScreen];
+ delete sessionStorage[Utils.Constants.displayPadCreationScreen];
var updateMeta = function () {
//console.log('EV_METADATA_UPDATE');
var metaObj, isTemplate;
@@ -182,7 +185,8 @@ define([
upgradeURL: Cryptpad.upgradeURL
},
isNewFile: isNewFile,
- isDeleted: window.location.hash.length > 0
+ isDeleted: window.location.hash.length > 0,
+ forceCreationScreen: forceCreationScreen
};
for (var k in additionalPriv) { metaObj.priv[k] = additionalPriv[k]; }
diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index 103359da8..3899a0976 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -91,6 +91,7 @@ define([
funcs.createLanguageSelector = callWithCommon(UIElements.createLanguageSelector);
funcs.createMarkdownToolbar = callWithCommon(UIElements.createMarkdownToolbar);
funcs.getPadCreationScreen = callWithCommon(UIElements.getPadCreationScreen);
+ funcs.createNewPadModal = callWithCommon(UIElements.createNewPadModal);
// Thumb
funcs.displayThumbnail = callWithCommon(Thumb.displayThumbnail);
diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index 52b414194..c8aa2f901 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -933,6 +933,21 @@ define([
content: $('').append(UI.getIcon(p)).html() + Messages.type[p]
});
});
+ if (Config.displayCreationScreen) {
+ pads_options.push({
+ tag: 'a',
+ attributes: {
+ id: 'cp-app-toolbar-creation-advanced',
+ href: origin
+ },
+ content: ' ' + Messages.creation_appMenuName
+ });
+ $(window).keydown(function (e) {
+ if (e.which === 69 && e.ctrlKey) {
+ Common.createNewPadModal();
+ }
+ });
+ }
var dropdownConfig = {
text: '', // Button initial text
options: pads_options, // Entries displayed in the menu
@@ -945,6 +960,10 @@ define([
var $newPadBlock = UIElements.createDropdown(dropdownConfig);
$newPadBlock.find('button').attr('title', Messages.newButtonTitle);
$newPadBlock.find('button').addClass('fa fa-th');
+ $newPadBlock.find('#cp-app-toolbar-creation-advanced').click(function (e) {
+ e.preventDefault();
+ Common.createNewPadModal();
+ });
return $newPadBlock;
};
diff --git a/www/drive/app-drive.less b/www/drive/app-drive.less
index 259e63f56..4c0ff9723 100644
--- a/www/drive/app-drive.less
+++ b/www/drive/app-drive.less
@@ -664,6 +664,10 @@ span {
}
}
+ .cp-app-drive-new-name {
+ white-space: nowrap;
+ }
+
@media screen and (max-height: @browser_media-not-big) {
.cp-modal {
& > p {
diff --git a/www/login/main.js b/www/login/main.js
index 24f0e905a..408203d9b 100644
--- a/www/login/main.js
+++ b/www/login/main.js
@@ -6,9 +6,10 @@ define([
'/common/common-realtime.js',
'/common/common-feedback.js',
'/common/outer/local-store.js',
+ '/common/test.js',
'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
-], function ($, Cryptpad, Login, UI, Realtime, Feedback, LocalStore) {
+], function ($, Cryptpad, Login, UI, Realtime, Feedback, LocalStore, Test) {
$(function () {
var $main = $('#mainBlock');
var Messages = Cryptpad.Messages;
@@ -53,6 +54,7 @@ define([
});
var hashing = false;
+ var test;
$('button.login').click(function () {
if (hashing) { return void console.log("hashing is already in progress"); }
@@ -89,6 +91,11 @@ define([
Realtime.whenRealtimeSyncs(result.realtime, function() {
LocalStore.login(result.userHash, result.userName, function () {
hashing = false;
+ if (test) {
+ localStorage.clear();
+ test.pass();
+ return;
+ }
if (sessionStorage.redirectTo) {
var h = sessionStorage.redirectTo;
var parser = document.createElement('a');
@@ -145,5 +152,12 @@ define([
}
window.location.href = '/register/';
});
+
+ Test(function (t) {
+ $uname.val('testuser');
+ $passwd.val('testtest');
+ test = t;
+ $('button.login').click();
+ });
});
});
diff --git a/www/pad/app-pad.less b/www/pad/app-pad.less
index ffa9fd5c9..742163285 100644
--- a/www/pad/app-pad.less
+++ b/www/pad/app-pad.less
@@ -16,8 +16,9 @@
display: flex;
}
#cke_1_toolbox {
- display: inline-block;
+ display: inline-flex;
width: 100%;
+ flex-flow: column;
background-color: @colortheme_pad-toolbar-bg;
}
#cke_1_toolbox .cke_toolbar {
diff --git a/www/poll/inner.js b/www/poll/inner.js
index 139ced8b4..ccddcef19 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -13,7 +13,6 @@ define([
'/common/diffMarked.js',
'/common/sframe-common-codemirror.js',
'/common/common-thumbnail.js',
- '/bower_components/chainpad/chainpad.dist.js',
'/common/common-interface.js',
'/customize/messages.js',
'cm/lib/codemirror',
@@ -43,7 +42,6 @@ define([
DiffMd,
SframeCM,
Thumb,
- ChainPad,
UI,
Messages,
CMeditor,
@@ -1110,6 +1108,8 @@ define([
}).nThen(function (waitFor) {
$('#cp-app-poll-create-user').click();
setTimeout(waitFor());
+ }).nThen(function (waitFor) {
+ APP.rt.realtime.onSettle(waitFor());
}).nThen(function (/*waitFor*/) {
passIfOk(t);
});
diff --git a/www/register/main.js b/www/register/main.js
index a6c31509f..172eaf8cc 100644
--- a/www/register/main.js
+++ b/www/register/main.js
@@ -54,11 +54,8 @@ define([
var $register = $('button#register');
var registering = false;
+ var test;
var logMeIn = function (result) {
- if (Test.testing) {
- Test.passed();
- return;
- }
LocalStore.setUserHash(result.userHash);
var proxy = result.proxy;
@@ -72,6 +69,11 @@ define([
Realtime.whenRealtimeSyncs(result.realtime, function () {
LocalStore.login(result.userHash, result.userName, function () {
registering = false;
+ if (test) {
+ localStorage.clear();
+ test.pass();
+ return;
+ }
if (sessionStorage.redirectTo) {
var h = sessionStorage.redirectTo;
var parser = document.createElement('a');
@@ -236,8 +238,9 @@ define([
}
});
- Test(function () {
- $uname.val('test' + Math.random());
+ Test(function (t) {
+ test = t;
+ $uname.val('testuser');
$passwd.val('testtest');
$confirm.val('testtest');
$checkImport[0].checked = true;
diff --git a/www/settings/app-settings.less b/www/settings/app-settings.less
index b6fec0158..187b75da8 100644
--- a/www/settings/app-settings.less
+++ b/www/settings/app-settings.less
@@ -98,7 +98,6 @@
}
}
.fa {
- display: none;
margin-left: 50px;
}
}
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 22d4b4be5..9190686c7 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -9,6 +9,7 @@ define([
'/common/common-hash.js',
'/customize/messages.js',
'/common/hyperscript.js',
+ '/customize/application_config.js',
'/bower_components/file-saver/FileSaver.min.js',
'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
@@ -24,7 +25,8 @@ define([
Util,
Hash,
Messages,
- h
+ h,
+ AppConfig
)
{
var saveAs = window.saveAs;
@@ -65,6 +67,10 @@ define([
]
};
+ if (!AppConfig.dislayCreationScreen) {
+ delete categories.creation;
+ }
+
var create = {};
// Account settings
@@ -326,8 +332,8 @@ define([
var $owned = $(owned);
- var $ok = $owned.find('.fa-check');
- var $spinner = $owned.find('.fa-spinner');
+ var $ok = $owned.find('.fa-check').hide();
+ var $spinner = $owned.find('.fa-spinner').hide();
$owned.find('input').change(function () {
$spinner.show();
@@ -392,8 +398,8 @@ define([
var $expire = $(expire);
- var $ok = $expire.find('.fa-check');
- var $spinner = $expire.find('.fa-spinner');
+ var $ok = $expire.find('.fa-check').hide();
+ var $spinner = $expire.find('.fa-spinner').hide();
var getValue = function () {
if(!parseInt($expire.find('[name="cp-creation-expire"]:checked').val())) { return 0; }
@@ -447,8 +453,8 @@ define([
var $div = $(skip);
- var $ok = $div.find('.fa-check');
- var $spinner = $div.find('.fa-spinner');
+ var $ok = $div.find('.fa-check').hide();
+ var $spinner = $div.find('.fa-spinner').hide();
$div.find('input').change(function () {
$spinner.show();
@@ -504,8 +510,8 @@ define([
var $div = $(skip);
- var $ok = $div.find('.fa-check');
- var $spinner = $div.find('.fa-spinner');
+ var $ok = $div.find('.fa-check').hide();
+ var $spinner = $div.find('.fa-spinner').hide();
$div.find('input').change(function () {
$spinner.show();