Forráskód Böngészése

Updated File Manager to support new url shortcut display method

Toby Chui 3 éve
szülő
commit
e120317832
1 módosított fájl, 15 hozzáadás és 2 törlés
  1. 15 2
      web/SystemAO/file_system/file_explorer.html

+ 15 - 2
web/SystemAO/file_system/file_explorer.html

@@ -1803,7 +1803,12 @@
                         var displayName = JSON.parse(JSON.stringify(filename));
                         if (ext == "shortcut"){
                             //This is a shortcut file. Treat it specially
-                            imagePath = "../../" + icon;
+                            if (icon.includes("http://") || icon.includes("https://")){
+                                //Direct path. Do not add relative prefix
+                                imagePath = icon;
+                            }else{
+                                imagePath = "../../" + icon;
+                            }
                             displayName = files[i].Shortcut.Name;
                             ext = files[i].Shortcut.Type;
                             ext = ext.charAt(0).toUpperCase() + ext.slice(1);
@@ -3061,7 +3066,15 @@
                             listDirectory(shortcutInfo[2]);
                         }else if (shortcutInfo[0] == "url"){
                             //This is a url shortcut
-                            window.open(shortcutInfo[2]);
+                            //Update 2020_02-03: Open with floatWindow instead
+                            parent.newFloatWindow({
+                                url: shortcutInfo[2],
+                                appicon: shortcutInfo[3],
+                                title: shortcutInfo[1],
+                                parent: shortcutInfo[2]
+                            })
+
+                            //window.open(shortcutInfo[2]);
                         }
                         console.log(shortcutInfo);
                     });