-
Notifications
You must be signed in to change notification settings - Fork 59
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
FORMS-13470: Added the marker interface for Modal.
- Loading branch information
Showing
8 changed files
with
219 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 37 additions & 1 deletion
38
...e/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ModalImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,38 @@ | ||
| package com.adobe.cq.forms.core.components.internal.models.v1.form;public class ModalImpl { | ||
| /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| ~ Copyright 2024 Adobe | ||
| ~ | ||
| ~ Licensed 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. | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ | ||
|
|
||
| package com.adobe.cq.forms.core.components.internal.models.v1.form; | ||
|
|
||
| import org.apache.sling.api.SlingHttpServletRequest; | ||
| import org.apache.sling.api.resource.Resource; | ||
| import org.apache.sling.models.annotations.Exporter; | ||
| import org.apache.sling.models.annotations.Model; | ||
|
|
||
| import com.adobe.cq.export.json.ComponentExporter; | ||
| import com.adobe.cq.export.json.ExporterConstants; | ||
| import com.adobe.cq.forms.core.components.internal.form.FormConstants; | ||
| import com.adobe.cq.forms.core.components.models.form.Modal; | ||
|
|
||
| @Model( | ||
| adaptables = { SlingHttpServletRequest.class, Resource.class }, | ||
| adapters = { Modal.class, | ||
| ComponentExporter.class }, | ||
| resourceType = { FormConstants.RT_FD_FORM_MODAL_V1 }) | ||
|
|
||
| @Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME, extensions = ExporterConstants.SLING_MODEL_EXTENSION) | ||
| public class ModalImpl extends PanelImpl implements Modal { | ||
|
|
||
| } |
30 changes: 29 additions & 1 deletion
30
bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/Modal.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,30 @@ | ||
| package com.adobe.cq.forms.core.components.models.form;public class Modal { | ||
| /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| ~ Copyright 2024 Adobe | ||
| ~ | ||
| ~ Licensed 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. | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ | ||
|
|
||
| package com.adobe.cq.forms.core.components.models.form; | ||
|
|
||
| import org.osgi.annotation.versioning.ConsumerType; | ||
|
|
||
| /** | ||
| * Defines the form {@code Modal} Sling Model used for the | ||
| * {@code /apps/core/fd/components/form/modal/v1/modal} component. | ||
| * | ||
| * @since com.adobe.cq.forms.core.components.models.form 4.7.0 | ||
| */ | ||
| @ConsumerType | ||
| public interface Modal extends Container, ContainerConstraint, Base { | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| { | ||
| "id": "modal-3f8ac07b1d", | ||
| "fieldType": "panel", | ||
| "name": "modal1711016014566", | ||
| "label": { | ||
| "value": "Modal" | ||
| }, | ||
| "events": { | ||
| "custom:setProperty": [ | ||
| "$event.payload" | ||
| ] | ||
| }, | ||
| "properties": { | ||
| "fd:dor": { | ||
| "dorExclusion": false, | ||
| "dorExcludeTitle": false, | ||
| "dorExcludeDescription": false | ||
| }, | ||
| "fd:path": "/content/modal" | ||
| }, | ||
| ":itemsOrder": [ | ||
| "panelcontainer", | ||
| "button" | ||
| ], | ||
| ":items": { | ||
| "panelcontainer": { | ||
| "id": "panelcontainer-bc5563a2b9", | ||
| "fieldType": "panel", | ||
| "name": "panelcontainer", | ||
| "label": { | ||
| "value": "Panel" | ||
| }, | ||
| "events": { | ||
| "custom:setProperty": [ | ||
| "$event.payload" | ||
| ] | ||
| }, | ||
| "properties": { | ||
| "fd:dor": { | ||
| "dorExclusion": false, | ||
| "dorExcludeTitle": false, | ||
| "dorExcludeDescription": false | ||
| }, | ||
| "fd:path": "/content/modal/panelcontainer" | ||
| }, | ||
| ":itemsOrder": [ | ||
| "datepicker" | ||
| ], | ||
| ":items": { | ||
| "datepicker": { | ||
| "id": "datepicker-43f0efd69b", | ||
| "fieldType": "date-input", | ||
| "name": "datepicker1711461935572", | ||
| "type": "string", | ||
| "label": { | ||
| "value": "Date Input" | ||
| }, | ||
| "events": { | ||
| "custom:setProperty": [ | ||
| "$event.payload" | ||
| ] | ||
| }, | ||
| "properties": { | ||
| "fd:dor": { | ||
| "dorExclusion": false | ||
| }, | ||
| "fd:path": "/content/modal/panelcontainer/datepicker" | ||
| }, | ||
| "format": "date", | ||
| ":type": "core/fd/components/form/datepicker/v1/datepicker" | ||
| } | ||
| }, | ||
| ":type": "core/fd/components/form/panelcontainer/v1/panelcontainer" | ||
| }, | ||
| "button": { | ||
| "id": "button-1605226465", | ||
| "fieldType": "button", | ||
| "name": "button1711016014673", | ||
| "properties": { | ||
| "fd:dor": { | ||
| "dorExclusion": false | ||
| }, | ||
| "fd:path": "/content/modal/button", | ||
| "fd:buttonType": "button" | ||
| }, | ||
| "label": { | ||
| "value": "Open Modal" | ||
| }, | ||
| "events": { | ||
| "custom:setProperty": [ | ||
| "$event.payload" | ||
| ] | ||
| }, | ||
| ":type": "core/fd/components/form/button/v1/button" | ||
| } | ||
| }, | ||
| ":type": "core/fd/components/form/modal/v1/modal" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| { | ||
| "modal": { | ||
| "jcr:primaryType": "nt:unstructured", | ||
| "fieldType": "panel", | ||
| "jcr:title": "Modal", | ||
| "name": "modal1711016014566", | ||
| "sling:resourceType": "core/fd/components/form/modal/v1/modal", | ||
| "panelcontainer": { | ||
| "jcr:primaryType": "nt:unstructured", | ||
| "fieldType": "panel", | ||
| "jcr:title": "Panel", | ||
| "name": "panelcontainer", | ||
| "sling:resourceType": "core/fd/components/form/panelcontainer/v1/panelcontainer", | ||
| "datepicker" : { | ||
| "jcr:primaryType": "nt:unstructured", | ||
| "fieldType": "date-input", | ||
| "jcr:title": "Date Input", | ||
| "name": "datepicker1711461935572", | ||
| "sling:resourceType": "core/fd/components/form/datepicker/v1/datepicker" | ||
| } | ||
| }, | ||
| "button" : { | ||
| "jcr:primaryType": "nt:unstructured", | ||
| "fieldType": "button", | ||
| "jcr:title": "Open Modal", | ||
| "name": "button1711016014673", | ||
| "sling:resourceType": "core/fd/components/form/button/v1/button" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters