OfficeJS drive: Fix unecessary line and add message errors for cd/ls 'commands'.

7883bb10 · iv · 409c5988 · 7883bb10 · 7883bb10
Commit 7883bb10 authored Feb 02, 2016 by iv
2 changed files
--- a/bt5/erp5_officejs_drive/PathTemplateItem/web_page_module/gadget_officejs_drive_page_browse_js.xml
+++ b/bt5/erp5_officejs_drive/PathTemplateItem/web_page_module/gadget_officejs_drive_page_browse_js.xml
@@ -167,32 +167,37 @@
 \n
      // if command given: proceed\n
      if (command) {\n
-        switch (command) {\n
+        try {\n
-        case \'cd\':\n
+          switch (command) {\n
-        case \'ls\':\n
+          case \'cd\':\n
-          if (args.length === 1) {\n
+            if (args.length === 1) {\n
-            return gadget.redirect({\n
+              return gadget.redirect({\n
-              position: absolutePosition(gadget.props.currentPosition, args[0])\n
+                position: absolutePosition(gadget.props.currentPosition, args[0])\n
-            });\n
+              });\n
-          }\n
+            }\n
-          throw (\'Usage of \' + command + \' requires a single argument.\');\n
+            throw new Error(\'Usage of \' + command + \' requires a single argument.\');\n
 \n
-        case \'vim\':\n
+          case \'vim\':\n
-        case \'vi\':\n
+          case \'vi\':\n
-          if (args.length === 1) {\n
+            if (args.length === 1) {\n
-            return gadget.redirect({\n
+              return gadget.redirect({\n
-              page: \'edit\',\n
+                page: \'edit\',\n
-              position: absolutePosition(\n
+                position: absolutePosition(\n
-                gadget.props.currentPosition,\n
+                  gadget.props.currentPosition,\n
-                position.join(\'/\')\n
+                  position.join(\'/\')\n
-              ),\n
+                ),\n
-              resource: resource\n
+                resource: resource\n
-            });\n
+              });\n
+            }\n
+            throw new Error(\'Usage of \' + command + \' requires a single argument.\');\n
+          default:\n
+            throw new Error(\'Unknown command: \' + command);\n
          }\n
-          throw (\'Usage of \' + command + \' requires a single argument.\');\n
+        } catch (e) {\n
-        default:\n
+          gadget.props.element.querySelector(\'.error\').textContent = e.name +\n
-          throw (\'Unknown command: \' + command);\n
+                                                                       ": " +\n
-        }\n
+                                                                       e.message;\n
+        }
      }\n
    })\n
 \n
@@ -208,7 +213,6 @@
      }\n
      gadget.props.currentPosition = options.position;\n
      gadget.props.element.querySelector(\'input\').value = \'\';\n
-      gadget.props.element.querySelector(\'.position\').value = options.position;\n
 \n
      // clean previous ul children\n
      while (ul.hasChildNodes()) {\n
@@ -230,7 +234,7 @@
                liContent = document.createElement(\'a\');\n
 \n
                liContent.setAttribute(\'href\', \'#page=edit&resource=\' +\n
-                                  key + \'&position=\' + options.position);\n
+                                       key + \'&position=\' + options.position);\n
                liContent.appendChild(resourceName);\n
              } else {\n
                liContent = resourceName;\n

--- a/bt5/erp5_officejs_drive/PathTemplateItem/web_page_module/gadget_officejs_drive_page_browse_storage_html.xml
+++ b/bt5/erp5_officejs_drive/PathTemplateItem/web_page_module/gadget_officejs_drive_page_browse_storage_html.xml
@@ -134,8 +134,9 @@
  <body>\n
    <h1>Super OfficeJS Drive</h1>\n
    <form>\n
-    position: <input type="text" name="position">\n
+    <input type="text">\n
    </form>\n
+    <div><a class="error"></a></div>\n
    <ul>\n
    </ul>\n
  </body>\n