src/core/routes/Routes.py

@@ -17,10 +17,7 @@ window_controllers = {}
 
 
 def get_window_controller():
-    controller = None
+    if session.get('win_controller_id') is None:
-    try:
-        controller = window_controllers[ session["win_controller_id"]  ]
-    except Exception as e:
         id         = secrets.token_hex(16)
         controller = WindowController()
         view       = controller.get_window(1).get_view(0)
@@ -31,9 +28,8 @@ def get_window_controller():
 
         session['win_controller_id'] = id
         window_controllers.update( {id: controller } )
-        controller = window_controllers[ session["win_controller_id"]  ]
 
-    return controller
+    return window_controllers[ session["win_controller_id"]  ]
 
 
 @app.route('/', methods=['GET', 'POST'])
@@ -72,12 +68,6 @@ def listFiles(_hash = None):
             path = view.get_path_part_from_hash(_hash)
             view.push_to_path(path)
 
-        error_msg = view.get_error_message()
-        if  error_msg != None:
-            view.unset_error_message()
-            return msgHandler.createMessageJSON("danger", error_msg)
-
-
         sub_path = view.get_current_sub_path()
         files    = view.get_files_formatted()
         fave     = db.session.query(Favorites).filter_by(link = sub_path).first()

src/core/static/css/main.css

@@ -27,7 +27,7 @@
 
 #video-controls {
     position: relative;
-    bottom: 2.5em;
+    bottom: 2em;
 }
 
 
@@ -38,19 +38,6 @@
 	scrollbar-width: thin;
 }
 
-.noselect {
-  -webkit-touch-callout: none; /* iOS Safari */
-    -webkit-user-select: none; /* Safari */
-     -khtml-user-select: none; /* Konqueror HTML */
-       -moz-user-select: none; /* Old versions of Firefox */
-        -ms-user-select: none; /* Internet Explorer/Edge */
-            user-select: none; /* Non-prefixed version, currently
-                                  supported by Chrome, Edge, Opera and Firefox */
-}
-
-
-
-
 .volume-control-positioner {
     position: absolute;
     bottom: 2em;

src/core/static/js/events.js

@@ -29,10 +29,7 @@ const loadFavePath = (e) => {
 }
 
 const openFile = (eve) => {
-    let target = eve.target;
+    const target    = eve.target;
-    if (!target.getAttribute("title"))
-        target = target.parentElement
-
     const ftype     = target.getAttribute("ftype");
     const title     = target.getAttribute("title");
     const hash      = target.getAttribute("hash");

src/core/static/js/react-ui-logic.js

@@ -78,14 +78,13 @@ class FilesList extends React.Component {
                     <div class="card">
                         <div class="card-header">
                             {card_header}
+                            <input hash={hash} onClick={this.openThis} ftype={filetype} class="btn btn-secondary btn-sm float-right" title={name} type="button" value="Open"/>
                         </div>
-                        <div class="card-body text-center noselect" title={name} hash={hash} ftype={filetype} onDoubleClick={this.openThis}>
+                        <div class="card-body text-center">
                             {card_body}
                         </div>
                         <div class="card-footer">
-                            <a href={"api/file-manager-action/files/" + hash} download class="btn btn-secondary btn-sm float-left">Download</a>
+                            <input hash={hash} onClick={this.openThisLocally} ftype={filetype} class="btn btn-secondary btn-sm float-right" type="button" value="Open Locally"/>
-                            <input hash={hash} onClick={this.openThisLocally} ftype={filetype} class="btn btn-secondary btn-sm float-left" type="button" value="Open Locally"/>
-                            <input hash={hash} onClick={this.openThis} ftype={filetype} class="btn btn-secondary btn-sm float-right" title={name} type="button" value="Open"/>
                         </div>
                     </div>
                 </li>

src/core/utils/shellfm/windows/View.py

@@ -9,8 +9,8 @@ from os.path import isdir, isfile, join
 
 
 # Application imports
-from .utils import Settings, Launcher
+from . import Path, Settings, Launcher
-from . import Path
+
 
 class View(Settings, Launcher, Path):
     def __init__(self):
@@ -20,7 +20,6 @@ class View(Settings, Launcher, Path):
         self.images    = []
         self.desktop   = []
         self.ungrouped = []
-        self.error_message = None
 
         self.set_to_home()
 
@@ -34,7 +33,7 @@ class View(Settings, Launcher, Path):
         self.files     = []
 
         if not isdir(path):
-            self._set_error_message("Path can not be accessed.")
+            self.set_to_home()
             return ""
 
         for f in listdir(path):
@@ -121,15 +120,6 @@ class View(Settings, Launcher, Path):
             return False
 
 
-    def _set_error_message(self, text):
-        self.error_message = text
-
-    def unset_error_message(self):
-        self.error_message = None
-
-    def get_error_message(self):
-        return self.error_message
-
     def get_current_directory(self):
         return self.get_path()