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

Merge branch 'soon' into staging

Browse Source
This commit is contained in:
ansuz 2017-11-21 17:02:59 +01:00
commit 2ff1a17ade
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/contacts/inner.js
View File

@ -9,6 +9,7 @@ define([
'/contacts/messenger-ui.js', '/contacts/messenger-ui.js',
'/common/sframe-messenger-inner.js', '/common/sframe-messenger-inner.js',
'/customize/messages.js', '/customize/messages.js',
'/common/common-interface.js',
'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
'less!/bower_components/components-font-awesome/css/font-awesome.min.css', 'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
@ -21,9 +22,10 @@ define([
nThen, nThen,
SFCommon, SFCommon,
h, h,
UI, MessengerUI,
Messenger, Messenger,
Messages Messages,
UI
) )
{ {
var APP = {}; var APP = {};
@ -73,7 +75,7 @@ define([
var messenger = Messenger.create(sFrameChan); var messenger = Messenger.create(sFrameChan);
UI.create(messenger, $(friendList), $(messaging), common); MessengerUI.create(messenger, $(friendList), $(messaging), common);
UI.removeLoadingScreen(); UI.removeLoadingScreen();

6
www/drive/inner.js
View File

@ -2695,8 +2695,10 @@ define([
} }
else if ($(this).hasClass("cp-app-drive-context-newdoc")) { else if ($(this).hasClass("cp-app-drive-context-newdoc")) {
var type = $(this).data('type') || 'pad'; var type = $(this).data('type') || 'pad';
sessionStorage[Cryptpad.newPadPathKey] = filesOp.isPathIn(currentPath, [TRASH]) ? '' : currentPath; var path2 = filesOp.isPathIn(currentPath, [TRASH]) ? '' : currentPath;
window.open(APP.origin + '/' + type + '/'); common.sessionStorage.put(Cryptpad.newPadPathKey, path2, function () {
common.openURL('/' + type + '/');
});
} }
APP.hideMenu(); APP.hideMenu();
}); });

2
www/todo/inner.js
View File

@ -186,8 +186,6 @@ define([
}; };
var onInit = function () { var onInit = function () {
UI.addLoadingScreen();
$body.on('dragover', function (e) { e.preventDefault(); }); $body.on('dragover', function (e) { e.preventDefault(); });
$body.on('drop', function (e) { e.preventDefault(); }); $body.on('drop', function (e) { e.preventDefault(); });