', {'class': 'date'}).text(Messages.fm_creation);
- $fihElement.append($fhName).append($fhTitle).append($fhAdate).append($fhCdate);
+ $fihElement.append($fhName).append($fhTitle).append($fhType).append($fhAdate).append($fhCdate);
return $fileHeader;
};
@@ -827,6 +893,7 @@ define([
// Display the selected directory into the content part (rightside)
// NOTE: Elements in the trash are not using the same storage structure as the others
var displayDirectory = module.displayDirectory = function (path) {
+ appStatus.ready(false);
currentPath = path;
$content.html("");
if (!path || path.length === 0) {
@@ -852,6 +919,8 @@ define([
var $title = createTitle(path);
var $dirContent = $('', {id: FOLDER_CONTENT_ID});
+ $dirContent.data('path', path);
+ $dirContent.contextmenu(openContentContextMenu);
var mode = getViewMode();
if (mode) {
$dirContent.addClass(getViewModeClass());
@@ -891,6 +960,7 @@ define([
});
}
$content.append($title).append($dirContent);
+ appStatus.ready(true);
};
var createTreeElement = function (name, $icon, path, draggable, collapsable, active) {
@@ -1040,6 +1110,7 @@ define([
$contextMenu.hide();
$trashTreeContextMenu.hide();
$trashContextMenu.hide();
+ $contentContextMenu.hide();
};
$contextMenu.on("click", "a", function(e) {
@@ -1060,6 +1131,26 @@ define([
else if ($(this).hasClass('open')) {
$element.dblclick();
}
+ else if ($(this).hasClass('newfolder')) {
+ var onCreated = function (info) {
+ module.newFolder = info.newPath;
+ module.displayDirectory(path);;
+ };
+ filesOp.createNewFolder(path, null, onCreated);
+ }
+ module.hideMenu();
+ });
+
+ $contentContextMenu.on('click', 'a', function (e) {
+ e.stopPropagation();
+ var path = $(this).data('path');
+ if ($(this).hasClass("newfolder")) {
+ var onCreated = function (info) {
+ module.newFolder = info.newPath;
+ refresh();
+ };
+ filesOp.createNewFolder(path, null, onCreated);
+ }
module.hideMenu();
});
@@ -1127,8 +1218,8 @@ define([
$(ifrw).on('keyup', function (e) {
pressKey(e.which, false);
});
- $(ifrw).on('keypress', function (e) {
- if (e.which === 0) {
+ $(ifrw).on('keydown', function (e) {
+ if (e.which === 46) {
var $selected = $iframe.find('.selected');
if (!$selected.length) { return; }
var paths = [];
@@ -1136,7 +1227,14 @@ define([
if (!$(elmt).data('path')) { return; }
paths.push($(elmt).data('path'));
});
- if (filesOp.isPathInTrash(currentPath)) {
+ // If we are in the trash or if we are holding the "shift" key, delete permanently,
+ // else move to trash
+ if (filesOp.isPathInTrash(currentPath) || e.shiftKey) {
+ var todo = filesOp.removeFromTrash;
+ if (!filesOp.isPathInTrash(currentPath)) {
+ // If we are not in the trash, we just have to remove the key from root/unsorted
+ todo = filesOp.deletePathPermanently;
+ }
// If we are already in the trash, delete the elements permanently
var msg = Messages._getKey("fm_removeSeveralPermanentlyDialog", [paths.length]);
if (paths.length === 1) {
@@ -1146,7 +1244,7 @@ define([
}
Cryptpad.confirm(msg, function(res) {
paths.forEach(function(p) {
- filesOp.removeFromTrash(p);
+ todo(p);
});
refresh();
});
@@ -1156,6 +1254,67 @@ define([
}
});
};
+
+ /*
initLSOpened();
init(filesObject);
+ */
+
+
+
+ var listmapConfig = module.config = {
+ data: {},
+ websocketURL: Cryptpad.getWebsocketURL(),
+ channel: secret.channel,
+ readOnly: false,
+ validateKey: secret.keys.validateKey || undefined,
+ crypto: Crypto.createEncryptor(secret.keys),
+ };
+
+ // don't initialize until the store is ready.
+ Cryptpad.ready(function () {
+ var rt = window.rt = module.rt = Listmap.create(listmapConfig);
+ rt.proxy.on('create', function (info) {
+ var realtime = module.realtime = info.realtime;
+
+ var editHash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
+ window.location.hash = editHash;
+ //Cryptpad.setAttribute("FS_hash", editHash, cb, store);
+ localStorage.FS_hash = editHash;
+
+ module.patchText = TextPatcher.create({
+ realtime: realtime,
+ logging: true,
+ });
+ /*Cryptpad.getPadTitle(function (err, title) {
+ title = document.title = title || info.channel.slice(0, 8);
+
+ Cryptpad.setPadTitle(title, function (err, data) {
+ if (err) {
+ console.log("unable to remember pad");
+ console.log(err);
+ return;
+ }
+ });
+ });*/
+ }).on('ready', function () {
+ if (JSON.stringify(rt.proxy) === '{}') {
+ var store = Cryptpad.getStore();
+ store.get(Cryptpad.storageKey, function (err, s) {
+ rt.proxy.filesData = s;
+ initLSOpened();
+ init(rt.proxy);
+ });
+ return;
+ }
+ initLSOpened();
+ init(rt.proxy);
+ })
+ .on('disconnect', function () {
+ //setEditable(false);
+ Cryptpad.alert(Messages.common_connectionLost);
+ });
+ });
+
+
});