diff --git a/access.lua b/access.lua index f47ef87..6aaad1f 100644 --- a/access.lua +++ b/access.lua @@ -306,11 +306,11 @@ end -- function scandir(directory, callback) - local i, popen = 0, io.popen + -- FIXME : this sometime fails (randomly...) + -- because of 'interrupted system call' -- use find (and not ls) to list only files recursively and with their full path relative to the asked directory - local pfile = popen('cd "'..directory..'" && find * -type f') + local pfile = io.popen('cd "'..directory..'" && find * -type f') for filename in pfile:lines() do - i = i + 1 callback(filename) end pfile:close() diff --git a/portal/assets/js/ynhpanel.js b/portal/assets/js/ynhpanel.js index 3369950..c5ba413 100644 --- a/portal/assets/js/ynhpanel.js +++ b/portal/assets/js/ynhpanel.js @@ -257,6 +257,7 @@ function init_portal_button_and_overlay() // Inject portal stylesheet // (we need it for the portal button to be displayed correctly) + // FIXME : Really wondering if we shouldn't set this in data/templates/nginx/plain/yunohost_panel.conf.inc ... var portalStyle = document.createElement("link"); portalStyle.setAttribute("rel", "stylesheet"); portalStyle.setAttribute("type", "text/css"); @@ -276,8 +277,9 @@ function init_portal_button_and_overlay() // Bind portal button // FIXME : this somehow prevent the portalButton - // from being dragged correctly - // when mouse is moving too fast + // from being dragged correctly when mouse is moving too fast + // ... this seem to be okay in the "app" itself, but the bug + // is happening when *in* the portal overlay inside an app... window.addEvent(portalButton, 'click', function(e){ // Prevent default click window.eventPreventDefault(e);