Merge pull request #630 from Peergos/fix/updates-and-fixes

updates and fixes
Peergos · Oct 25, 2024 · ae2ea76 · ae2ea76
2 parents 952ddd1 + 737f018
commit ae2ea76
Show file tree

Hide file tree

Showing 9 changed files with 2,712 additions and 11 deletions.
diff --git a/assets/apps/markup-viewer/purify.min.js b/assets/apps/markup-viewer/purify.min.js
diff --git a/assets/apps/markup-viewer/purify.min.js.map b/assets/apps/markup-viewer/purify.min.js.map
diff --git a/assets/apps/markup-viewer/toastui-editor-viewer.js b/assets/apps/markup-viewer/toastui-editor-viewer.js
@@ -10183,7 +10183,7 @@ var baseConvertors = {
     image: function (node, _a) {
         var getChildrenText = _a.getChildrenText, skipChildren = _a.skipChildren;
         var _b = node, title = _b.title, destination = _b.destination;
-        if (!destination.startsWith('/')) {
+        if (!destination.startsWith('/') && !destination.startsWith('data:image/')) {
             destination = _a.options.subPath + '/' + destination;
         }
         skipChildren();

diff --git a/assets/apps/sandbox/purify.min.js b/assets/apps/sandbox/purify.min.js
diff --git a/assets/apps/sandbox/purify.min.js.map b/assets/apps/sandbox/purify.min.js.map
diff --git a/src/i18n/en-GB.js b/src/i18n/en-GB.js
@@ -354,7 +354,6 @@ module.exports = {
     "VERIFY.VERIFIED":"Verified",
     "VERIFY.UNVERIFIED":"Unverified",
     "LAUNCHER.CUSTOM":"Custom Apps",
-    "LAUNCHER.RECOMMENDED":"Recommended Apps",
     "LAUNCHER.UPDATE":"Check for Updates",
     "LAUNCHER.NONE":"No Custom Apps currently installed.  Create an App from the 'create app' menu item of the green plus.",
     "LAUNCHER.SHORTCUTS":"Shortcuts",

diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js
@@ -337,7 +337,6 @@ module.exports = {
     "VERIFY.VERIFIED":"已验证",
     "VERIFY.UNVERIFIED":"未验证",
     "LAUNCHER.CUSTOM":"定制应用程序",
-    "LAUNCHER.RECOMMENDED":"推荐的应用程序",
     "LAUNCHER.UPDATE":"检查更新",
     "LAUNCHER.NONE":"当前没有安装自定义应用程序。从绿色加号的“创建应用程序”菜单项创建应用程序。",
     "LAUNCHER.SHORTCUTS":"快捷方式",

diff --git a/src/views/Drive.vue b/src/views/Drive.vue
@@ -2735,7 +2735,7 @@ module.exports = {
                     let userApps = this.availableAppsForFile(file);
                     var args = {filename:filename}
                     this.appArgs = args;
-                    if (userApps.length == 1) {
+                    if (userApps.length == 1 && app != "editor") {
                         this.openFileOrDir(userApps[0].name, this.getPath, args, writable);
                     } else {
                         if (recommendedApp != null) {

diff --git a/src/views/Launcher.vue b/src/views/Launcher.vue
@@ -78,8 +78,11 @@
                 <li id='open-in-app' style="padding-bottom: 5px;color: black;" v-for="app in availableApps" v-on:keyup.enter="appOpen($event, app.name, app.path, app.file)" v-on:click="appOpen($event, app.name, app.path, app.file)">{{app.contextMenuText}}</li>
             </ul>
             <div>
-                <h3>{{ translate("LAUNCHER.CUSTOM") }}
-                    <button class="btn btn-success" @click="navigateToRecommendedApps()" style="margin-left: 10px;">{{ translate("LAUNCHER.RECOMMENDED") }}</button>
+                <h3>
+                    <button class="btn btn-success" @click="navigateToRecommendedApps()" style="margin-left: 10px;">
+                        <svg class="white-svg" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M1728 1098q0 81-44.5 135t-123.5 54q-41 0-77.5-17.5t-59-38-56.5-38-71-17.5q-110 0-110 124 0 39 16 115t15 115v5q-22 0-33 1-34 3-97.5 11.5t-115.5 13.5-98 5q-61 0-103-26.5t-42-83.5q0-37 17.5-71t38-56.5 38-59 17.5-77.5q0-79-54-123.5t-135-44.5q-84 0-143 45.5t-59 127.5q0 43 15 83t33.5 64.5 33.5 53 15 50.5q0 45-46 89-37 35-117 35-95 0-245-24-9-2-27.5-4t-27.5-4l-13-2q-1 0-3-1-2 0-2-1v-1024q2 1 17.5 3.5t34 5 21.5 3.5q150 24 245 24 80 0 117-35 46-44 46-89 0-22-15-50.5t-33.5-53-33.5-64.5-15-83q0-82 59-127.5t144-45.5q80 0 134 44.5t54 123.5q0 41-17.5 77.5t-38 59-38 56.5-17.5 71q0 57 42 83.5t103 26.5q64 0 180-15t163-17v2q-1 2-3.5 17.5t-5 34-3.5 21.5q-24 150-24 245 0 80 35 117 44 46 89 46 22 0 50.5-15t53-33.5 64.5-33.5 83-15q82 0 127.5 59t45.5 143z"/></svg>
+                        {{ translate("LAUNCHER.CUSTOM") }}
+                        </button>
                     <button class="btn btn-info" @click="checkForAppUpdates()" style="margin-left: 10px;">{{ translate("LAUNCHER.UPDATE") }}</button>
                     <span style="margin-left: 40px;">{{updateMessage}}</span>
                 </h3>
@@ -1092,4 +1095,10 @@ module.exports = {
 .deleted-entry {
     text-decoration: line-through;
 }
+.white-svg {
+    margin-bottom: -6px;
+    height: 24px;
+    width: 24px;
+    filter: invert(100%) sepia(100%) saturate(0%) hue-rotate(347deg) brightness(109%) contrast(101%);
+}
 </style>