Merge branch 'exportFolderTests' into exportFolder
This commit is contained in:
@@ -17,8 +17,6 @@ define([
|
||||
'/bower_components/chainpad-listmap/chainpad-listmap.js',
|
||||
'/customize/messages.js',
|
||||
|
||||
'/common/jscolor.js',
|
||||
|
||||
'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
|
||||
'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
|
||||
'less!/drive/app-drive.less',
|
||||
@@ -43,7 +41,10 @@ define([
|
||||
{
|
||||
var APP = window.APP = {
|
||||
editable: false,
|
||||
mobile: function () { return $('body').width() <= 600; }, // Menu and content area are not inline-block anymore for mobiles
|
||||
mobile: function () {
|
||||
if (window.matchMedia) { return !window.matchMedia('(any-pointer:fine)').matches; }
|
||||
else { return $('body').width() <= 600; }
|
||||
},
|
||||
isMac: navigator.platform === "MacIntel",
|
||||
};
|
||||
|
||||
@@ -299,6 +300,33 @@ define([
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
APP.selectedFiles = [];
|
||||
|
||||
var isElementSelected = function ($element) {
|
||||
var elementId = $element.data("path").slice(-1)[0];
|
||||
return APP.selectedFiles.indexOf(elementId) !== -1;
|
||||
};
|
||||
var selectElement = function ($element) {
|
||||
var elementId = $element.data("path").slice(-1)[0];
|
||||
if (APP.selectedFiles.indexOf(elementId) === -1) {
|
||||
APP.selectedFiles.push(elementId);
|
||||
}
|
||||
$element.addClass("cp-app-drive-element-selected");
|
||||
};
|
||||
var unselectElement = function ($element) {
|
||||
var elementId = $element.data("path").slice(-1)[0];
|
||||
var index = APP.selectedFiles.indexOf(elementId);
|
||||
if (index !== -1) {
|
||||
APP.selectedFiles.splice(index, 1);
|
||||
}
|
||||
$element.removeClass("cp-app-drive-element-selected");
|
||||
};
|
||||
var findSelectedElements = function () {
|
||||
return $(".cp-app-drive-element-selected");
|
||||
};
|
||||
|
||||
|
||||
var createContextMenu = function () {
|
||||
var menu = h('div.cp-contextmenu.dropdown.cp-unselectable', [
|
||||
h('ul.dropdown-menu', {
|
||||
@@ -363,16 +391,34 @@ define([
|
||||
'data-icon': AppConfig.applicationsIcon.slide,
|
||||
'data-type': 'slide'
|
||||
}, Messages.button_newslide)),
|
||||
h('li', h('a.cp-app-drive-context-newdoc.dropdown-item.cp-app-drive-context-editable', {
|
||||
'tabindex': '-1',
|
||||
'data-icon': AppConfig.applicationsIcon.poll,
|
||||
'data-type': 'poll'
|
||||
}, Messages.button_newpoll)),
|
||||
h('li', h('a.cp-app-drive-context-newdoc.dropdown-item.cp-app-drive-context-editable', {
|
||||
'tabindex': '-1',
|
||||
'data-icon': AppConfig.applicationsIcon.whiteboard,
|
||||
'data-type': 'whiteboard'
|
||||
}, Messages.button_newwhiteboard)),
|
||||
h('li.dropdown-submenu', [
|
||||
h('a.cp-app-drive-context-newdocmenu.dropdown-item', {
|
||||
'tabindex': '-1',
|
||||
'data-icon': "fa-plus",
|
||||
}, Messages.fm_morePads || "More pads"), //XXX
|
||||
h("ul.dropdown-menu", [
|
||||
h('li', h('a.cp-app-drive-context-newdoc.dropdown-item.cp-app-drive-context-editable', {
|
||||
'tabindex': '-1',
|
||||
'data-icon': AppConfig.applicationsIcon.sheet,
|
||||
'data-type': 'sheet'
|
||||
}, Messages.button_newsheet)),
|
||||
h('li', h('a.cp-app-drive-context-newdoc.dropdown-item.cp-app-drive-context-editable', {
|
||||
'tabindex': '-1',
|
||||
'data-icon': AppConfig.applicationsIcon.whiteboard,
|
||||
'data-type': 'whiteboard'
|
||||
}, Messages.button_newwhiteboard)),
|
||||
h('li', h('a.cp-app-drive-context-newdoc.dropdown-item.cp-app-drive-context-editable', {
|
||||
'tabindex': '-1',
|
||||
'data-icon': AppConfig.applicationsIcon.kanban,
|
||||
'data-type': 'kanban'
|
||||
}, Messages.button_newkanban)),
|
||||
h('li', h('a.cp-app-drive-context-newdoc.dropdown-item.cp-app-drive-context-editable', {
|
||||
'tabindex': '-1',
|
||||
'data-icon': AppConfig.applicationsIcon.poll,
|
||||
'data-type': 'poll'
|
||||
}, Messages.button_newpoll)),
|
||||
]),
|
||||
]),
|
||||
$separator.clone()[0],
|
||||
h('li', h('a.cp-app-drive-context-empty.dropdown-item.cp-app-drive-context-editable', {
|
||||
'tabindex': '-1',
|
||||
@@ -419,6 +465,7 @@ define([
|
||||
}, Messages.fc_prop)),
|
||||
])
|
||||
]);
|
||||
// add icons to the contextmenu options
|
||||
$(menu).find("li a.dropdown-item").each(function (i, el) {
|
||||
var $icon = $("<span>");
|
||||
if ($(el).attr('data-icon')) {
|
||||
@@ -429,21 +476,46 @@ define([
|
||||
}
|
||||
$(el).prepend($icon);
|
||||
});
|
||||
// add events handlers for the contextmenu submenus
|
||||
$(menu).find(".dropdown-submenu").each(function (i, el) {
|
||||
var $el = $(el);
|
||||
var $a = $el.children().filter("a");
|
||||
var $sub = $el.find(".dropdown-menu").first();
|
||||
var timeoutId;
|
||||
var showSubmenu = function () {
|
||||
clearTimeout(timeoutId);
|
||||
$sub.toggleClass("left", $el.offset().left + $el.outerWidth() + $sub.outerWidth() > $(window).width());
|
||||
$el.siblings().find(".dropdown-menu").hide();
|
||||
$sub.show();
|
||||
};
|
||||
var hideSubmenu = function () {
|
||||
$sub.hide();
|
||||
$sub.removeClass("left");
|
||||
};
|
||||
var mouseOutSubmenu = function () {
|
||||
// don't hide immediately the submenu
|
||||
timeoutId = setTimeout(hideSubmenu, 100);
|
||||
};
|
||||
// Add submenu expand icon
|
||||
$a.append(h("span.dropdown-toggle"));
|
||||
// Show / hide submenu
|
||||
$el.hover(function () {
|
||||
setTimeout(function () { // wait for dom to update
|
||||
$sub.toggleClass("left", $el.offset().left + $el.outerWidth() + $sub.outerWidth() > $(window).width());
|
||||
$sub.show();
|
||||
});
|
||||
showSubmenu();
|
||||
}, function () {
|
||||
$sub.hide();
|
||||
$sub.removeClass("left");
|
||||
mouseOutSubmenu();
|
||||
});
|
||||
// handle click event
|
||||
$el.click(function (e) {
|
||||
var targetItem = $(e.target).closest(".dropdown-item")[0]; // don't close contextmenu if open submenu
|
||||
var elTarget = $el.children(".dropdown-item")[0];
|
||||
if (targetItem === elTarget) { e.stopPropagation(); }
|
||||
if ($el.children().filter(".dropdown-menu:visible").length !== 0) {
|
||||
$el.find(".dropdown-menu").hide();
|
||||
hideSubmenu();
|
||||
}
|
||||
else {
|
||||
showSubmenu();
|
||||
}
|
||||
});
|
||||
});
|
||||
return $(menu);
|
||||
@@ -569,7 +641,8 @@ define([
|
||||
var sel = {};
|
||||
|
||||
var removeSelected = function (keepObj) {
|
||||
$('.cp-app-drive-element-selected').removeClass("cp-app-drive-element-selected");
|
||||
APP.selectedFiles = [];
|
||||
findSelectedElements().removeClass("cp-app-drive-element-selected");
|
||||
var $container = $driveToolbar.find('#cp-app-drive-toolbar-contextbuttons');
|
||||
if (!$container.length) { return; }
|
||||
$container.html('');
|
||||
@@ -679,7 +752,9 @@ define([
|
||||
delete sel.move;
|
||||
$content.find('.cp-app-drive-element-selected-tmp')
|
||||
.removeClass('cp-app-drive-element-selected-tmp')
|
||||
.addClass('cp-app-drive-element-selected');
|
||||
.each(function (idx, element) {
|
||||
selectElement($(element));
|
||||
});
|
||||
e.stopPropagation();
|
||||
});
|
||||
|
||||
@@ -714,7 +789,9 @@ define([
|
||||
// Ctrl+A select all
|
||||
if (e.which === 65 && (e.ctrlKey || (e.metaKey && APP.isMac))) {
|
||||
$content.find('.cp-app-drive-element:not(.cp-app-drive-element-selected)')
|
||||
.addClass('cp-app-drive-element-selected');
|
||||
.each(function (idx, element) {
|
||||
selectElement($(element));
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -727,7 +804,7 @@ define([
|
||||
APP.onElementClick(ev, $(el));
|
||||
};
|
||||
|
||||
var $selection = $content.find('.cp-app-drive-element.cp-app-drive-element-selected');
|
||||
var $selection = findSelectedElements();
|
||||
if ($selection.length === 0) { return void click($elements.first()[0]); }
|
||||
|
||||
var lastIndex = typeof sel.endSelected === "number" ? sel.endSelected :
|
||||
@@ -846,12 +923,12 @@ define([
|
||||
return;
|
||||
}
|
||||
removeInput();
|
||||
removeSelected();
|
||||
var $name = $element.find('.cp-app-drive-element-name');
|
||||
if (!$name.length) {
|
||||
$name = $element.find('> .cp-app-drive-element');
|
||||
}
|
||||
$name.hide();
|
||||
var isFolder = $element.is(".cp-app-drive-element-folder:not(.cp-app-drive-element-sharedf)");
|
||||
var el = manager.find(path);
|
||||
var name = manager.isFile(el) ? manager.getTitle(el) : path[path.length - 1];
|
||||
if (manager.isSharedFolder(el)) {
|
||||
@@ -873,14 +950,21 @@ define([
|
||||
var newName = $input.val();
|
||||
if (JSON.stringify(path) === JSON.stringify(currentPath)) {
|
||||
manager.rename(path, $input.val(), function () {
|
||||
renameFoldersOpened(path, newName);
|
||||
path[path.length - 1] = newName;
|
||||
if (isFolder) {
|
||||
renameFoldersOpened(path, newName);
|
||||
path[path.length - 1] = newName;
|
||||
}
|
||||
APP.displayDirectory(path);
|
||||
});
|
||||
}
|
||||
else {
|
||||
manager.rename(path, $input.val(), function () {
|
||||
renameFoldersOpened(path, newName);
|
||||
if (isFolder) {
|
||||
renameFoldersOpened(path, newName);
|
||||
unselectElement($element);
|
||||
$element.data("path", $element.data("path").slice(0, -1).concat(newName));
|
||||
selectElement($element);
|
||||
}
|
||||
refresh();
|
||||
});
|
||||
}
|
||||
@@ -901,7 +985,6 @@ define([
|
||||
|
||||
// We don't want to open the file/folder when clicking on the input
|
||||
$input.on('click dblclick', function (e) {
|
||||
removeSelected();
|
||||
e.stopPropagation();
|
||||
});
|
||||
// Remove the browser ability to drag text from the input to avoid
|
||||
@@ -1122,8 +1205,9 @@ define([
|
||||
|
||||
var getSelectedPaths = function ($element) {
|
||||
var paths = [];
|
||||
if ($('.cp-app-drive-element-selected').length > 1) {
|
||||
var $selected = $('.cp-app-drive-element-selected');
|
||||
if (!$element || $element.length === 0) { return paths; }
|
||||
if (findSelectedElements().length > 1) {
|
||||
var $selected = findSelectedElements();
|
||||
$selected.each(function (idx, elmt) {
|
||||
var ePath = $(elmt).data('path');
|
||||
if (ePath) {
|
||||
@@ -1152,7 +1236,7 @@ define([
|
||||
} else {
|
||||
$driveToolbar.find('cp-app-drive-toolbar-emptytrash').hide();
|
||||
}
|
||||
var $li = $content.find('.cp-app-drive-element-selected');
|
||||
var $li = findSelectedElements();
|
||||
if ($li.length === 0) {
|
||||
$li = findDataHolder($tree.find('.cp-app-drive-element-active'));
|
||||
}
|
||||
@@ -1219,6 +1303,7 @@ define([
|
||||
if (pos+eh <= h && pos >= 0) { return; }
|
||||
$content.scrollTop(v);
|
||||
};
|
||||
|
||||
// Add the "selected" class to the "li" corresponding to the clicked element
|
||||
var onElementClick = APP.onElementClick = function (e, $element) {
|
||||
// If "Ctrl" is pressed, do not remove the current selection
|
||||
@@ -1255,34 +1340,33 @@ define([
|
||||
var $el;
|
||||
removeSelected(true);
|
||||
sel.oldSelection.forEach(function (el) {
|
||||
if (!$(el).hasClass("cp-app-drive-element-selected")) {
|
||||
$(el).addClass("cp-app-drive-element-selected");
|
||||
if (!isElementSelected($(el))) {
|
||||
selectElement($(el));
|
||||
}
|
||||
});
|
||||
for (var i = Math.min(sel.startSelected, sel.endSelected);
|
||||
i <= Math.max(sel.startSelected, sel.endSelected);
|
||||
i++) {
|
||||
$el = $($elements.get(i));
|
||||
if (!$el.hasClass("cp-app-drive-element-selected")) {
|
||||
$el.addClass("cp-app-drive-element-selected");
|
||||
if (!isElementSelected($el)) {
|
||||
selectElement($el);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (!$element.hasClass("cp-app-drive-element-selected")) {
|
||||
$element.addClass("cp-app-drive-element-selected");
|
||||
if (!isElementSelected($element)) {
|
||||
selectElement($element);
|
||||
} else {
|
||||
$element.removeClass("cp-app-drive-element-selected");
|
||||
unselectElement($element);
|
||||
}
|
||||
}
|
||||
updateContextButton();
|
||||
};
|
||||
|
||||
var displayMenu = function (e) {
|
||||
var $menu = $contextMenu;
|
||||
// show / hide dropdown separators
|
||||
var hideSeparators = function ($menu) {
|
||||
var showSep = false;
|
||||
var $lastVisibleSep = null;
|
||||
// show / hide drop-down divider
|
||||
$menu.find(".dropdown-menu").children().each(function (i, el) {
|
||||
$menu.children().each(function (i, el) {
|
||||
var $el = $(el);
|
||||
if ($el.is(".dropdown-divider")) {
|
||||
$el.css("display", showSep ? "list-item" : "none");
|
||||
@@ -1294,18 +1378,36 @@ define([
|
||||
}
|
||||
});
|
||||
if (!showSep && $lastVisibleSep) { $lastVisibleSep.css("display", "none"); } // remove last divider if no options after
|
||||
};
|
||||
|
||||
// prepare and display contextmenu
|
||||
var displayMenu = function (e) {
|
||||
var $menu = $contextMenu;
|
||||
// show / hide submenus
|
||||
$menu.find(".dropdown-submenu").each(function (i, el) {
|
||||
var $el = $(el);
|
||||
$el.children(".dropdown-menu").css("display", "none");
|
||||
$el.find("li").each(function (i, li) {
|
||||
if ($(li).css("display") !== "none") {
|
||||
$(el).css("display", "block");
|
||||
$el.css("display", "block");
|
||||
return;
|
||||
}
|
||||
});
|
||||
});
|
||||
// show / hide separators
|
||||
$menu.find(".dropdown-menu").each(function (i, menu) {
|
||||
hideSeparators($(menu));
|
||||
});
|
||||
// show contextmenu at cursor position
|
||||
$menu.css({ display: "block" });
|
||||
if (APP.mobile()) { return; }
|
||||
if (APP.mobile()) {
|
||||
$menu.css({
|
||||
top: ($("#cp-app-drive-toolbar-context-mobile").offset().top + 32) + 'px',
|
||||
right: '0px',
|
||||
left: ''
|
||||
});
|
||||
return;
|
||||
}
|
||||
var h = $menu.outerHeight();
|
||||
var w = $menu.outerWidth();
|
||||
var wH = window.innerHeight;
|
||||
@@ -1358,6 +1460,17 @@ define([
|
||||
} else {
|
||||
var $element = findDataHolder($(e.target));
|
||||
|
||||
// if clicked from tree
|
||||
var fromTree = $element.closest("#cp-app-drive-tree").length;
|
||||
if (fromTree) {
|
||||
removeSelected();
|
||||
}
|
||||
|
||||
// if clicked on non selected element
|
||||
if (!isElementSelected($element)) {
|
||||
removeSelected();
|
||||
}
|
||||
|
||||
if (type === 'trash' && !$element.data('path')) { return; }
|
||||
|
||||
if (!$element.length) {
|
||||
@@ -1366,8 +1479,8 @@ define([
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!$element.hasClass('cp-app-drive-element-selected')) {
|
||||
onElementClick(undefined, $element);
|
||||
if (!isElementSelected($element)) {
|
||||
selectElement($element);
|
||||
}
|
||||
|
||||
paths = getSelectedPaths($element);
|
||||
@@ -1437,6 +1550,7 @@ define([
|
||||
if (!res) { return; }
|
||||
manager.delete(pathsList, function () {
|
||||
pathsList.forEach(removeFoldersOpened);
|
||||
removeSelected();
|
||||
refresh();
|
||||
});
|
||||
}, null, true);
|
||||
@@ -1447,7 +1561,7 @@ define([
|
||||
var paths = [];
|
||||
var $element = findDataHolder($(ev.target));
|
||||
if ($element.hasClass('cp-app-drive-element-selected')) {
|
||||
var $selected = $('.cp-app-drive-element-selected');
|
||||
var $selected = findSelectedElements();
|
||||
$selected.each(function (idx, elmt) {
|
||||
var ePath = $(elmt).data('path');
|
||||
if (ePath) {
|
||||
@@ -1464,7 +1578,7 @@ define([
|
||||
});
|
||||
} else {
|
||||
removeSelected();
|
||||
$element.addClass('cp-app-drive-element-selected');
|
||||
selectElement($element);
|
||||
var val = manager.find(path);
|
||||
if (!val) { return; } // The element is not in the object
|
||||
paths = [{
|
||||
@@ -1483,7 +1597,13 @@ define([
|
||||
|
||||
var findDropPath = function (target) {
|
||||
var $target = $(target);
|
||||
var $el = findDataHolder($target);
|
||||
var $el;
|
||||
if ($target.is(".cp-app-drive-path-element")) {
|
||||
$el = $target;
|
||||
}
|
||||
else {
|
||||
$el = findDataHolder($target);
|
||||
}
|
||||
var newPath = $el.data('path');
|
||||
var dropEl = newPath && manager.find(newPath);
|
||||
if (newPath && manager.isSharedFolder(dropEl)) {
|
||||
@@ -1611,7 +1731,8 @@ define([
|
||||
$owner.attr('title', Messages.fm_padIsOwnedOther);
|
||||
}
|
||||
};
|
||||
var addFileData = function (element, $span) {
|
||||
var thumbsUrls = {};
|
||||
var addFileData = function (element, $element) {
|
||||
if (!manager.isFile(element)) { return; }
|
||||
|
||||
var data = manager.getFileData(element);
|
||||
@@ -1620,7 +1741,7 @@ define([
|
||||
|
||||
var hrefData = Hash.parsePadUrl(href);
|
||||
if (hrefData.type) {
|
||||
$span.addClass('cp-border-color-'+hrefData.type);
|
||||
$element.addClass('cp-border-color-'+hrefData.type);
|
||||
}
|
||||
|
||||
var $state = $('<span>', {'class': 'cp-app-drive-element-state'});
|
||||
@@ -1640,25 +1761,38 @@ define([
|
||||
var $expire = $expirableIcon.clone().appendTo($state);
|
||||
$expire.attr('title', Messages._getKey('fm_expirablePad', [new Date(data.expire).toLocaleString()]));
|
||||
}
|
||||
_addOwnership($span, $state, data);
|
||||
_addOwnership($element, $state, data);
|
||||
|
||||
var name = manager.getTitle(element);
|
||||
|
||||
// The element with the class '.name' is underlined when the 'li' is hovered
|
||||
var $name = $('<span>', {'class': 'cp-app-drive-element-name'}).text(name);
|
||||
$span.append($name);
|
||||
$span.append($state);
|
||||
$span.attr('title', name);
|
||||
$element.append($name);
|
||||
$element.append($state);
|
||||
$element.attr('title', name);
|
||||
|
||||
// display the thumbnail
|
||||
// if the thumbnail has already been displayed once, do not reload it, keep the same url
|
||||
if (thumbsUrls[element]) {
|
||||
var img = new Image();
|
||||
img.src = thumbsUrls[element];
|
||||
$element.find('.cp-icon').addClass('cp-app-drive-element-list');
|
||||
$element.prepend(img);
|
||||
$(img).addClass('cp-app-drive-element-grid cp-app-drive-element-thumbnail');
|
||||
$(img).attr("draggable", false);
|
||||
}
|
||||
else {
|
||||
common.displayThumbnail(href || data.roHref, data.channel, data.password, $element, function ($thumb) {
|
||||
// Called only if the thumbnail exists
|
||||
// Remove the .hide() added by displayThumnail() because it hides the icon in list mode too
|
||||
$element.find('.cp-icon').removeAttr('style').addClass('cp-app-drive-element-list');
|
||||
$thumb.addClass('cp-app-drive-element-grid cp-app-drive-element-thumbnail');
|
||||
$thumb.attr("draggable", false);
|
||||
thumbsUrls[element] = $thumb[0].src;
|
||||
});
|
||||
}
|
||||
|
||||
var type = Messages.type[hrefData.type] || hrefData.type;
|
||||
common.displayThumbnail(href || data.roHref, data.channel, data.password, $span, function ($thumb) {
|
||||
// Called only if the thumbnail exists
|
||||
// Remove the .hide() added by displayThumnail() because it hides the icon in
|
||||
// list mode too
|
||||
$span.find('.cp-icon').removeAttr('style').addClass('cp-app-drive-element-list');
|
||||
$thumb.addClass('cp-app-drive-element-grid')
|
||||
.addClass('cp-app-drive-element-thumbnail');
|
||||
});
|
||||
var $type = $('<span>', {
|
||||
'class': 'cp-app-drive-element-type cp-app-drive-element-list'
|
||||
}).text(type);
|
||||
@@ -1668,7 +1802,7 @@ define([
|
||||
var $cdate = $('<span>', {
|
||||
'class': 'cp-app-drive-element-ctime cp-app-drive-element-list'
|
||||
}).text(getDate(data.ctime));
|
||||
$span.append($type).append($adate).append($cdate);
|
||||
$element.append($type).append($adate).append($cdate);
|
||||
};
|
||||
|
||||
var addFolderData = function (element, key, $span) {
|
||||
@@ -1744,12 +1878,9 @@ define([
|
||||
draggable: true,
|
||||
'class': 'cp-app-drive-element-row'
|
||||
});
|
||||
if (!isFolder && Array.isArray(APP.selectedFiles)) {
|
||||
var idx = APP.selectedFiles.indexOf(element);
|
||||
if (idx !== -1) {
|
||||
$element.addClass('cp-app-drive-element-selected');
|
||||
APP.selectedFiles.splice(idx, 1);
|
||||
}
|
||||
$element.data('path', newPath);
|
||||
if (isElementSelected($element)) {
|
||||
selectElement($element);
|
||||
}
|
||||
$element.prepend($icon).dblclick(function () {
|
||||
if (isFolder) {
|
||||
@@ -1765,11 +1896,10 @@ define([
|
||||
addFileData(element, $element);
|
||||
}
|
||||
$element.addClass(liClass);
|
||||
$element.data('path', newPath);
|
||||
addDragAndDropHandlers($element, newPath, isFolder, !isTrash);
|
||||
$element.click(function(e) {
|
||||
e.stopPropagation();
|
||||
onElementClick(e, $element, newPath);
|
||||
onElementClick(e, $element);
|
||||
});
|
||||
if (!isTrash) {
|
||||
$element.contextmenu(openContextMenu('tree'));
|
||||
@@ -1920,6 +2050,8 @@ define([
|
||||
} else if (idx > 0 && manager.isFile(el)) {
|
||||
name = getElementName(path);
|
||||
}
|
||||
$span.data("path", path.slice(0, idx + 1));
|
||||
addDragAndDropHandlers($span, path.slice(0, idx), true, true);
|
||||
|
||||
if (idx === 0) { name = p === SHARED_FOLDER ? name : getPrettyName(p); }
|
||||
else {
|
||||
@@ -2564,22 +2696,19 @@ define([
|
||||
'class': 'cp-app-drive-element cp-app-drive-element-file cp-app-drive-element-row' + roClass,
|
||||
draggable: draggable
|
||||
});
|
||||
if (Array.isArray(APP.selectedFiles)) {
|
||||
var sidx = APP.selectedFiles.indexOf(id);
|
||||
if (sidx !== -1) {
|
||||
$element.addClass('cp-app-drive-element-selected');
|
||||
APP.selectedFiles.splice(sidx, 1);
|
||||
}
|
||||
|
||||
var path = [rootName, idx];
|
||||
$element.data('path', path);
|
||||
if (isElementSelected($element)) {
|
||||
selectElement($element);
|
||||
}
|
||||
$element.prepend($icon).dblclick(function () {
|
||||
openFile(id);
|
||||
});
|
||||
addFileData(id, $element);
|
||||
var path = [rootName, idx];
|
||||
$element.data('path', path);
|
||||
$element.click(function(e) {
|
||||
e.stopPropagation();
|
||||
onElementClick(e, $element, path);
|
||||
onElementClick(e, $element);
|
||||
});
|
||||
$element.contextmenu(openContextMenu('default'));
|
||||
$element.data('context', 'default');
|
||||
@@ -2706,8 +2835,8 @@ define([
|
||||
e.preventDefault();
|
||||
if (manager.isInTrashRoot(parentPath)) { parentPath = [TRASH]; }
|
||||
else { parentPath.pop(); }
|
||||
APP.selectedFiles = [r.id];
|
||||
APP.displayDirectory(parentPath);
|
||||
APP.selectedFiles = path.slice(-1);
|
||||
}).appendTo($openDir);
|
||||
}
|
||||
$('<a>').text(Messages.fc_prop).click(function () {
|
||||
@@ -2798,7 +2927,7 @@ define([
|
||||
$element.data('path', path);
|
||||
$element.click(function(e) {
|
||||
e.stopPropagation();
|
||||
onElementClick(e, $element, path);
|
||||
onElementClick(e, $element);
|
||||
});
|
||||
$element.contextmenu(openContextMenu('default'));
|
||||
$element.data('context', 'default');
|
||||
@@ -3022,7 +3151,7 @@ define([
|
||||
$context.click(function (e) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
var $li = $content.find('.cp-app-drive-element-selected');
|
||||
var $li = findSelectedElements();
|
||||
if ($li.length !== 1) {
|
||||
$li = findDataHolder($tree.find('.cp-app-drive-element-active'));
|
||||
}
|
||||
@@ -3032,11 +3161,6 @@ define([
|
||||
return;
|
||||
}
|
||||
// Open the menu
|
||||
$('.cp-contextmenu').css({
|
||||
top: ($context.offset().top + 32) + 'px',
|
||||
right: '0px',
|
||||
left: ''
|
||||
});
|
||||
$li.contextmenu();
|
||||
});
|
||||
} else {
|
||||
@@ -3104,7 +3228,7 @@ define([
|
||||
}
|
||||
});*/
|
||||
|
||||
var $sel = $content.find('.cp-app-drive-element-selected');
|
||||
var $sel = findSelectedElements();
|
||||
if ($sel.length) {
|
||||
$sel[0].scrollIntoView();
|
||||
} else {
|
||||
@@ -3116,6 +3240,9 @@ define([
|
||||
if (history.isHistoryMode) {
|
||||
return void _displayDirectory(path, force);
|
||||
}
|
||||
if (!manager.comparePath(currentPath, path)) {
|
||||
removeSelected();
|
||||
}
|
||||
updateObject(sframeChan, proxy, function () {
|
||||
copyObjectValue(files, proxy.drive);
|
||||
updateSharedFolders(sframeChan, manager, files, folders, function () {
|
||||
@@ -3466,15 +3593,37 @@ define([
|
||||
if (!res) { return; }
|
||||
manager.delete(pathsList, function () {
|
||||
pathsList.forEach(removeFoldersOpened);
|
||||
removeSelected();
|
||||
refresh();
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
var downloadFolder = function (folderElement, folderName, sfId) {
|
||||
var todo = function (data) {
|
||||
data.folder = folderElement;
|
||||
data.sharedFolderId = sfId;
|
||||
data.folderName = Util.fixFileName(folderName) + '.zip';
|
||||
|
||||
APP.FM.downloadFolder(data, function (err, obj) {
|
||||
console.log(err, obj);
|
||||
console.log('DONE');
|
||||
});
|
||||
};
|
||||
todo({
|
||||
uo: proxy,
|
||||
sf: folders,
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
$contextMenu.on("click", "a", function(e) {
|
||||
e.stopPropagation();
|
||||
var paths = $contextMenu.data('paths');
|
||||
var pathsList = [];
|
||||
var type = $contextMenu.attr('data-menu-type');
|
||||
var $this = $(this);
|
||||
|
||||
var el, data;
|
||||
if (paths.length === 0) {
|
||||
@@ -3483,11 +3632,11 @@ define([
|
||||
return;
|
||||
}
|
||||
|
||||
if ($(this).hasClass("cp-app-drive-context-rename")) {
|
||||
if ($this.hasClass("cp-app-drive-context-rename")) {
|
||||
if (paths.length !== 1) { return; }
|
||||
displayRenameInput(paths[0].element, paths[0].path);
|
||||
}
|
||||
if ($(this).hasClass("cp-app-drive-context-color")) {
|
||||
else if ($this.hasClass("cp-app-drive-context-color")) {
|
||||
var currentColor = getFolderColor(paths[0].path);
|
||||
pickFolderColor(paths[0].element, currentColor, function (color) {
|
||||
paths.forEach(function (p) {
|
||||
@@ -3496,24 +3645,24 @@ define([
|
||||
refresh();
|
||||
});
|
||||
}
|
||||
else if($(this).hasClass("cp-app-drive-context-delete")) {
|
||||
else if($this.hasClass("cp-app-drive-context-delete")) {
|
||||
if (!APP.loggedIn) {
|
||||
return void deletePaths(paths);
|
||||
}
|
||||
paths.forEach(function (p) { pathsList.push(p.path); });
|
||||
moveElements(pathsList, [TRASH], false, refresh);
|
||||
}
|
||||
else if ($(this).hasClass('cp-app-drive-context-deleteowned')) {
|
||||
else if ($this.hasClass('cp-app-drive-context-deleteowned')) {
|
||||
deleteOwnedPaths(paths);
|
||||
}
|
||||
else if ($(this).hasClass('cp-app-drive-context-open')) {
|
||||
else if ($this.hasClass('cp-app-drive-context-open')) {
|
||||
paths.forEach(function (p) {
|
||||
var $element = p.element;
|
||||
$element.click();
|
||||
$element.dblclick();
|
||||
});
|
||||
}
|
||||
else if ($(this).hasClass('cp-app-drive-context-openro')) {
|
||||
else if ($this.hasClass('cp-app-drive-context-openro')) {
|
||||
paths.forEach(function (p) {
|
||||
var el = manager.find(p.path);
|
||||
if (paths[0].path[0] === SHARED_FOLDER && APP.newSharedFolder) {
|
||||
@@ -3531,10 +3680,10 @@ define([
|
||||
openFile(null, href);
|
||||
});
|
||||
}
|
||||
else if ($(this).hasClass('cp-app-drive-context-expandall') ||
|
||||
$(this).hasClass('cp-app-drive-context-collapseall')) {
|
||||
else if ($this.hasClass('cp-app-drive-context-expandall') ||
|
||||
$this.hasClass('cp-app-drive-context-collapseall')) {
|
||||
if (paths.length !== 1) { return; }
|
||||
var opened = $(this).hasClass('cp-app-drive-context-expandall');
|
||||
var opened = $this.hasClass('cp-app-drive-context-expandall');
|
||||
var openRecursive = function (path) {
|
||||
setFolderOpened(path, opened);
|
||||
var folderContent = manager.find(path);
|
||||
@@ -3557,16 +3706,49 @@ define([
|
||||
openRecursive(paths[0].path);
|
||||
refresh();
|
||||
}
|
||||
else if ($(this).hasClass('cp-app-drive-context-download')) {
|
||||
|
||||
else if ($this.hasClass('cp-app-drive-context-download')) {
|
||||
if (paths.length !== 1) { return; }
|
||||
el = manager.find(paths[0].path);
|
||||
data = manager.getFileData(el);
|
||||
APP.FM.downloadFile(data, function (err, obj) {
|
||||
console.log(err, obj);
|
||||
console.log('DONE');
|
||||
});
|
||||
var path = paths[0];
|
||||
el = manager.find(path.path);
|
||||
// folder
|
||||
if (manager.isFolder(el)) {
|
||||
// folder
|
||||
var name, folderEl;
|
||||
if (!manager.isSharedFolder(el)) {
|
||||
name = path.path[path.path.length - 1];
|
||||
folderEl = el;
|
||||
downloadFolder(folderEl, name);
|
||||
}
|
||||
// shared folder
|
||||
else {
|
||||
data = manager.getSharedFolderData(el);
|
||||
name = data.title;
|
||||
folderEl = manager.find(path.path.concat("root"));
|
||||
downloadFolder(folderEl, name, el);
|
||||
}
|
||||
}
|
||||
// file
|
||||
else if (manager.isFile(el)) {
|
||||
// imported file
|
||||
if (path.element.is(".cp-border-color-file")) {
|
||||
data = manager.getFileData(el);
|
||||
APP.FM.downloadFile(data, function (err, obj) {
|
||||
console.log(err, obj);
|
||||
console.log('DONE');
|
||||
});
|
||||
}
|
||||
// pad
|
||||
else {
|
||||
data = manager.getFileData(el);
|
||||
APP.FM.downloadPad(data, function (err, obj) {
|
||||
console.log(err, obj);
|
||||
console.log('DONE');
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
else if ($(this).hasClass('cp-app-drive-context-share')) {
|
||||
else if ($this.hasClass('cp-app-drive-context-share')) {
|
||||
if (paths.length !== 1) { return; }
|
||||
el = manager.find(paths[0].path);
|
||||
var parsed, modal;
|
||||
@@ -3617,7 +3799,7 @@ define([
|
||||
wide: Object.keys(friends).length !== 0
|
||||
});
|
||||
}
|
||||
else if ($(this).hasClass('cp-app-drive-context-newfolder')) {
|
||||
else if ($this.hasClass('cp-app-drive-context-newfolder')) {
|
||||
if (paths.length !== 1) { return; }
|
||||
var onFolderCreated = function (err, info) {
|
||||
if (err) { return void logError(err); }
|
||||
@@ -3630,21 +3812,21 @@ define([
|
||||
}
|
||||
manager.addFolder(paths[0].path, null, onFolderCreated);
|
||||
}
|
||||
else if ($(this).hasClass('cp-app-drive-context-newsharedfolder')) {
|
||||
else if ($this.hasClass('cp-app-drive-context-newsharedfolder')) {
|
||||
if (paths.length !== 1) { return; }
|
||||
addSharedFolderModal(function (obj) {
|
||||
if (!obj) { return; }
|
||||
manager.addSharedFolder(paths[0].path, obj, refresh);
|
||||
});
|
||||
}
|
||||
else if ($(this).hasClass("cp-app-drive-context-newdoc")) {
|
||||
var ntype = $(this).data('type') || 'pad';
|
||||
else if ($this.hasClass("cp-app-drive-context-newdoc")) {
|
||||
var ntype = $this.data('type') || 'pad';
|
||||
var path2 = manager.isPathIn(currentPath, [TRASH]) ? '' : currentPath;
|
||||
common.sessionStorage.put(Constants.newPadPathKey, path2, function () {
|
||||
common.openURL('/' + ntype + '/');
|
||||
});
|
||||
}
|
||||
else if ($(this).hasClass("cp-app-drive-context-properties")) {
|
||||
else if ($this.hasClass("cp-app-drive-context-properties")) {
|
||||
if (type === 'trash') {
|
||||
var pPath = paths[0].path;
|
||||
if (paths.length !== 1 || pPath.length !== 4) { return; }
|
||||
@@ -3664,7 +3846,7 @@ define([
|
||||
UI.alert($prop[0], undefined, true);
|
||||
});
|
||||
}
|
||||
else if ($(this).hasClass("cp-app-drive-context-hashtag")) {
|
||||
else if ($this.hasClass("cp-app-drive-context-hashtag")) {
|
||||
if (paths.length !== 1) { return; }
|
||||
el = manager.find(paths[0].path);
|
||||
data = manager.getFileData(el);
|
||||
@@ -3672,7 +3854,7 @@ define([
|
||||
var href = data.href || data.roHref;
|
||||
common.updateTags(href);
|
||||
}
|
||||
else if ($(this).hasClass("cp-app-drive-context-empty")) {
|
||||
else if ($this.hasClass("cp-app-drive-context-empty")) {
|
||||
if (paths.length !== 1 || !paths[0].element
|
||||
|| !manager.comparePath(paths[0].path, [TRASH])) {
|
||||
log(Messages.fm_forbidden);
|
||||
@@ -3683,13 +3865,13 @@ define([
|
||||
manager.emptyTrash(refresh);
|
||||
});
|
||||
}
|
||||
else if ($(this).hasClass("cp-app-drive-context-remove")) {
|
||||
else if ($this.hasClass("cp-app-drive-context-remove")) {
|
||||
return void deletePaths(paths);
|
||||
}
|
||||
else if ($(this).hasClass("cp-app-drive-context-removesf")) {
|
||||
else if ($this.hasClass("cp-app-drive-context-removesf")) {
|
||||
return void deletePaths(paths);
|
||||
}
|
||||
else if ($(this).hasClass("cp-app-drive-context-restore")) {
|
||||
else if ($this.hasClass("cp-app-drive-context-restore")) {
|
||||
if (paths.length !== 1) { return; }
|
||||
var restorePath = paths[0].path;
|
||||
var restoreName = paths[0].path[paths[0].path.length - 1];
|
||||
@@ -3706,21 +3888,20 @@ define([
|
||||
manager.restore(restorePath, refresh);
|
||||
});
|
||||
}
|
||||
else if ($(this).hasClass("cp-app-drive-context-openparent")) {
|
||||
else if ($this.hasClass("cp-app-drive-context-openparent")) {
|
||||
if (paths.length !== 1) { return; }
|
||||
var parentPath = paths[0].path.slice();
|
||||
if (manager.isInTrashRoot(parentPath)) { parentPath = [TRASH]; }
|
||||
else { parentPath.pop(); }
|
||||
el = manager.find(paths[0].path);
|
||||
APP.selectedFiles = [el];
|
||||
APP.displayDirectory(parentPath);
|
||||
APP.selectedFiles = paths[0].path.slice(-1);
|
||||
}
|
||||
APP.hideMenu();
|
||||
});
|
||||
|
||||
$content.on("keydown", function (e) {
|
||||
if (e.which === 113) {
|
||||
var paths = $contextMenu.data('paths');
|
||||
$(window).on("keydown", function (e) {
|
||||
if (e.which === 113) { // if F2 key pressed
|
||||
var paths = getSelectedPaths(findSelectedElements().first());
|
||||
if (paths.length !== 1) { return; }
|
||||
displayRenameInput(paths[0].element, paths[0].path);
|
||||
}
|
||||
@@ -3732,10 +3913,9 @@ define([
|
||||
e.preventDefault();
|
||||
});
|
||||
$appContainer.on('mouseup', function (e) {
|
||||
//if (sel.down) { return; }
|
||||
if (e.which !== 1) { return ; }
|
||||
if ($(e.target).is(".dropdown-submenu a, .dropdown-submenu a span")) { return; } // if we click on dropdown-submenu, don't close menu
|
||||
APP.hideMenu(e);
|
||||
//removeSelected(e);
|
||||
});
|
||||
$appContainer.on('click', function (e) {
|
||||
if (e.which !== 1) { return ; }
|
||||
@@ -3754,7 +3934,7 @@ define([
|
||||
if (manager.isPathIn(currentPath, [FILES_DATA]) && APP.loggedIn) {
|
||||
return; // We can't remove elements directly from filesData
|
||||
}
|
||||
var $selected = $('.cp-app-drive-element-selected');
|
||||
var $selected = findSelectedElements();
|
||||
if (!$selected.length) { return; }
|
||||
var paths = [];
|
||||
var isTrash = manager.isPathIn(currentPath, [TRASH]);
|
||||
|
||||
Reference in New Issue
Block a user