Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated some data-sly-test to data-sly-set and moved data-sly-use of … #926

Merged
merged 2 commits into from
Apr 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
~ limitations under the License.
*/-->

<sly data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-test.config="${modelCache['com.adobe.aem.commons.assetshare.configuration.Config']}"
data-sly-test.asset="${modelCache['com.adobe.aem.commons.assetshare.content.AssetModel']}"
<sly data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-use.actionButtons="com.adobe.aem.commons.assetshare.components.details.ActionButtons"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-set.config="${modelCache['com.adobe.aem.commons.assetshare.configuration.Config']}"
data-sly-set.asset="${modelCache['com.adobe.aem.commons.assetshare.content.AssetModel']}"
data-sly-test.ready="${actionButtons.ready}">

<div class="ui basic segment">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@
~ limitations under the License.
*/-->

<sly data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-test.asset="${modelCache['com.adobe.aem.commons.assetshare.content.AssetModel']}"
<sly data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-set.asset="${modelCache['com.adobe.aem.commons.assetshare.content.AssetModel']}"
data-sly-use.editorLinks="com.adobe.aem.commons.assetshare.components.details.EditorLinks"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-test.ready="${editorLinks.ready}">
data-sly-test.ready="${editorLinks.ready}"
>

<h4 class="ui header"
data-sly-test="${!properties['hideLabel']}">${properties['label'] @ i18n}</h4>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
~ limitations under the License.
*/-->

<sly data-sly-use.image="com.adobe.aem.commons.assetshare.components.details.Image"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-test.ready="${image.ready}">
<sly data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.image="com.adobe.aem.commons.assetshare.components.details.Image"
data-sly-test.ready="${image.ready}">

<div class="cmp-wrapper image background">
<!--/* Img element with a max height */-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
~ limitations under the License.
*/-->

<sly data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-test.asset="${modelCache['com.adobe.aem.commons.assetshare.content.AssetModel']}"
data-sly-use.field="com.adobe.aem.commons.assetshare.components.details.Metadata"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
<sly data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.fieldTypesTemplate="templates/field-types.html"
data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-set.asset="${modelCache['com.adobe.aem.commons.assetshare.content.AssetModel']}"
data-sly-use.field="com.adobe.aem.commons.assetshare.components.details.Metadata"
data-sly-test.ready="${field.ready}">

<div class="ui basic segment">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
~ limitations under the License.
*/-->

<sly data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-test.config="${modelCache['com.adobe.aem.commons.assetshare.configuration.Config']}"
data-sly-test.asset="${modelCache['com.adobe.aem.commons.assetshare.content.AssetModel']}"
<sly data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-set.config="${modelCache['com.adobe.aem.commons.assetshare.configuration.Config']}"
data-sly-set.asset="${modelCache['com.adobe.aem.commons.assetshare.content.AssetModel']}"
data-sly-use.renditions="com.adobe.aem.commons.assetshare.components.details.Renditions"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-test.ready="${renditions.ready}">

<div class="ui basic segment">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
~ limitations under the License.
*/-->

<sly data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-test.asset="${modelCache['com.adobe.aem.commons.assetshare.content.AssetModel']}"
<sly data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-set.asset="${modelCache['com.adobe.aem.commons.assetshare.content.AssetModel']}"
data-sly-use.field="com.adobe.aem.commons.assetshare.components.details.Tags"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-test.ready="${field.ready}">

<div class="ui basic segment">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
~ limitations under the License.
*/-->

<sly data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-test.asset="${modelCache['com.adobe.aem.commons.assetshare.content.AssetModel']}"
<sly data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-set.asset="${modelCache['com.adobe.aem.commons.assetshare.content.AssetModel']}"
data-sly-use.title="com.adobe.aem.commons.assetshare.components.details.Title"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-test.ready="${title.ready}">

<h1 class="ui header">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
~ limitations under the License.
*/-->

<sly data-sly-use.video="com.adobe.aem.commons.assetshare.components.details.Video"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.playerTemplate="templates/player.html"
<sly data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.playerTemplate="templates/player.html"
data-sly-use.video="com.adobe.aem.commons.assetshare.components.details.Video"
data-sly-test.ready="${video.ready}">

<h4 class="ui header center aligned"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
*/-->

<sly data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-test.config="${modelCache['com.adobe.aem.commons.assetshare.configuration.Config']}"
data-sly-test.searchConfig="${modelCache['com.adobe.aem.commons.assetshare.components.search.SearchConfig']}"
data-sly-set.config="${modelCache['com.adobe.aem.commons.assetshare.configuration.Config']}"
data-sly-set.searchConfig="${modelCache['com.adobe.aem.commons.assetshare.components.search.SearchConfig']}"
data-sly-use.cart="com.adobe.aem.commons.assetshare.components.actions.cart.Cart"></sly>

<style data-sly-test="${!wccmode.disabled}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
~ limitations under the License.
*/-->

<sly data-sly-use.download="com.adobe.aem.commons.assetshare.components.actions.download.Download"
data-sly-test.legacyMode="${download.legacyMode}"
data-sly-use.legacyTemplate="templates/legacy.html"></sly>
<sly data-sly-use.legacyTemplate="templates/legacy.html"
data-sly-use.download="com.adobe.aem.commons.assetshare.components.actions.download.Download"
data-sly-set.legacyMode="${download.legacyMode}"></sly>

<style data-sly-test="${!wccmode.disabled}">
.cmp-modal-download .ui.modal {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
*/-->

<sly
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-test.config="${modelCache['com.adobe.aem.commons.assetshare.configuration.Config']}"
data-sly-test="${!config.aemClassic}"
data-sly-set.config="${modelCache['com.adobe.aem.commons.assetshare.configuration.Config']}"
data-sly-use.downloads="com.adobe.aem.commons.assetshare.components.actions.downloads.Downloads"
data-sly-use.downloadTemplate="templates/download.html"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html">
data-sly-test="${!config.aemClassic}">

<sly data-sly-test="${!wccmode.disabled}">
<script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/-->

<sly data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-test.asset="${modelCache['com.adobe.aem.commons.assetshare.content.AssetModel']}"></sly>
data-sly-set.asset="${modelCache['com.adobe.aem.commons.assetshare.content.AssetModel']}"></sly>

<style data-sly-test="${!wccmode.disabled}">
.cmp-modal-license .ui.modal {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/-->

<sly data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-test.config="${modelCache['com.adobe.aem.commons.assetshare.configuration.Config']}"
data-sly-set.config="${modelCache['com.adobe.aem.commons.assetshare.configuration.Config']}"
data-sly-use.share="com.adobe.aem.commons.assetshare.components.actions.share.EmailShare"></sly>

<style data-sly-test="${!wccmode.disabled}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
*/-->

<!--/* Daterange and Relative Daterange predicates */-->
<sly data-sly-use.predicate="com.adobe.aem.commons.assetshare.components.predicates.DatePredicate"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
<sly data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.optionsTemplate="templates/options.html"
data-sly-use.predicate="com.adobe.aem.commons.assetshare.components.predicates.DatePredicate"
data-sly-test.ready="${predicate.ready}">

<!--/* Date Property */-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
~ limitations under the License.
*/-->

<sly data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-test.pagePredicate="${modelCache['com.adobe.aem.commons.assetshare.components.predicates.PagePredicate']}"
<sly data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.togglesTemplate="templates/toggles.html"
data-sly-test.hideLabels="${properties['hideLabels']}"></sly>
data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-set.pagePredicate="${modelCache['com.adobe.aem.commons.assetshare.components.predicates.PagePredicate']}"
data-sly-set.hideLabels="${properties['hideLabels']}"></sly>

<div data-sly-test.ready="${pagePredicate}"
class="ui basic segment">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
~ limitations under the License.
*/-->

<sly data-sly-use.predicate="com.adobe.aem.commons.assetshare.components.predicates.FreeformTextPredicate"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
<sly data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.predicate="com.adobe.aem.commons.assetshare.components.predicates.FreeformTextPredicate"
data-sly-test.ready="${predicate.ready}">

<!--/* Property */-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
~ limitations under the License.
*/-->

<sly data-sly-use.predicate="com.adobe.aem.commons.assetshare.components.predicates.HiddenPredicate"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
<sly data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.predicate="com.adobe.aem.commons.assetshare.components.predicates.HiddenPredicate"
data-sly-test.ready="${predicate.ready}"></sly>

<!--/* The Hidden Predicate is always hidden; Add the placeholder to allow Authors to select for editing*/-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
~ limitations under the License.
*/-->

<sly data-sly-use.predicate="com.adobe.aem.commons.assetshare.components.predicates.PathPredicate"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
<sly data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.optionsTemplate="templates/options.html"
data-sly-use.predicate="com.adobe.aem.commons.assetshare.components.predicates.PathPredicate"
data-sly-test.ready="${predicate.ready}">

<input type="hidden"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
~ limitations under the License.
*/-->

<sly data-sly-use.predicate="com.adobe.aem.commons.assetshare.components.predicates.PropertyPredicate"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
<sly data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.optionsTemplate="templates/options.html"
data-sly-use.predicate="com.adobe.aem.commons.assetshare.components.predicates.PropertyPredicate"
data-sly-test.ready="${predicate.ready}">

<!--/* COMMON */-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
~ limitations under the License.
*/-->

<sly data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-test.config="${modelCache['com.adobe.aem.commons.assetshare.configuration.Config']}"
data-sly-test.search="${modelCache['com.adobe.aem.commons.assetshare.search.Search']}"
data-sly-test.pagePredicate="${modelCache['com.adobe.aem.commons.assetshare.components.predicates.PagePredicate']}"
data-sly-use.commonTemplate="../templates/common.html"
data-sly-use.cardTemplate="templates/card.html"></sly>
<sly data-sly-use.commonTemplate="../templates/common.html"
data-sly-use.cardTemplate="templates/card.html"
data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-set.config="${modelCache['com.adobe.aem.commons.assetshare.configuration.Config']}"
data-sly-set.search="${modelCache['com.adobe.aem.commons.assetshare.search.Search']}"
data-sly-set.pagePredicate="${modelCache['com.adobe.aem.commons.assetshare.components.predicates.PagePredicate']}"></sly>

<!--/* Common Data */-->
<sly data-sly-call="${commonTemplate.data @ search = search, pagePredicate = pagePredicate}"></sly>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
~ limitations under the License.
*/-->

<sly data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-test.config="${modelCache['com.adobe.aem.commons.assetshare.configuration.Config']}"
data-sly-test.search="${modelCache['com.adobe.aem.commons.assetshare.search.Search']}"
data-sly-test.pagePredicate="${modelCache['com.adobe.aem.commons.assetshare.components.predicates.PagePredicate']}"
data-sly-use.commonTemplate="../templates/common.html"
data-sly-use.cardTemplate="templates/card.html"></sly>
<sly data-sly-use.commonTemplate="../templates/common.html"
data-sly-use.cardTemplate="templates/card.html"
data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-set.config="${modelCache['com.adobe.aem.commons.assetshare.configuration.Config']}"
data-sly-set.search="${modelCache['com.adobe.aem.commons.assetshare.search.Search']}"
data-sly-set.pagePredicate="${modelCache['com.adobe.aem.commons.assetshare.components.predicates.PagePredicate']}"></sly>

<!--/* Common Data */-->
<sly data-sly-call="${commonTemplate.data @ search = search, pagePredicate = pagePredicate}"></sly>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
~ limitations under the License.
*/-->

<sly data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-test.config="${modelCache['com.adobe.aem.commons.assetshare.configuration.Config']}"
data-sly-test.search="${modelCache['com.adobe.aem.commons.assetshare.search.Search']}"
data-sly-test.pagePredicate="${modelCache['com.adobe.aem.commons.assetshare.components.predicates.PagePredicate']}"
data-sly-use.commonTemplate="../templates/common.html"
data-sly-use.listTemplate="templates/list.html"></sly>
<sly data-sly-use.commonTemplate="../templates/common.html"
data-sly-use.listTemplate="templates/list.html"
data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-set.config="${modelCache['com.adobe.aem.commons.assetshare.configuration.Config']}"
data-sly-set.search="${modelCache['com.adobe.aem.commons.assetshare.search.Search']}"
data-sly-set.pagePredicate="${modelCache['com.adobe.aem.commons.assetshare.components.predicates.PagePredicate']}"></sly>

<!--/* Common Data */-->
<sly data-sly-call="${commonTemplate.data @ search = search, pagePredicate = pagePredicate}"></sly>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
*/-->

<sly data-sly-use.modelCache="com.adobe.aem.commons.assetshare.util.ModelCache"
data-sly-test.config="${modelCache['com.adobe.aem.commons.assetshare.configuration.Config']}"
data-sly-test.search="${modelCache['com.adobe.aem.commons.assetshare.search.Search']}"
data-sly-test.pagePredicate="${modelCache['com.adobe.aem.commons.assetshare.components.predicates.PagePredicate']}"></sly>
data-sly-set.config="${modelCache['com.adobe.aem.commons.assetshare.configuration.Config']}"
data-sly-set.search="${modelCache['com.adobe.aem.commons.assetshare.search.Search']}"
data-sly-set.pagePredicate="${modelCache['com.adobe.aem.commons.assetshare.components.predicates.PagePredicate']}"></sly>

<form role="search"
class="ui form"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
~ limitations under the License.
*/-->

<sly data-sly-use.predicate="com.adobe.aem.commons.assetshare.components.predicates.FulltextPredicate"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
<sly data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.predicate="com.adobe.aem.commons.assetshare.components.predicates.FulltextPredicate"
data-sly-test.ready="${predicate.isReady}">

<div class="ui fluid big left icon input ${properties['hideButton'] ? '' : 'action'}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
~ limitations under the License.
*/-->

<sly data-sly-use.predicate="com.adobe.aem.commons.assetshare.components.predicates.SortPredicate"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
<sly data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.predicate="com.adobe.aem.commons.assetshare.components.predicates.SortPredicate"
data-sly-test.ready="${predicate.ready}">

<input
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
~ limitations under the License.
*/-->

<sly data-sly-use.component="com.adobe.aem.commons.assetshare.components.search.Statistics"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-test.ready="${component.ready}">
<sly data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.component="com.adobe.aem.commons.assetshare.components.search.Statistics"
data-sly-test.ready="${component.ready}">

<div class="ui mini ${properties['hideTimeTaken'] ? 'two' : 'three' } statistics"
data-asset-share-id="${component.id}__statistics"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
~ limitations under the License.
*/-->

<sly data-sly-use.predicate="com.adobe.aem.commons.assetshare.components.predicates.TagsPredicate"
data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
<sly data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html"
data-sly-use.optionsTemplate="templates/options.html"
data-sly-use.predicate="com.adobe.aem.commons.assetshare.components.predicates.TagsPredicate"
data-sly-test.ready="${predicate.ready}">

<!--/* COMMON */-->
Expand Down
Loading