From 7883bb10c0a6703f1cab88be1b164e8e35c88a93 Mon Sep 17 00:00:00 2001 From: Isabelle Vallet <isabelle.vallet@nexedi.com> Date: Tue, 2 Feb 2016 08:21:58 -0800 Subject: [PATCH] OfficeJS drive: Fix unecessary line and add message errors for cd/ls 'commands'. --- .../gadget_officejs_drive_page_browse_js.xml | 56 ++++++++++--------- ...fficejs_drive_page_browse_storage_html.xml | 3 +- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git 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 index 7668c438d2..b25c2b6d51 100644 --- 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 - case \'cd\':\n - case \'ls\':\n - if (args.length === 1) {\n - return gadget.redirect({\n - position: absolutePosition(gadget.props.currentPosition, args[0])\n - });\n - }\n - throw (\'Usage of \' + command + \' requires a single argument.\');\n + try {\n + switch (command) {\n + case \'cd\':\n + if (args.length === 1) {\n + return gadget.redirect({\n + position: absolutePosition(gadget.props.currentPosition, args[0])\n + });\n + }\n + throw new Error(\'Usage of \' + command + \' requires a single argument.\');\n \n - case \'vim\':\n - case \'vi\':\n - if (args.length === 1) {\n - return gadget.redirect({\n - page: \'edit\',\n - position: absolutePosition(\n - gadget.props.currentPosition,\n - position.join(\'/\')\n - ),\n - resource: resource\n - });\n + case \'vim\':\n + case \'vi\':\n + if (args.length === 1) {\n + return gadget.redirect({\n + page: \'edit\',\n + position: absolutePosition(\n + gadget.props.currentPosition,\n + position.join(\'/\')\n + ),\n + resource: resource\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 - default:\n - throw (\'Unknown command: \' + command);\n - }\n + } catch (e) {\n + gadget.props.element.querySelector(\'.error\').textContent = e.name +\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 diff --git 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 index 1bca9014ad..73c19fb10c 100644 --- 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 -- 2.30.9