').append($shareIcon).html(),
+ options: options,
+ feedback: 'FILESHARE_MENU',
+ };
+ var $shareBlock = Cryptpad.createDropdown(dropdownConfigShare);
+ $shareBlock.find('.cp-dropdown-content').addClass(SHARE_CLS);
+ $shareBlock.addClass('cp-toolbar-share-button');
+ $shareBlock.find('button').attr('title', Messages.shareButton);
+
+ // Add handlers
+ $shareBlock.find('a.cp-toolbar-share-file-copy').click(function () {
var success = Cryptpad.Clipboard.copy(url);
if (success) { Cryptpad.log(Messages.shareSuccess); }
});
+ $shareBlock.find('a.cp-toolbar-share-file-embed').click(function () {
+ var $content = $('
');
+ $('
', {'style':'display:none;'}).appendTo($content);
+ $('
').text(Messages.fileEmbedTitle).appendTo($content);
+ var $script = $('
').text(Messages.fileEmbedScript).appendTo($content);
+ $('
').appendTo($script);
+ $script.append(Cryptpad.dialog.selectable(Common.getMediatagScript()));
+ var $tag = $('
').text(Messages.fileEmbedTag).appendTo($content);
+ $('
').appendTo($tag);
+ $tag.append(Cryptpad.dialog.selectable(Common.getMediatagFromHref(url)));
+ Cryptpad.alert($content[0], null, true);
+ });
- toolbar.$leftside.append($button);
- return $button;
+ toolbar.$leftside.append($shareBlock);
+ return $shareBlock;
};
var createTitle = function (toolbar, config) {
@@ -820,13 +858,13 @@ define([
$title.find('input').trigger(ev);
};
// Click in the main window
- var w = config.ifrw || window;
+ var w = window;
$(w).on('click', removeDropdowns);
$(w).on('click', cancelEditTitle);
// Click in iframes
try {
if (w.$ && w.$('iframe').length) {
- config.ifrw.$('iframe').each(function (i, el) {
+ w.$('iframe').each(function (i, el) {
$(el.contentWindow).on('click', removeDropdowns);
$(el.contentWindow).on('click', cancelEditTitle);
});
@@ -956,9 +994,9 @@ define([
var tb = {};
tb['userlist'] = createUserList;
tb['share'] = createShare;
- tb['fileshare'] = createFileShare;//TODO
+ tb['fileshare'] = createFileShare;
tb['title'] = createTitle;
- tb['pageTitle'] = createPageTitle;//TODO
+ tb['pageTitle'] = createPageTitle;
tb['lag'] = $.noop;
tb['spinner'] = createSpinner;
tb['state'] = $.noop;
@@ -980,7 +1018,6 @@ define([
};
addElement(config.displayed, {}, true);
- initUserList(toolbar, config);
toolbar['linkToMain'] = createLinkToMain(toolbar, config);
diff --git a/www/file/app-file.less b/www/file/app-file.less
new file mode 100644
index 000000000..1e4825414
--- /dev/null
+++ b/www/file/app-file.less
@@ -0,0 +1,130 @@
+@import (once) "../../customize/src/less2/include/browser.less";
+@import (once) "../../customize/src/less2/include/toolbar.less";
+@import (once) "../../customize/src/less2/include/markdown.less";
+@import (once) '../../customize/src/less2/include/fileupload.less';
+@import (once) '../../customize/src/less2/include/alertify.less';
+
+.toolbar_main();
+.fileupload_main();
+.alertify_main();
+
+@button-border: 2px;
+
+/*html, body {
+ margin: 0px;
+ height: 100%;
+}*/
+
+// body
+display: flex;
+flex-flow: column;
+
+#cp-app-file-content {
+ flex: 1;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+#cp-app-file-content.ready {
+ //background: url('/customize/bg3.jpg') no-repeat center center;
+ background-size: cover;
+ background-position: center;
+}
+
+#cp-app-file-upfile, #cp-app-file-dlfile {
+ display: block;
+ height: 100%;
+ width: 100%;
+ border: @button-border solid black;
+}
+
+.cp-app-file-input {
+ width: 0.1px;
+ height: 0.1px;
+ opacity: 0;
+ overflow: hidden;
+ position: absolute;
+ z-index: -1;
+}
+
+media-tag {
+ img {
+ max-width: 100%;
+ max-height: ~"calc(100vh - 96px)";
+ }
+}
+
+#cp-app-file-upload-form, #cp-app-file-download-form {
+ padding: 0px;
+ margin: 0px;
+
+ position: relative;
+ width: 50vh;
+ height: 50vh;
+ display: block;
+ margin: 50px auto;
+ max-width: 80vw;
+ label {
+ line-height: ~"calc(50vh - 20px)";
+ text-align: center;
+ position: relative;
+ padding: 10px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ height: 50vh;
+ box-sizing: border-box;
+ }
+}
+#cp-app-file-download-form {
+ label {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ white-space: normal;
+ word-wrap: break-word;
+ span {
+ width: 50vh;
+ max-width: 80vw;
+ text-align: center;
+ line-height: 1.5em;
+ }
+ }
+}
+.cp-app-file-hovering {
+ background-color: rgba(255, 0, 115, 0.5) !important;
+}
+
+.cp-app-file-block {
+ display: block;
+}
+.cp-app-file-hidden {
+ display: none;
+}
+.cp-app-file-input + label {
+ //border: 2px solid black;
+ //background-color: rgba(50, 50, 50, .10);
+ display: block;
+}
+
+.cp-app-file-input:focus + label,
+.cp-app-file-input + label:hover {
+ //background-color: rgba(50, 50, 50, 0.30);
+}
+
+#cp-app-file-dlprogress {
+ position: absolute;
+ top: 0;
+ left: 0;
+ height: 100%;
+
+
+ transition: width 200ms;
+ width: 0%;
+ max-width: 100%;
+ max-height: 100%;
+ background-color: rgba(255, 0, 115, 0.75);
+ z-index: 10000;
+ display: block;
+}
diff --git a/www/file/index.html b/www/file/index.html
index a72a3c60b..cc024c3ed 100644
--- a/www/file/index.html
+++ b/www/file/index.html
@@ -1,16 +1,17 @@
-
+
CryptPad
-
+
+
-
-
+
+
diff --git a/www/oldfile/inner.html b/www/oldfile/inner.html
new file mode 100644
index 000000000..0bdfd1c41
--- /dev/null
+++ b/www/oldfile/inner.html
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/www/oldfile/inner.js b/www/oldfile/inner.js
new file mode 100644
index 000000000..4be0b8483
--- /dev/null
+++ b/www/oldfile/inner.js
@@ -0,0 +1,14 @@
+define([
+ 'jquery',
+ 'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
+ 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
+ 'less!/file/file.less',
+ 'less!/customize/src/less/cryptpad.less',
+ 'less!/customize/src/less/toolbar.less',
+], function ($) {
+ $('.loading-hidden').removeClass('loading-hidden');
+ // dirty hack to get rid the flash of the lock background
+ setTimeout(function () {
+ $('#app').addClass('ready');
+ }, 100);
+});
diff --git a/www/oldfile/main.js b/www/oldfile/main.js
new file mode 100644
index 000000000..136702c47
--- /dev/null
+++ b/www/oldfile/main.js
@@ -0,0 +1,269 @@
+define([
+ 'jquery',
+ '/bower_components/chainpad-crypto/crypto.js',
+ '/bower_components/chainpad-netflux/chainpad-netflux.js',
+ '/common/toolbar2.js',
+ '/common/cryptpad-common.js',
+ '/common/visible.js',
+ '/common/notify.js',
+ '/file/file-crypto.js',
+
+ '/common/media-tag.js',
+
+ '/bower_components/file-saver/FileSaver.min.js',
+
+ 'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
+ 'less!/customize/src/less/cryptpad.less',
+], function ($, Crypto, realtimeInput, Toolbar, Cryptpad, Visible, Notify, FileCrypto, MediaTag) {
+ var Messages = Cryptpad.Messages;
+ var saveAs = window.saveAs;
+ var Nacl = window.nacl;
+
+ var APP = window.APP = {};
+
+ $(function () {
+
+ var andThen = function () {
+ var ifrw = $('#pad-iframe')[0].contentWindow;
+ var $iframe = $('#pad-iframe').contents();
+ var $appContainer = $iframe.find('#app');
+ var $form = $iframe.find('#upload-form');
+ var $dlform = $iframe.find('#download-form');
+ var $dlview = $iframe.find('#download-view');
+ var $label = $form.find('label');
+ var $dllabel = $dlform.find('label span');
+ var $progress = $iframe.find('#progress');
+ var $body = $iframe.find('body');
+
+ $body.on('dragover', function (e) { e.preventDefault(); });
+ $body.on('drop', function (e) { e.preventDefault(); });
+
+ Cryptpad.addLoadingScreen();
+
+ var Title;
+
+ var uploadMode = false;
+
+ var $bar = $iframe.find('.toolbar-container');
+
+ var secret;
+ var hexFileName;
+ if (window.location.hash) {
+ secret = Cryptpad.getSecrets();
+ if (!secret.keys) { throw new Error("You need a hash"); } // TODO
+ hexFileName = Cryptpad.base64ToHex(secret.channel);
+ } else {
+ uploadMode = true;
+ }
+
+ Title = Cryptpad.createTitle({}, function(){}, Cryptpad);
+
+ var displayed = ['useradmin', 'newpad', 'limit', 'upgrade'];
+ if (secret && hexFileName) {
+ displayed.push('fileshare');
+ }
+
+ var configTb = {
+ displayed: displayed,
+ ifrw: ifrw,
+ common: Cryptpad,
+ //hideDisplayName: true,
+ $container: $bar,
+ };
+
+ if (uploadMode) {
+ displayed.push('pageTitle');
+ configTb.pageTitle = Messages.upload_title;
+ }
+
+ var toolbar = APP.toolbar = Toolbar.create(configTb);
+ toolbar.$rightside.html(''); // Remove the drawer if we don't use it to hide the toolbar
+
+
+ if (!uploadMode) {
+ var src = Cryptpad.getBlobPathFromHex(hexFileName);
+ var cryptKey = secret.keys && secret.keys.fileKeyStr;
+ var key = Nacl.util.decodeBase64(cryptKey);
+
+ FileCrypto.fetchDecryptedMetadata(src, key, function (e, metadata) {
+ if (e) { return void console.error(e); }
+ var title = document.title = metadata.name;
+ Title.updateTitle(title || Title.defaultTitle);
+ toolbar.addElement(['pageTitle'], {pageTitle: title});
+
+ console.error(metadata);
+
+ var displayFile = function (ev, sizeMb, CB) {
+ var called_back;
+ var cb = function (e) {
+ if (called_back) { return; }
+ called_back = true;
+ if (CB) { CB(e); }
+ };
+
+ var $mt = $dlview.find('media-tag');
+ var cryptKey = secret.keys && secret.keys.fileKeyStr;
+ var hexFileName = Cryptpad.base64ToHex(secret.channel);
+ $mt.attr('src', '/blob/' + hexFileName.slice(0,2) + '/' + hexFileName);
+ $mt.attr('data-crypto-key', 'cryptpad:'+cryptKey);
+
+ var rightsideDisplayed = false;
+
+ $(window.document).on('decryption', function (e) {
+ var decrypted = e.originalEvent;
+ if (decrypted.callback) {
+ decrypted.callback();
+ }
+
+ console.log(decrypted);
+ $dlview.show();
+ $dlform.hide();
+ var $dlButton = $dlview.find('media-tag button');
+ if (ev) { $dlButton.click(); }
+ if (!$dlButton.length) {
+ $appContainer.css('background', 'white');
+ }
+ $dlButton.addClass('btn btn-success');
+ var text = Messages.download_mt_button + '
';
+ text += '
' + Cryptpad.fixHTML(title) + '';
+ text += '
' + Messages._getKey('formattedMB', [sizeMb]) + '';
+ $dlButton.html(text);
+
+ if (!rightsideDisplayed) {
+ toolbar.$rightside.append(Cryptpad.createButton('export', true, {}, function () {
+ saveAs(decrypted.blob, decrypted.metadata.name);
+ }))
+ .append(Cryptpad.createButton('forget', true, {}, function () {
+ // not sure what to do here
+ }));
+ rightsideDisplayed = true;
+ }
+
+ // make pdfs big
+ var toolbarHeight = $iframe.find('#toolbar').height();
+ var $another_iframe = $iframe.find('media-tag iframe').css({
+ 'height': 'calc(100vh - ' + toolbarHeight + 'px)',
+ 'width': '100vw',
+ 'position': 'absolute',
+ 'bottom': 0,
+ 'left': 0,
+ 'border': 0
+ });
+
+ if ($another_iframe.length) {
+ $another_iframe.load(function () {
+ cb();
+ });
+ } else {
+ cb();
+ }
+ })
+ .on('decryptionError', function (e) {
+ var error = e.originalEvent;
+ //Cryptpad.alert(error.message);
+ cb(error.message);
+ })
+ .on('decryptionProgress', function (e) {
+ var progress = e.originalEvent;
+ var p = progress.percent +'%';
+ $progress.width(p);
+ console.log(progress.percent);
+ });
+
+ /**
+ * Allowed mime types that have to be set for a rendering after a decryption.
+ *
+ * @type {Array}
+ */
+ var allowedMediaTypes = [
+ 'image/png',
+ 'image/jpeg',
+ 'image/jpg',
+ 'image/gif',
+ 'audio/mp3',
+ 'audio/ogg',
+ 'audio/wav',
+ 'audio/webm',
+ 'video/mp4',
+ 'video/ogg',
+ 'video/webm',
+ 'application/pdf',
+ 'application/dash+xml',
+ 'download'
+ ];
+ MediaTag.CryptoFilter.setAllowedMediaTypes(allowedMediaTypes);
+
+ MediaTag($mt[0]);
+ };
+
+ var todoBigFile = function (sizeMb) {
+ $dlform.show();
+ Cryptpad.removeLoadingScreen();
+ $dllabel.append($('
'));
+ $dllabel.append(Cryptpad.fixHTML(metadata.name));
+
+ // don't display the size if you don't know it.
+ if (typeof(sizeM) === 'number') {
+ $dllabel.append($('
'));
+ $dllabel.append(Messages._getKey('formattedMB', [sizeMb]));
+ }
+ var decrypting = false;
+ var onClick = function (ev) {
+ if (decrypting) { return; }
+ decrypting = true;
+ displayFile(ev, sizeMb, function (err) {
+ if (err) { Cryptpad.alert(err); }
+ });
+ };
+ if (typeof(sizeMb) === 'number' && sizeMb < 5) { return void onClick(); }
+ $dlform.find('#dl, #progress').click(onClick);
+ };
+ Cryptpad.getFileSize(window.location.href, function (e, data) {
+ if (e) {
+ return void Cryptpad.errorLoadingScreen(e);
+ }
+ var size = Cryptpad.bytesToMegabytes(data);
+ return void todoBigFile(size);
+ });
+ });
+ return;
+ }
+
+ if (!Cryptpad.isLoggedIn()) {
+ return Cryptpad.alert(Messages.upload_mustLogin, function () {
+ if (sessionStorage) {
+ sessionStorage.redirectTo = window.location.href;
+ }
+ window.location.href = '/login/';
+ });
+ }
+
+ $form.css({
+ display: 'block',
+ });
+
+ var fmConfig = {
+ dropArea: $form,
+ hoverArea: $label,
+ body: $body,
+ keepTable: true // Don't fadeOut the tbale with the uploaded files
+ };
+
+ var FM = Cryptpad.createFileManager(fmConfig);
+
+ $form.find("#file").on('change', function (e) {
+ var file = e.target.files[0];
+ FM.handleFile(file);
+ });
+
+ // we're in upload mode
+ Cryptpad.removeLoadingScreen();
+ };
+
+ Cryptpad.ready(function () {
+ andThen();
+ Cryptpad.reportAppUsage();
+ });
+
+ });
+});
diff --git a/www/file/test/index.html b/www/oldfile/test/index.html
similarity index 100%
rename from www/file/test/index.html
rename to www/oldfile/test/index.html
diff --git a/www/file/test/main.js b/www/oldfile/test/main.js
similarity index 100%
rename from www/file/test/main.js
rename to www/oldfile/test/main.js