From 093b03e8ab5a4c8d9ad4499ce72d55e845353aa3 Mon Sep 17 00:00:00 2001 From: alokhyland Date: Wed, 11 Sep 2024 10:10:42 +0530 Subject: [PATCH] WEBUI-1579,1282,1575,1580 : csp changes --- addons/nuxeo-csv/elements/nuxeo-document-import-csv.js | 5 +++-- .../elements/nuxeo-liveconnect-box-link.js | 5 +++-- .../elements/nuxeo-liveconnect-google-drive-link.js | 5 +++-- addons/nuxeo-spreadsheet/webpack.config.js | 5 +++++ elements/nuxeo-selection/nuxeo-selection-toolbar.js | 10 ++++++---- elements/workflow/nuxeo-document-task.js | 5 +++-- package.json | 1 + .../src/main/resources/web/nuxeo.war/ui/index.jsp | 10 +++++----- 8 files changed, 29 insertions(+), 17 deletions(-) diff --git a/addons/nuxeo-csv/elements/nuxeo-document-import-csv.js b/addons/nuxeo-csv/elements/nuxeo-document-import-csv.js index beb8e5ae1d..67d312373a 100644 --- a/addons/nuxeo-csv/elements/nuxeo-document-import-csv.js +++ b/addons/nuxeo-csv/elements/nuxeo-document-import-csv.js @@ -276,7 +276,7 @@ Polymer({ @@ -581,7 +581,8 @@ Polymer({ } }, - _showUploadDialog() { + _showUploadDialog(e) { + e.preventDefault(); this.$.uploadFiles.click(); }, diff --git a/addons/nuxeo-liveconnect/elements/nuxeo-liveconnect-box-link.js b/addons/nuxeo-liveconnect/elements/nuxeo-liveconnect-box-link.js index 8802d63579..19ed50997c 100644 --- a/addons/nuxeo-liveconnect/elements/nuxeo-liveconnect-box-link.js +++ b/addons/nuxeo-liveconnect/elements/nuxeo-liveconnect-box-link.js @@ -64,7 +64,7 @@ Polymer({ is-available="{{isProviderAvailable}}" > - [[i18n('tasks.viewGraph')]] + [[i18n('tasks.viewGraph')]]
[[i18n(tasks.directive)]]
@@ -314,7 +314,8 @@ Polymer({ .finally(() => this._setProcessing(false)); }, - _toggleGraphDialog() { + _toggleGraphDialog(e) { + e.preventDefault(); this.$.graph.show(); }, diff --git a/package.json b/package.json index ef94f66456..fe87c09f8c 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "expose-loader": "^1.0.1", "glob": "^7.1.3", "html-loader": "^1.3.2", + "html-webpack-inject-attributes-plugin": "^1.0.6", "html-webpack-plugin": "^5.6.0", "http-server": "^0.11.1", "husky": "^4.2.3", diff --git a/plugin/web-ui/addon/src/main/resources/web/nuxeo.war/ui/index.jsp b/plugin/web-ui/addon/src/main/resources/web/nuxeo.war/ui/index.jsp index c23574fec6..718c2f0751 100644 --- a/plugin/web-ui/addon/src/main/resources/web/nuxeo.war/ui/index.jsp +++ b/plugin/web-ui/addon/src/main/resources/web/nuxeo.war/ui/index.jsp @@ -98,15 +98,15 @@ limitations under the License. - + - + - + - + - +