|
@@ -1999,8 +1999,8 @@
|
|
var lastClickedFileID = 0;
|
|
var lastClickedFileID = 0;
|
|
function bindFileObjectEvents(){
|
|
function bindFileObjectEvents(){
|
|
$(".fileObject").off("click").on('click',function(evt){
|
|
$(".fileObject").off("click").on('click',function(evt){
|
|
- if (!ctrlHold && isMobile){
|
|
|
|
- //If on mobile, click means open
|
|
|
|
|
|
+ if (!ctrlHold && isMobile && !ctrlHold){
|
|
|
|
+ //If on mobile, click means open (only on not muilti selection mode)
|
|
openthis(this,evt);
|
|
openthis(this,evt);
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -2419,6 +2419,7 @@
|
|
|
|
|
|
shiftHold = false;
|
|
shiftHold = false;
|
|
ctrlHold = false;
|
|
ctrlHold = false;
|
|
|
|
+ updateCtrlDisplay();
|
|
let currentScrollTop = JSON.parse(JSON.stringify($("#folderView").scrollTop()));
|
|
let currentScrollTop = JSON.parse(JSON.stringify($("#folderView").scrollTop()));
|
|
listDirectory(currentPath, function(){
|
|
listDirectory(currentPath, function(){
|
|
//Scroll back to the original height
|
|
//Scroll back to the original height
|
|
@@ -3927,8 +3928,10 @@
|
|
}
|
|
}
|
|
if(event.which==17 || event.which == 91){
|
|
if(event.which==17 || event.which == 91){
|
|
ctrlHold = true;
|
|
ctrlHold = true;
|
|
|
|
+ updateCtrlDisplay();
|
|
}else if (event.which == 16){
|
|
}else if (event.which == 16){
|
|
shiftHold = true;
|
|
shiftHold = true;
|
|
|
|
+ updateCtrlDisplay();
|
|
}else if (event.which == 67 && ctrlHold == true){
|
|
}else if (event.which == 67 && ctrlHold == true){
|
|
//Ctrl + C
|
|
//Ctrl + C
|
|
if (!$(".popup").is(":visible")){
|
|
if (!$(".popup").is(":visible")){
|
|
@@ -4027,6 +4030,7 @@
|
|
$(document).keyup(function(event){
|
|
$(document).keyup(function(event){
|
|
if(event.which==17 || event.which == 91){
|
|
if(event.which==17 || event.which == 91){
|
|
ctrlHold = false;
|
|
ctrlHold = false;
|
|
|
|
+ updateCtrlDisplay();
|
|
}else if (event.which == 16){
|
|
}else if (event.which == 16){
|
|
shiftHold = false;
|
|
shiftHold = false;
|
|
}
|
|
}
|
|
@@ -4037,6 +4041,7 @@
|
|
$(".fileObject.selected").removeClass("selected");
|
|
$(".fileObject.selected").removeClass("selected");
|
|
shiftHold = false;
|
|
shiftHold = false;
|
|
ctrlHold = false;
|
|
ctrlHold = false;
|
|
|
|
+ updateCtrlDisplay();
|
|
});
|
|
});
|
|
|
|
|
|
//Check if localstorage is availble
|
|
//Check if localstorage is availble
|
|
@@ -4992,6 +4997,18 @@
|
|
|
|
|
|
function toggleCtrl(){
|
|
function toggleCtrl(){
|
|
ctrlHold = !ctrlHold;
|
|
ctrlHold = !ctrlHold;
|
|
|
|
+ updateCtrlDisplay();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ function updateCtrlDisplay(){
|
|
|
|
+ if (isMobile){
|
|
|
|
+ //Change color of the navibar based on selection mode
|
|
|
|
+ if (ctrlHold){
|
|
|
|
+ $("#navibar").css("border-bottom","2px solid #6c06ba");
|
|
|
|
+ }else{
|
|
|
|
+ $("#navibar").css("border-bottom","2px solid #34b7eb");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
function getUploadTaskByID(taskUUID){
|
|
function getUploadTaskByID(taskUUID){
|