This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 99f5790000 ISIS-3071: exclude new workaround script from yuicompressor
(does not seem to know what to do with it)
99f5790000 is described below
commit 99f5790000b126c702b757cc80418f5c154c7ee5
Author: Andi Huber <[email protected]>
AuthorDate: Fri Nov 11 13:15:26 2022 +0100
ISIS-3071: exclude new workaround script from yuicompressor (does not
seem to know what to do with it)
---
core/pom.xml | 1 +
.../widgets/fileinput/file-upload-nesting-fix.js | 49 +++++++++-------------
2 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 5461667e77..e585ec7453 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -341,6 +341,7 @@
<excludes>
<!-- -->
<exclude>**/jquery.causeway.wicket.viewer.js</exclude>
+
<exclude>**/file-upload-nesting-fix.js</exclude>
<!-- select 2 -->
<exclude>**/i18n/*.js</exclude>
<exclude>**/select2*.js</exclude>
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/fileinput/file-upload-nesting-fix.js
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/fileinput/file-upload-nesting-fix.js
index 417ccf947e..34a54864be 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/fileinput/file-upload-nesting-fix.js
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/fileinput/file-upload-nesting-fix.js
@@ -1,39 +1,30 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
*/
/*ISIS-3071 file-input nesting issue*/
-let scalarFrames = document
- .querySelectorAll("span.uploadFile");
+let scalarFrames = document.querySelectorAll("span.uploadFile");
scalarFrames.forEach((scalarFrame) => {
- window.console.log("found outer frame" + scalarFrame);
-
- let fileInputFrames = scalarFrame
- .querySelectorAll("div.file-input-ajax-new");
-
+ let fileInputFrames =
scalarFrame.querySelectorAll("div.file-input-ajax-new");
let isNested = fileInputFrames.length>1;
-
- /* replace the outermost with the innermost*/
+ /* replace the outermost with the innermost */
if(isNested) {
let outermost = fileInputFrames[0];
let innermost = fileInputFrames[fileInputFrames.length-1];
outermost.parentNode.replaceChild(innermost, outermost);
}
-});
-
-
-
+})
\ No newline at end of file