From 179251a59542dc424e2cc5753231e7f9ea1d0a9c Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Thu, 7 Dec 2023 14:26:21 +0800
Subject: [PATCH] Fix bug

---
 app/build.gradle                 |  2 +-
 app/src/main/assets/index.html   | 34 +++++++++-----------------------
 app/src/main/assets/js/script.js | 20 ++++++++++---------
 3 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3f6f45ccd..19122aa2e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdk 21
         targetSdk 28
         versionCode 210
-        versionName "20231207"
+        versionName "20231207#2"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html
index 13eed00b3..8fc1dabcc 100644
--- a/app/src/main/assets/index.html
+++ b/app/src/main/assets/index.html
@@ -112,31 +112,15 @@
             </div>
         </div>
     </div>
-    <div id="fileInfoDialog" role="dialog" aria-modal="false" aria-hidden="true" style="display: none;">
-        <div role="button" class="weui-mask"></div>
-        <div class="weui-half-screen-dialog">
-            <div class="weui-half-screen-dialog__hd">
-                <div class="weui-half-screen-dialog__hd__main">本地網址</div>
-            </div>
-            <div class="weui-half-screen-dialog__bd" id="fileInfo">
-                <div class="weui-form__control-area" style="margin-bottom: 0px !important;">
-                    <div class="weui-cells__group weui-cells__group_form">
-                        <div class="weui-cells">
-                            <div class="weui-cell weui-cell_active weui-cell_vcode weui-cell_wrap">
-                                <div class="weui-cell__bd weui-flex">
-                                    <input id="fileUrl" class="weui-input weui-cell__control weui-cell__control_flex" type="text" value="" readonly />
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="weui-half-screen-dialog__ft" style="padding-bottom: 30px;">
-                <div class="weui-half-screen-dialog__btn-area">
-                    <a href="javascript:void(0)" class="weui-btn weui-btn_default" onclick="pushFile()">使用</a>
-                    <a href="javascript:void(0)" class="weui-btn weui-btn_default" onclick="hideFileInfo()">關閉</a>
-                    <a href="javascript:void(0)" id="delFileBtn" class="weui-btn weui-btn_warn" onclick="delFile()">刪除</a>
-                </div>
+    <div role="dialog" aria-hidden="true" aria-modal="true" id="fileInfoDialog" style="display: none;">
+        <div class="weui-mask"></div>
+        <div class="weui-dialog">
+            <div class="weui-dialog__hd"><strong class="weui-dialog__title">本地路徑</strong></div>
+            <div class="weui-dialog__bd" id="fileUrl"></div>
+            <div class="weui-dialog__ft">
+                <a role="button" href="javascript:void(0)" onclick="pushFile(0)" class="weui-dialog__btn weui-dialog__btn_default">關閉</a>
+                <a role="button" href="javascript:void(0)" onclick="pushFile(1)" class="weui-dialog__btn weui-dialog__btn_primary">使用</a>
+                <a role="button" href="javascript:void(0)" onclick="delFile()" class="weui-dialog__btn weui-dialog__btn_primary" id="delFileBtn">刪除</a>
             </div>
         </div>
     </div>
diff --git a/app/src/main/assets/js/script.js b/app/src/main/assets/js/script.js
index 176ee1f7f..192893e68 100644
--- a/app/src/main/assets/js/script.js
+++ b/app/src/main/assets/js/script.js
@@ -13,7 +13,7 @@ function push() {
 }
 
 function setting() {
-    doAction('setting', { url: $('#setting_text').val() });
+    doAction('setting', { text: $('#setting_text').val() });
 }
 
 function file(path) {
@@ -73,13 +73,15 @@ function selectFile(path, canDel) {
     current_file = path;
     if (canDel) $("#delFileBtn").show();
     else $("#delFileBtn").hide();
-    $("#fileUrl")[0].value = "file:/" + current_file;
+    $("#fileUrl").html("file:/" + current_file);
     $("#fileInfoDialog").show();
 }
 
-function pushFile() {
-    file("file:/" + current_file);
+function pushFile(yes) {
     hideFileInfo();
+    if (yes == 1) {
+        file("file:/" + current_file);
+    }
 }
 
 function hideFileInfo() {
@@ -124,7 +126,7 @@ function uploadFile() {
 }
 
 function uploadTip() {
-    let files = $('#file_uploader')[0].files;
+    let files = $('#file_uploader').files;
     if (files.length <= 0) return false;
     let tip = '';
     for (var i = 0; i < files.length; i++) {
@@ -138,7 +140,7 @@ function uploadTip() {
 function doUpload(yes) {
     $('#uploadTip').hide();
     if (yes == 1) {
-        let files = $('#file_uploader')[0].files;
+        let files = $('#file_uploader').files;
         if (files.length <= 0) return false;
         var formData = new FormData();
         formData.append('path', current_root);
@@ -167,7 +169,7 @@ function newFolder() {
 function doNewFolder(yes) {
     $('#newFolder').hide();
     if (yes == 1) {
-        let name = $('#newFolderContent')[0].value.trim();
+        let name = $('#newFolderContent').value.trim();
         if (name.length <= 0) return false;
         $('#loadingToast').show();
         $.post('/newFolder', { path: current_root, name: '' + name }, function (data) {
@@ -194,9 +196,9 @@ function doDelFolder(yes) {
 }
 
 function delFile() {
-    hideFileInfo();
     $('#delFileContent').html('是否刪除 ' + current_file);
     $('#delFile').show();
+    hideFileInfo();
 }
 
 function doDelFile(yes) {
@@ -219,7 +221,7 @@ function warnToast(msg) {
 }
 
 function showPanel(id) {
-    let tab = $('#tab' + id)[0];
+    let tab = $('#tab' + id);
     $(tab).attr('aria-selected', 'true').addClass('weui-bar__item_on');
     $(tab).siblings('.weui-bar__item_on').removeClass('weui-bar__item_on').attr('aria-selected', 'false');
     var panelId = '#' + $(tab).attr('aria-controls');