fix not working navigation in filemanager mobile: using et2-vfs-path …

…not et2-vfs-name not allowing /
EGroupware · Sep 26, 2024 · e0814c6 · e0814c6
1 parent 7171683
commit e0814c6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/filemanager/templates/mobile/app.css b/filemanager/templates/mobile/app.css
@@ -67,15 +67,16 @@
   }
   #filemanager-index_nm .nextmatch_header .filemanager_navigation {
     height: auto;
+    width: 100%;
   }
-  #filemanager-index_nm .nextmatch_header .filemanager_navigation #filemanager-index_path {
+  #filemanager-index_nm .nextmatch_header .filemanager_navigation #filemanager-index_nm_path {
     height: 50px;
     width: calc(100% - 90px);
     display: inline-block;
     border: none;
     background: white;
   }
-  #filemanager-index_nm .nextmatch_header .filemanager_navigation #filemanager-index_path:focus {
+  #filemanager-index_nm .nextmatch_header .filemanager_navigation #filemanager-index_nm_path:focus {
     outline: none;
   }
   #filemanager-index_nm .nextmatch_header .filemanager_navigation #filemanager-index_up {

diff --git a/filemanager/templates/mobile/app.less b/filemanager/templates/mobile/app.less
@@ -65,15 +65,21 @@
 			.nextmatch_header_row {padding-bottom:0px;}
 			.filemanager_navigation {
 				height: auto;
-				#filemanager-index_path {
+				width: 100%;
+				#filemanager-index_nm_path {
 					height:50px;
 					width:~"calc(100% - 90px)";
 					display: inline-block;
 					border: none;
 					&:focus {outline: none;}
 					background: white;
 				}
-				#filemanager-index_up {width:24px;height: 100%;margin-left:22px;margin-right:22px;}
+				#filemanager-index_up {
+					width:24px;
+					height: 100%;
+					margin-left:22px;
+					margin-right:22px;
+				}
 			}
 			div.filtersContainer {margin-top:0px;border-bottom: 1px solid silver;}
 			#filemanager-index_new_wrapper {

diff --git a/filemanager/templates/mobile/index.xet b/filemanager/templates/mobile/index.xet
@@ -18,12 +18,12 @@
 						<et2-vfs-mime  align="center" id="$row"></et2-vfs-mime>
 					</et2-vbox>
 					<et2-vbox>
-						<vfs-name id="${row}[name]" no_lang="1" readonly="true"/>
+						<et2-vfs-name id="${row}[name]" readonly="true"/>
 						<et2-description  id="${row}[comment]"></et2-description>
 					</et2-vbox>
 					<et2-vbox>
 						<vfs-size align="right" id="${row}[size]"/>
-						<et2-date-time-today  id="${row}[mtime]" readonly="true"></et2-date-time-today>
+						<et2-date-time-today id="${row}[mtime]"></et2-date-time-today>
 					</et2-vbox>
 				</row>
 			</rows>
@@ -46,10 +46,10 @@
 	<template id="filemanager.index.header_left" template="" lang="" group="0" version="1.9.002">
 		<et2-hbox  span="all" class="filemanager_navigation">
 			<et2-hbox>
-				<et2-image  label="Up" src="goup" onclick="app.filemanager.change_dir('..',widget);" id="up"></et2-image>
+				<et2-image  label="Up" src="goup" onclick="app.filemanager.change_dir('..',widget);" id="up" style="font-size: 28px"></et2-image>
 			</et2-hbox>
-			<et2-vfs-name id="path" onchange="if(widget.getValue() == '') { app.filemanager.change_dir('~',widget);} return true;" size="80" class="address"/>
-			<file label="" statustext="Select file to upload in current directory" class="plus_button" id="upload" progress_dropdownlist = "true" drop_target ="divAppbox" multiple="true" onFinishOne="app.filemanager.uploadOnOne"/>
+			<et2-vfs-path id="path" onchange="if(widget.getValue() == '') { app.filemanager.change_dir('~',widget);} return true;" class="address"/>
+			<file label="" statustext="Select file to upload in current directory" class="plus_button" id="upload" progress_dropdownlist="true" drop_target="divAppbox" multiple="true" onFinishOne="app.filemanager.uploadOnOne"/>
 		</et2-hbox>
 	</template>
 	<template id="filemanager.index" template="" lang="" group="0" version="1.9.003">

diff --git a/pixelegg/js/fw_mobile.js b/pixelegg/js/fw_mobile.js
@@ -1054,7 +1054,7 @@ import {tapAndSwipe} from "../../api/js/tapandswipe";
 			// Update selection counter in nm header
 			if (_widget._type == 'nextmatch' && _widget.getSelection().ids.length > 0)
 			{
-				if (senders && senders[0].actionLinks)
+				if (senders && senders[0]?.actionLinks)
 				{
 					var delete_action = null;
 					for (var i=0; i< senders[0].actionLinks.length;i++)