浏览代码

Fixed mount logic error in new fsh creation

Toby Chui 2 年之前
父节点
当前提交
98b350dfae
共有 2 个文件被更改,包括 32 次插入3 次删除
  1. 1 1
      mod/filesystem/config.go
  2. 31 2
      web/Browser/index.html

+ 1 - 1
mod/filesystem/config.go

@@ -66,7 +66,7 @@ func ValidateOption(options *FileSystemOption) error {
 	}
 	}
 
 
 	//Check if mount point exists
 	//Check if mount point exists
-	if options.Mountpt != "" && !arozfs.IsNetworkDrive(options.Filesystem) {
+	if options.Automount && options.Mountpt == "" && !arozfs.IsNetworkDrive(options.Filesystem) {
 		return errors.New("Mount point cannot be empty")
 		return errors.New("Mount point cannot be empty")
 	}
 	}
 
 

+ 31 - 2
web/Browser/index.html

@@ -166,7 +166,12 @@
 				<div id="downloadDropper" allowdrop="true" ondrop="drop(event)" ondragstart="return false;" onclick="event.preventDefault(); openURLEnter();" ondblclick="event.preventDefault();event.stopImmediatePropagation();" ondragover="allowDrop(event);" draggable="false">
 				<div id="downloadDropper" allowdrop="true" ondrop="drop(event)" ondragstart="return false;" onclick="event.preventDefault(); openURLEnter();" ondblclick="event.preventDefault();event.stopImmediatePropagation();" ondragover="allowDrop(event);" draggable="false">
 					<p style="margin-top: 3em;">Drop a link, image into this area; or click this area to enter a URL for download</p>
 					<p style="margin-top: 3em;">Drop a link, image into this area; or click this area to enter a URL for download</p>
 				</div>
 				</div>
+				<div class="ui action fluid input" id="iframeMode" style="display:none;">
+					<input type="text" id="manualInputURL" placeholder="Copy link here to download">
+					<button class="ui icon green basic button" onclick="downloadFromManualInputURL();"><i class="ui download icon"></i></button>
+				</div>
 			</div>
 			</div>
+			
 			<div class="ui divider"></div>
 			<div class="ui divider"></div>
 			<p>Downloaded Files</p>
 			<p>Downloaded Files</p>
 			<div class="ui list" id="downloadList" style="min-height: 300px;">
 			<div class="ui list" id="downloadList" style="min-height: 300px;">
@@ -225,6 +230,11 @@
 				downloadToFile(url);
 				downloadToFile(url);
 			}
 			}
 
 
+			function downloadFromManualInputURL(){
+				var url = $("#manualInputURL").val();
+				downloadToFile(url);
+			}
+
 			function downloadToFile(downloadURL){
 			function downloadToFile(downloadURL){
 				downloadPendingURL = downloadURL;
 				downloadPendingURL = downloadURL;
 				selectSaveLocation();
 				selectSaveLocation();
@@ -302,6 +312,16 @@
 				ao_module_openPath(filepath, filename);
 				ao_module_openPath(filepath, filename);
 			}
 			}
 
 
+			function allowDragAndDrop(enable=false){
+				if(enable){
+					$("#downloadDropper").show();
+					$("#iframeMode").hide();
+				}else{
+					$("#downloadDropper").hide();
+					$("#iframeMode").show();
+				}
+			}
+
 
 
 
 
 			//Check if currently under vdi mode
 			//Check if currently under vdi mode
@@ -315,16 +335,22 @@
 
 
 			function toggleBookmark(object){
 			function toggleBookmark(object){
 				$(".sidebar:not(#bookmarkbar)").hide();
 				$(".sidebar:not(#bookmarkbar)").hide();
+				var isVisable = $("#bookmarkbar").is(":visible")
 				$("#bookmarkbar").fadeToggle('fast');
 				$("#bookmarkbar").fadeToggle('fast');
 				$(".sidebarToggle.selected").removeClass("selected");
 				$(".sidebarToggle.selected").removeClass("selected");
-				$(object).addClass('selected');
+				if (!isVisable){
+					$(object).addClass('selected');
+				}
 			}
 			}
 
 
 			function toggleDownloadManager(object){
 			function toggleDownloadManager(object){
 				$(".sidebar:not(#downloadManager)").hide();
 				$(".sidebar:not(#downloadManager)").hide();
+				var isVisable = $("#downloadManager").is(":visible")
 				$("#downloadManager").fadeToggle('fast');
 				$("#downloadManager").fadeToggle('fast');
 				$(".sidebarToggle.selected").removeClass("selected");
 				$(".sidebarToggle.selected").removeClass("selected");
-				$(object).addClass('selected');
+				if (!isVisable){
+					$(object).addClass('selected');
+				}
 			}
 			}
 
 
 			//Perform window resize element size calculation
 			//Perform window resize element size calculation
@@ -402,6 +428,7 @@
 						historyStack.push(JSON.parse(JSON.stringify(currentURL)));
 						historyStack.push(JSON.parse(JSON.stringify(currentURL)));
 					}
 					}
 					currentURL = targetURL;
 					currentURL = targetURL;
+					allowDragAndDrop(false);
 					return;
 					return;
 				}
 				}
 
 
@@ -436,6 +463,7 @@
 						$("#xframe").attr("src", "notfound.html#" + targetURL);
 						$("#xframe").attr("src", "notfound.html#" + targetURL);
 					}else{
 					}else{
 						if (allowIframe == true){
 						if (allowIframe == true){
+							allowDragAndDrop(false);
 							$("#xframe").removeAttr("srcdoc");
 							$("#xframe").removeAttr("srcdoc");
 							$("#xframe").attr("src", targetURL);
 							$("#xframe").attr("src", targetURL);
 							$("#toolbar").removeClass("proxy");
 							$("#toolbar").removeClass("proxy");
@@ -454,6 +482,7 @@
 								$("#xframe").off("load");
 								$("#xframe").off("load");
 							});
 							});
 						}else{
 						}else{
+							allowDragAndDrop(true);
 							proxyWebContent(targetURL, function(content){
 							proxyWebContent(targetURL, function(content){
 								$("#xframe").attr("src", "");
 								$("#xframe").attr("src", "");
 								$("#xframe").attr("srcdoc", content);
 								$("#xframe").attr("srcdoc", content);