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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
yflory
2017-06-29 15:21:09 +02:00
parent 56a25e1036 4a5f5de78c
commit 7a87775372
23 changed files with 88 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/drive/index.html
View File

@@ -4,7 +4,7 @@
<title>CryptDrive</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
<script data-bootload="/customize/template.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
<script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.1.15"></script>
<style>
html, body {
margin: 0px;

4
www/drive/inner.html
View File

@@ -3,9 +3,9 @@
<head>
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
<script src="/bower_components/jquery/dist/jquery.min.js"></script>
<script data-bootload="/drive/inner.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
<script async data-bootload="/drive/inner.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.1.15"></script>
</head>
<body>
<body style="display: none;">
<div id="toolbar" class="toolbar-container"></div>
<div class="app-container" tabindex="0">
<div id="tree">

6
www/drive/main.js
View File

@@ -1346,6 +1346,7 @@ define([
setViewMode('list');
$iframe.find('#' + FOLDER_CONTENT_ID).removeClass('grid');
$iframe.find('#' + FOLDER_CONTENT_ID).addClass('list');
Cryptpad.feedback('DRIVE_LIST_MODE');
});
$gridButton.click(function () {
$listButton.removeClass('active');
@@ -1353,6 +1354,7 @@ define([
setViewMode('grid');
$iframe.find('#' + FOLDER_CONTENT_ID).addClass('grid');
$iframe.find('#' + FOLDER_CONTENT_ID).removeClass('list');
Cryptpad.feedback('DRIVE_GRID_MODE');
});
if (getViewMode() === 'list') {
@@ -1405,7 +1407,8 @@ define([
var dropdownConfig = {
text: $plusIcon.html() + '<span>'+Messages.fm_newButton+'</span>',
options: options
options: options,
feedback: 'DRIVE_NEWPAD_LOCALFOLDER',
};
var $block = Cryptpad.createDropdown(dropdownConfig);
@@ -2771,6 +2774,7 @@ define([
Cryptpad.onDisplayNameChanged(setName);
};
var onReady = function () {
APP.$iframe.find('body').css('display', '');
module.files = proxy;
if (!proxy.drive || typeof(proxy.drive) !== 'object') { proxy.drive = {}; }
migrateAnonDrive(proxy, function () {