From d1b86f23947bc4976d8b6d81a2177d6af5cafd63 Mon Sep 17 00:00:00 2001
From: alokhyland <139326173+alokhyland@users.noreply.github.com>
Date: Wed, 30 Oct 2024 19:09:19 +0530
Subject: [PATCH] Revert "WEBUI-1579,1282,1575,1580 : csp change"
This reverts commit 811a2916989335f63fdcccf185ae974d7411ef2a.
---
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, 17 insertions(+), 29 deletions(-)
diff --git a/addons/nuxeo-csv/elements/nuxeo-document-import-csv.js b/addons/nuxeo-csv/elements/nuxeo-document-import-csv.js
index 67d312373a..beb8e5ae1d 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,8 +581,7 @@ Polymer({
}
},
- _showUploadDialog(e) {
- e.preventDefault();
+ _showUploadDialog() {
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 19ed50997c..8802d63579 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('liveconnectImportActions.box', 'Box')]]
@@ -78,8 +78,7 @@ Polymer({
this.$.provider.updateProviderInfo();
},
- _openPicker(e) {
- e.preventDefault();
+ _openPicker() {
this.$.provider.openPicker();
},
});
diff --git a/addons/nuxeo-liveconnect/elements/nuxeo-liveconnect-google-drive-link.js b/addons/nuxeo-liveconnect/elements/nuxeo-liveconnect-google-drive-link.js
index 5f342a0c9b..efbc2d8b24 100644
--- a/addons/nuxeo-liveconnect/elements/nuxeo-liveconnect-google-drive-link.js
+++ b/addons/nuxeo-liveconnect/elements/nuxeo-liveconnect-google-drive-link.js
@@ -64,7 +64,7 @@ Polymer({
is-available="{{isProviderAvailable}}"
>
-
+
[[i18n('liveconnectImportActions.googledrive', 'Google Drive')]]
@@ -78,8 +78,7 @@ Polymer({
this.$.provider.updateProviderInfo();
},
- _openPicker(e) {
- e.preventDefault();
+ _openPicker() {
this.$.provider.openPicker();
},
});
diff --git a/addons/nuxeo-spreadsheet/webpack.config.js b/addons/nuxeo-spreadsheet/webpack.config.js
index b12b542a71..e9ec5aad6a 100644
--- a/addons/nuxeo-spreadsheet/webpack.config.js
+++ b/addons/nuxeo-spreadsheet/webpack.config.js
@@ -1,7 +1,6 @@
const { resolve } = require('path');
const { ProvidePlugin } = require('webpack');
const HtmlWebpackPlugin = require('html-webpack-plugin');
-const htmlWebpackInjectAttributesPlugin = require('html-webpack-inject-attributes-plugin');
module.exports = {
entry: {
@@ -17,9 +16,5 @@ module.exports = {
chunks: ['spreadsheet.app'],
template: resolve(__dirname, 'app', 'index.html'),
}),
- /* eslint-disable-next-line new-cap */
- new htmlWebpackInjectAttributesPlugin({
- nonce: 'dummy',
- }),
],
};
diff --git a/elements/nuxeo-selection/nuxeo-selection-toolbar.js b/elements/nuxeo-selection/nuxeo-selection-toolbar.js
index c686f2b58a..f941faeecc 100644
--- a/elements/nuxeo-selection/nuxeo-selection-toolbar.js
+++ b/elements/nuxeo-selection/nuxeo-selection-toolbar.js
@@ -112,7 +112,7 @@ Polymer({
[[i18n('selectionToolbar.selected.items', selectedItems.length)]]
-
+
[[i18n('selectionToolbar.display.selection')]]
@@ -121,7 +121,7 @@ Polymer({
[[i18n('selectionToolbar.selected.all', _resultsCount)]]
-
+
[[i18n('command.clear')]]
@@ -188,13 +188,11 @@ Polymer({
this.hidden = !this.selectedItems || this.selectedItems.length === 0;
},
- toogleSelectedItemsPopup(e) {
- e.preventDefault();
+ toogleSelectedItemsPopup() {
this.$$('#selectedItemsPopup').toggle();
},
- clearSelection(e) {
- e.preventDefault();
+ clearSelection() {
this.fire('clear-selected-items');
},
});
diff --git a/elements/workflow/nuxeo-document-task.js b/elements/workflow/nuxeo-document-task.js
index 28a6e35a20..139fe72f40 100644
--- a/elements/workflow/nuxeo-document-task.js
+++ b/elements/workflow/nuxeo-document-task.js
@@ -158,7 +158,7 @@ Polymer({
- [[i18n('tasks.viewGraph')]]
+ [[i18n('tasks.viewGraph')]]
[[i18n(tasks.directive)]]
@@ -314,8 +314,7 @@ Polymer({
.finally(() => this._setProcessing(false));
},
- _toggleGraphDialog(e) {
- e.preventDefault();
+ _toggleGraphDialog() {
this.$.graph.show();
},
diff --git a/package.json b/package.json
index 02640aace8..a5884f071e 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,6 @@
"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 718c2f0751..c23574fec6 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.
-
+
-
+
-
+
-
+
-
+