@ -281,56 +281,90 @@ define([
// Replace a file/folder name by an input to change its value
// Replace a file/folder name by an input to change its value
var displayRenameInput = function ( $element , path ) {
var displayRenameInput = function ( $element , path ) {
if ( ! APP . editable ) { return ; }
// NOTE: setTimeout(f, 0) otherwise the "rename" button in the toolbar is not working
if ( ! path || path . length < 2 ) {
window . setTimeout ( function ( ) {
logError ( "Renaming a top level element (root, trash or filesData) is forbidden." ) ;
if ( ! APP . editable ) { return ; }
return ;
if ( ! path || path . length < 2 ) {
}
logError ( "Renaming a top level element (root, trash or filesData) is forbidden." ) ;
removeInput ( ) ;
return ;
removeSelected ( ) ;
var $name = $element . find ( '.name' ) ;
if ( ! $name . length ) {
$name = $element . find ( '.element' ) ;
}
$name . hide ( ) ;
var name = path [ path . length - 1 ] ;
var $input = $ ( '<input>' , {
placeholder : name ,
value : name
} ) ;
$input . on ( 'keyup' , function ( e ) {
if ( e . which === 13 ) {
removeInput ( ) ;
filesOp . renameElement ( path , $input . val ( ) , function ( ) {
refresh ( ) ;
} ) ;
}
}
} ) ;
removeInput ( ) ;
//$element.parent().append($input);
$name . after ( $input ) ;
$input . focus ( ) ;
$input . select ( ) ;
// We don't want to open the file/folder when clicking on the input
$input . on ( 'click dblclick' , function ( e ) {
removeSelected ( ) ;
removeSelected ( ) ;
e . stopPropagation ( ) ;
var $name = $element . find ( '.name' ) ;
} ) ;
if ( ! $name . length ) {
// Remove the browser ability to drag text from the input to avoid
$name = $element . find ( '.element' ) ;
// triggering our drag/drop event handlers
}
$input . on ( 'dragstart dragleave drag drop' , function ( e ) {
$name . hide ( ) ;
e . preventDefault ( ) ;
var name = path [ path . length - 1 ] ;
e . stopPropagation ( ) ;
var $input = $ ( '<input>' , {
} ) ;
placeholder : name ,
// Make the parent element non-draggable when selecting text in the field
value : name
// since it would remove the input
} ) ;
$input . on ( 'mousedown' , function ( e ) {
$input . on ( 'keyup' , function ( e ) {
e . stopPropagation ( ) ;
if ( e . which === 13 ) {
$input . parents ( 'li' ) . attr ( "draggable" , false ) ;
removeInput ( ) ;
} ) ;
filesOp . renameElement ( path , $input . val ( ) , function ( ) {
$input . on ( 'mouseup' , function ( e ) {
refresh ( ) ;
e . stopPropagation ( ) ;
} ) ;
$input . parents ( 'li' ) . attr ( "draggable" , true ) ;
}
} ) ;
} ) ;
//$element.parent().append($input);
$name . after ( $input ) ;
$input . focus ( ) ;
$input . select ( ) ;
// 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
// triggering our drag/drop event handlers
$input . on ( 'dragstart dragleave drag drop' , function ( e ) {
e . preventDefault ( ) ;
e . stopPropagation ( ) ;
} ) ;
// Make the parent element non-draggable when selecting text in the field
// since it would remove the input
$input . on ( 'mousedown' , function ( e ) {
e . stopPropagation ( ) ;
$input . parents ( 'li' ) . attr ( "draggable" , false ) ;
} ) ;
$input . on ( 'mouseup' , function ( e ) {
e . stopPropagation ( ) ;
$input . parents ( 'li' ) . attr ( "draggable" , true ) ;
} ) ;
} , 0 ) ;
} ;
var filterContextMenu = function ( $menu , $element ) {
var path = $element . data ( 'path' ) ;
var hide = [ ] ;
if ( ! APP . editable ) {
hide . push ( $menu . find ( 'a.editable' ) ) ;
}
if ( ! isOwnDrive ( ) ) {
hide . push ( $menu . find ( 'a.own' ) ) ;
}
if ( $element . is ( '.file-element' ) ) {
hide . push ( $menu . find ( 'a.newfolder' ) ) ;
} else {
hide . push ( $menu . find ( 'a.open_ro' ) ) ;
}
if ( path && path . length > 4 ) {
hide . push ( $menu . find ( 'a.restore' ) ) ;
hide . push ( $menu . find ( 'a.properties' ) ) ;
}
return hide ;
} ;
var updatePathSize = function ( ) {
var $context = $iframe . find ( '#contextButtonsContainer' ) ;
var l = 50 ;
if ( $context . length ) {
l += $context . width ( ) || 0 ;
}
$driveToolbar . find ( '.path' ) . css ( 'max-width' , 'calc(100vw - ' + $tree . width ( ) + 'px - ' + l + 'px)' ) ;
} ;
} ;
var updateContextButton = function ( ) {
var updateContextButton = function ( ) {
@ -339,21 +373,55 @@ define([
$li = $tree . find ( '.element.active' ) . closest ( 'li' ) ;
$li = $tree . find ( '.element.active' ) . closest ( 'li' ) ;
}
}
var $button = $driveToolbar . find ( '#contextButton' ) ;
var $button = $driveToolbar . find ( '#contextButton' ) ;
if ( $li . length !== 1
if ( $button . length ) { // mobile
|| ! $ . _data ( $li [ 0 ] , 'events' ) . contextmenu
if ( $li . length !== 1
|| $ . _data ( $li [ 0 ] , 'events' ) . contextmenu . length === 0 ) {
|| ! $ . _data ( $li [ 0 ] , 'events' ) . contextmenu
$button . hide ( ) ;
|| $ . _data ( $li [ 0 ] , 'events' ) . contextmenu . length === 0 ) {
$button . hide ( ) ;
return ;
}
$button . show ( ) ;
$button . css ( {
background : '#000'
} ) ;
window . setTimeout ( function ( ) {
$button . css ( {
background : ''
} ) ;
} , 500 ) ;
return ;
return ;
}
}
$button . show ( ) ;
// Non mobile
$button . css ( {
var $container = $driveToolbar . find ( '#contextButtonsContainer' ) ;
background : '#000'
if ( ! $container . length ) { return ; }
$container . html ( '' ) ;
var $element = $li ;
var $menu = $element . data ( 'context' ) ;
var path = $element . data ( 'path' ) ;
if ( ! $menu || ! path ) { return ; }
var actions = [ ] ;
var $actions = $menu . find ( 'a' ) ;
var toHide = filterContextMenu ( $menu , $element ) ;
$actions = $actions . filter ( function ( i , el ) {
for ( var j = 0 ; j < toHide . length ; j ++ ) {
if ( $ ( el ) . is ( toHide [ j ] ) ) { return false ; } ;
}
return true ;
} ) ;
} ) ;
window . setTimeout ( function ( ) {
$actions . each ( function ( i , el ) {
$button . css ( {
var $a = $ ( '<button>' , { 'class' : 'element' } ) ;
background : ''
if ( $ ( el ) . attr ( 'data-icon' ) ) {
} ) ;
$a . addClass ( 'fa' ) . addClass ( $ ( el ) . attr ( 'data-icon' ) ) ;
} , 500 ) ;
$a . attr ( 'title' , $ ( el ) . text ( ) ) ;
} else {
$a . text ( $ ( el ) . text ( ) ) ;
}
$ ( el ) . data ( 'path' , path ) ;
$ ( el ) . data ( 'element' , $element ) ;
$container . append ( $a ) ;
$a . click ( function ( ) { $ ( el ) . click ( ) ; } ) ;
} ) ;
updatePathSize ( ) ;
} ;
} ;
// Add the "selected" class to the "li" corresponding to the clicked element
// Add the "selected" class to the "li" corresponding to the clicked element
@ -384,15 +452,21 @@ define([
module . hideMenu ( ) ;
module . hideMenu ( ) ;
e . stopPropagation ( ) ;
e . stopPropagation ( ) ;
var path = $ ( e . target ) . closest ( 'li' ) . data ( 'path' ) ;
var $element = $ ( e . target ) . closest ( 'li' ) ;
if ( ! $element . length ) {
logError ( "Unable to locate the .element tag" , e . target ) ;
$menu . hide ( ) ;
log ( Messages . fm _contextMenuError ) ;
return false ;
}
var path = $element . data ( 'path' ) ;
if ( ! path ) { return false ; }
if ( ! path ) { return false ; }
if ( ! APP . editable ) {
var toHide = filterContextMenu ( $menu , $element ) ;
$menu . find ( 'a.editable' ) . parent ( 'li' ) . hide ( ) ;
toHide . forEach ( function ( $a ) {
}
$a . parent ( 'li' ) . hide ( ) ;
if ( ! isOwnDrive ( ) ) {
} ) ;
$menu . find ( 'a.own' ) . parent ( 'li' ) . hide ( ) ;
}
$menu . css ( {
$menu . css ( {
display : "block" ,
display : "block" ,
@ -406,45 +480,27 @@ define([
return true ;
return true ;
}
}
// $element should be the <li class="element">
var $element = $ ( e . target ) . closest ( 'li' ) ;
onElementClick ( undefined , $element ) ;
onElementClick ( undefined , $element ) ;
if ( ! $element . length ) {
logError ( "Unable to locate the .element tag" , e . target ) ;
$menu . hide ( ) ;
log ( Messages . fm _contextMenuError ) ;
return false ;
}
$menu . find ( 'a' ) . data ( 'path' , path ) ;
$menu . find ( 'a' ) . data ( 'path' , path ) ;
$menu . find ( 'a' ) . data ( 'element' , $element ) ;
$menu . find ( 'a' ) . data ( 'element' , $element ) ;
return false ;
return false ;
} ;
} ;
var openDirectoryContextMenu = function ( e ) {
var openDirectoryContextMenu = function ( e ) {
var $element = $ ( e . target ) . closest ( 'li' ) ;
$contextMenu . find ( 'li' ) . show ( ) ;
$contextMenu . find ( 'li' ) . show ( ) ;
if ( $element . is ( '.file-element' ) ) {
$contextMenu . find ( 'a.newfolder' ) . parent ( 'li' ) . hide ( ) ;
} else {
$contextMenu . find ( 'a.open_ro' ) . parent ( 'li' ) . hide ( ) ;
}
openContextMenu ( e , $contextMenu ) ;
openContextMenu ( e , $contextMenu ) ;
return false ;
return false ;
} ;
} ;
var openDefaultContextMenu = function ( e ) {
var openDefaultContextMenu = function ( e ) {
var $element = $ ( e . target ) . closest ( 'li' ) ;
$defaultContextMenu . find ( 'li' ) . show ( ) ;
$defaultContextMenu . find ( 'li' ) . show ( ) ;
if ( $element . is ( '.file-element' ) ) {
$defaultContextMenu . find ( 'a.newfolder' ) . parent ( 'li' ) . hide ( ) ;
} else {
$defaultContextMenu . find ( 'a.open_ro' ) . parent ( 'li' ) . hide ( ) ;
}
openContextMenu ( e , $defaultContextMenu ) ;
openContextMenu ( e , $defaultContextMenu ) ;
return false ;
return false ;
} ;
} ;
var openTrashTreeContextMenu = function ( e ) {
var openTrashTreeContextMenu = function ( e ) {
$trashTreeContextMenu . find ( 'li' ) . show ( ) ;
openContextMenu ( e , $trashTreeContextMenu ) ;
openContextMenu ( e , $trashTreeContextMenu ) ;
return false ;
return false ;
} ;
} ;
@ -453,10 +509,6 @@ define([
var path = $ ( e . target ) . closest ( 'li' ) . data ( 'path' ) ;
var path = $ ( e . target ) . closest ( 'li' ) . data ( 'path' ) ;
if ( ! path ) { return ; }
if ( ! path ) { return ; }
$trashContextMenu . find ( 'li' ) . show ( ) ;
$trashContextMenu . find ( 'li' ) . show ( ) ;
if ( path . length > 4 ) {
$trashContextMenu . find ( 'a.restore' ) . parent ( 'li' ) . hide ( ) ;
$trashContextMenu . find ( 'a.properties' ) . parent ( 'li' ) . hide ( ) ;
}
openContextMenu ( e , $trashContextMenu ) ;
openContextMenu ( e , $trashContextMenu ) ;
return false ;
return false ;
} ;
} ;
@ -752,8 +804,10 @@ define([
} ) ;
} ) ;
if ( ! isTrash ) {
if ( ! isTrash ) {
$element . contextmenu ( openDirectoryContextMenu ) ;
$element . contextmenu ( openDirectoryContextMenu ) ;
$element . data ( 'context' , $contextMenu ) ;
} else {
} else {
$element . contextmenu ( openTrashContextMenu ) ;
$element . contextmenu ( openTrashContextMenu ) ;
$element . data ( 'context' , $trashContextMenu ) ;
}
}
var isNewFolder = module . newFolder && filesOp . comparePath ( newPath , module . newFolder ) ;
var isNewFolder = module . newFolder && filesOp . comparePath ( newPath , module . newFolder ) ;
if ( isNewFolder ) {
if ( isNewFolder ) {
@ -914,16 +968,11 @@ define([
}
}
AppConfig . availablePadTypes . forEach ( function ( type ) {
AppConfig . availablePadTypes . forEach ( function ( type ) {
if ( type === 'drive' ) { return ; }
if ( type === 'drive' ) { return ; }
var path = filesOp . isPathInTrash ( currentPath ) ? '' : '/#?path=' + encodeURIComponent ( currentPath ) ;
var attributes = {
var attributes = {
'class' : 'newdoc' ,
'class' : 'newdoc' ,
'data-type' : type
'data-type' : type ,
'href' : '#'
} ;
} ;
// In root, do not redirect instantly, but ask for a name first. Cf handlers below
if ( ! isInRoot ) {
attributes . href = '/' + type + path ;
attributes . target = '_blank' ;
}
options . push ( {
options . push ( {
tag : 'a' ,
tag : 'a' ,
attributes : attributes ,
attributes : attributes ,
@ -953,6 +1002,12 @@ define([
var name = Cryptpad . getDefaultName ( { type : type } ) ;
var name = Cryptpad . getDefaultName ( { type : type } ) ;
filesOp . createNewFile ( currentPath , name , type , onCreated ) ;
filesOp . createNewFile ( currentPath , name , type , onCreated ) ;
} ) ;
} ) ;
} else {
$block . find ( 'a.newdoc' ) . click ( function ( e ) {
var type = $ ( this ) . attr ( 'data-type' ) || 'pad' ;
sessionStorage [ Cryptpad . newPadPathKey ] = filesOp . isPathInTrash ( currentPath ) ? '' : currentPath ;
window . open ( '/' + type + '/' ) ;
} ) ;
}
}
return $block ;
return $block ;
@ -1202,6 +1257,7 @@ define([
onElementClick ( e , $element , path ) ;
onElementClick ( e , $element , path ) ;
} ) ;
} ) ;
$element . contextmenu ( openDefaultContextMenu ) ;
$element . contextmenu ( openDefaultContextMenu ) ;
$element . data ( 'context' , $defaultContextMenu ) ;
if ( draggable ) {
if ( draggable ) {
addDragAndDropHandlers ( $element , path , false , false ) ;
addDragAndDropHandlers ( $element , path , false , false ) ;
}
}
@ -1231,6 +1287,7 @@ define([
onElementClick ( e , $element ) ;
onElementClick ( e , $element ) ;
} ) ;
} ) ;
$element . contextmenu ( openDefaultContextMenu ) ;
$element . contextmenu ( openDefaultContextMenu ) ;
$element . data ( 'context' , $defaultContextMenu ) ; // TODO: hide the "delete" link in that context menu
$container . append ( $element ) ;
$container . append ( $element ) ;
} ) ;
} ) ;
} ;
} ;
@ -1328,6 +1385,7 @@ define([
var $modeButton = createViewModeButton ( ) . appendTo ( $toolbar . find ( '.rightside' ) ) ;
var $modeButton = createViewModeButton ( ) . appendTo ( $toolbar . find ( '.rightside' ) ) ;
var $title = createTitle ( path ) . appendTo ( $toolbar . find ( '.rightside' ) ) ;
var $title = createTitle ( path ) . appendTo ( $toolbar . find ( '.rightside' ) ) ;
updatePathSize ( ) ;
if ( APP . mobile ( ) ) {
if ( APP . mobile ( ) ) {
var $context = $ ( '<button>' , { 'class' : 'element right dropdown-bar' , id : 'contextButton' } ) ;
var $context = $ ( '<button>' , { 'class' : 'element right dropdown-bar' , id : 'contextButton' } ) ;
@ -1352,6 +1410,9 @@ define([
} ) ;
} ) ;
$li . contextmenu ( ) ;
$li . contextmenu ( ) ;
} ) ;
} ) ;
} else {
var $contextButtons = $ ( '<span>' , { 'id' : 'contextButtonsContainer' } ) ;
$contextButtons . appendTo ( $toolbar . find ( '.rightside' ) ) ;
}
}
updateContextButton ( ) ;
updateContextButton ( ) ;
@ -1589,6 +1650,14 @@ define([
return base + viewHash ;
return base + viewHash ;
} ;
} ;
// Disable middle click in the context menu to avoid opening /drive/inner.html# in new tabs
$ ( ifrw ) . click ( function ( e ) {
if ( e . which !== 3 ) {
e . stopPropagation ( ) ;
return false ;
}
} ) ;
$contextMenu . on ( "click" , "a" , function ( e ) {
$contextMenu . on ( "click" , "a" , function ( e ) {
e . stopPropagation ( ) ;
e . stopPropagation ( ) ;
var path = $ ( this ) . data ( 'path' ) ;
var path = $ ( this ) . data ( 'path' ) ;
@ -1820,6 +1889,7 @@ define([
if ( APP . resizeTree ) { return ; }
if ( APP . resizeTree ) { return ; }
APP . resizeTree = window . setInterval ( function ( ) {
APP . resizeTree = window . setInterval ( function ( ) {
$driveToolbar . find ( '.leftside' ) . width ( $tree . width ( ) ) ;
$driveToolbar . find ( '.leftside' ) . width ( $tree . width ( ) ) ;
updatePathSize ( ) ;
} , 100 ) ;
} , 100 ) ;
} ) ;
} ) ;
$ ( ifrw ) . mouseup ( function ( e ) {
$ ( ifrw ) . mouseup ( function ( e ) {
ansuz
8 years ago