Skip to content

Commit 4c92327

Browse files
wildonewildone
committed
update clientlibs to only load author clientlibs in author
1 parent 0fc67c2 commit 4c92327

File tree

11 files changed

+50
-55
lines changed

11 files changed

+50
-55
lines changed

‎aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-common-head-dependencies-publish/.content.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
3+
jcr:primaryType="cq:ClientLibraryFolder"
4+
allowProxy="{Boolean}true"
5+
jsProcessor="[default:none]"
6+
cssProcessor="[default:none]"
7+
categories="[aemdesign.common.head.dependencies.publish]"
8+
embed="[jquery]"/>
9+

‎aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-common-head-dependencies-publish/css.txt‎

Whitespace-only changes.

‎aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-common-head-dependencies-publish/js.txt‎

Whitespace-only changes.

‎aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/base/v2/customfooterlibs.html‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
<!-- js: aemdesign.common.body -->
66
<sly data-sly-call="${clientlib.js @ categories='aemdesign.common.body'}"/>
77

8-
<!-- js: aemdesign.footer start -->
9-
<sly data-sly-call="${clientlib.js @ categories='aemdesign.footer'}"/>
10-
<!-- js: aemdesign.footer end -->
11-
128
<!--/* Load authoring related client libraries */-->
139
<!-- js: aemdesign.common.coralui -->
1410
<sly data-sly-test="${wcmmode.preview || wcmmode.edit}" data-sly-call="${clientLib.js @ categories='aemdesign.common.coralui'}"/>

‎aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/base/v2/customheaderlibs.html‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@
33
<meta http-equiv="x-ua-compatible" content="ie=edge">
44
<meta name="viewport" content="width=device-width, initial-scale=1">
55

6-
<!-- all: aemdesign.header.js start -->
6+
<!-- all: aemdesign.common.head.dependencies.author start -->
77
<sly data-sly-use.clientLib="/libs/granite/sightly/templates/clientlib.html"
8-
data-sly-call="${clientlib.js @ categories='aemdesign.header'}"/>
9-
<!-- all: aemdesign.header.js end -->
8+
data-sly-test="${!wcmmode.disabled}"
9+
data-sly-call="${clientlib.all @ categories='aemdesign.common.head.dependencies'}"/>
10+
<!-- all: aemdesign.common.head.dependencies.author end -->
1011

11-
<!-- all: aemdesign.common.head.dependencies start -->
12+
<!-- all: aemdesign.common.head.dependencies.publish start -->
1213
<sly data-sly-use.clientLib="/libs/granite/sightly/templates/clientlib.html"
13-
data-sly-call="${clientlib.all @ categories='aemdesign.common.head.dependencies'}"/>
14-
<!-- all: aemdesign.common.head.dependencies end -->
14+
data-sly-test="${wcmmode.disabled}"
15+
data-sly-call="${clientlib.all @ categories='aemdesign.common.head.dependencies.publish'}"/>
16+
<!-- all: aemdesign.common.head.dependencies.publish end -->
1517

1618
<!-- all: aemdesign.common.head.js start -->
1719
<sly data-sly-use.clientLib="/libs/granite/sightly/templates/clientlib.html"
@@ -52,11 +54,6 @@
5254
data-sly-call="${clientlib.css @ categories='aemdesign.common.coralui'}"/>
5355
<!-- css: aemdesign.common.coralui end -->
5456

55-
<!-- all: aemdesign.header.all start -->
56-
<sly data-sly-use.clientLib="/libs/granite/sightly/templates/clientlib.html"
57-
data-sly-call="${clientlib.css @ categories='aemdesign.header'}"/>
58-
<!-- all: aemdesign.header.all end -->
59-
6057
<!-- aemdesign/components/analytics/datalayer start -->
6158
<sly data-sly-resource="${ @ resourceType='aemdesign/components/analytics/datalayer'}"/>
6259
<!-- aemdesign/components/analytics/datalayer end -->

‎aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/base/v3/base/customfooterlibs.html‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,9 @@
88
<sly data-sly-call="${clientlib.js @ categories='aemdesign.common.body'}"/>
99
<!-- js: aemdesign.common.body.js end -->
1010

11-
<!-- js: aemdesign.footer.js start -->
12-
<sly data-sly-call="${clientlib.js @ categories='aemdesign.footer'}"/>
13-
<!-- js: aemdesign.footer.js end -->
14-
15-
<!-- js: aemdesign.footer.core.js start -->
16-
<sly data-sly-call="${clientlib.js @ categories='aemdesign.footer.core'}"/>
17-
<!-- js: aemdesign.footer.core.js end -->
11+
<!-- js: aemdesign.core.footer.js start -->
12+
<sly data-sly-call="${clientlib.js @ categories='aemdesign.core.footer'}"/>
13+
<!-- js: aemdesign.core.footer.js end -->
1814

1915
<!--/* Load authoring related client libraries */-->
2016
<!-- js: aemdesign.common.coralui.js start -->

‎aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/base/v3/base/customheaderlibs.html‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@
44

55
<!-- custom header libs -->
66

7-
<!-- all: aemdesign.common.head.dependencies start -->
7+
<!-- all: aemdesign.common.head.dependencies.author start -->
88
<sly data-sly-use.clientLib="/libs/granite/sightly/templates/clientlib.html"
9+
data-sly-test="${!wcmmode.disabled}"
910
data-sly-call="${clientlib.all @ categories='aemdesign.common.head.dependencies'}"/>
10-
<!-- all: aemdesign.common.head.dependencies.all end -->
11+
<!-- all: aemdesign.common.head.dependencies.author end -->
1112

12-
<!-- all: aemdesign.header.js start -->
13+
<!-- all: aemdesign.common.head.dependencies.publish start -->
1314
<sly data-sly-use.clientLib="/libs/granite/sightly/templates/clientlib.html"
14-
data-sly-call="${clientlib.js @ categories='aemdesign.header'}"/>
15-
<!-- all: aemdesign.header.js end -->
15+
data-sly-test="${wcmmode.disabled}"
16+
data-sly-call="${clientlib.all @ categories='aemdesign.common.head.dependencies.publish'}"/>
17+
<!-- all: aemdesign.common.head.dependencies.publish end -->
1618

1719
<!-- all: aemdesign.common.head.js start -->
1820
<sly data-sly-use.clientLib="/libs/granite/sightly/templates/clientlib.html"
@@ -53,11 +55,6 @@
5355
data-sly-call="${clientlib.css @ categories='aemdesign.common.coralui'}"/>
5456
<!-- css: aemdesign.common.coralui.css end-->
5557

56-
<!-- all: aemdesign.header.css start -->
57-
<sly data-sly-use.clientLib="/libs/granite/sightly/templates/clientlib.html"
58-
data-sly-call="${clientlib.css @ categories='aemdesign.header'}"/>
59-
<!-- all: aemdesign.header.css end -->
60-
6158
<!-- all: aemdesign.core.header.all start -->
6259
<sly data-sly-use.clientLib="/libs/granite/sightly/templates/clientlib.html"
6360
data-sly-call="${clientlib.all @ categories='aemdesign.core.header'}"/>

‎aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/experience-fragments/base/v2/xfpage/customfooterlibs.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<!-- js: aemdesign.common.body -->
66
<sly data-sly-call="${clientlib.js @ categories='aemdesign.common.body'}"/>
77

8-
<!-- js: aemdesign.footer start -->
9-
<sly data-sly-call="${clientlib.js @ categories='aemdesign.footer'}"/>
10-
<!-- js: aemdesign.footer end -->
8+
<!-- js: aemdesign.core.footer.js start -->
9+
<sly data-sly-call="${clientlib.js @ categories='aemdesign.core.footer'}"/>
10+
<!-- js: aemdesign.core.footer.js end -->
1111

1212
<!--/* Load authoring related client libraries */-->
1313
<!-- js: aemdesign.common.coralui -->

‎aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/experience-fragments/base/v2/xfpage/customheaderlibs.html‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@
55
<meta http-equiv="x-ua-compatible" content="ie=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77

8-
<!-- all: aemdesign.header.js start -->
8+
<!-- all: aemdesign.common.head.dependencies.author start -->
99
<sly data-sly-use.clientLib="/libs/granite/sightly/templates/clientlib.html"
10-
data-sly-call="${clientlib.js @ categories='aemdesign.header'}"/>
11-
<!-- all: aemdesign.header.js end -->
10+
data-sly-test="${!wcmmode.disabled}"
11+
data-sly-call="${clientlib.all @ categories='aemdesign.common.head.dependencies'}"/>
12+
<!-- all: aemdesign.common.head.dependencies.author end -->
1213

13-
<!-- all: aemdesign.common.head.dependencies start -->
14+
<!-- all: aemdesign.common.head.dependencies.publish start -->
1415
<sly data-sly-use.clientLib="/libs/granite/sightly/templates/clientlib.html"
15-
data-sly-call="${clientlib.all @ categories='aemdesign.common.head.dependencies'}"/>
16-
<!-- all: aemdesign.common.head.dependencies end -->
16+
data-sly-test="${wcmmode.disabled}"
17+
data-sly-call="${clientlib.all @ categories='aemdesign.common.head.dependencies.publish'}"/>
18+
<!-- all: aemdesign.common.head.dependencies.publish end -->
1719

1820
<!-- all: aemdesign.common.head.js start -->
1921
<sly data-sly-use.clientLib="/libs/granite/sightly/templates/clientlib.html"
@@ -54,10 +56,6 @@
5456
data-sly-call="${clientlib.css @ categories='aemdesign.common.coralui'}"/>
5557
<!-- css: aemdesign.common.coralui end -->
5658

57-
<!-- all: aemdesign.header.all start -->
58-
<sly data-sly-use.clientLib="/libs/granite/sightly/templates/clientlib.html"
59-
data-sly-call="${clientlib.css @ categories='aemdesign.header'}"/>
60-
<!-- all: aemdesign.header.all end -->
6159

6260
<!-- aemdesign/components/analytics/datalayer start -->
6361
<sly data-sly-resource="${ @ resourceType='aemdesign/components/analytics/datalayer'}"/>

‎aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/styleguide/v1/styleguide/customfooterlibs.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<sly data-sly-call="${clientlib.js @ categories='aemdesign.common.body'}"/>
99
<!-- js: aemdesign.common.body end -->
1010

11-
<!-- js: aemdesign.footer.v2 start -->
11+
<!-- js: aemdesign.prototype.footer.styleguide start -->
1212
<sly data-sly-call="${clientlib.js @ categories='aemdesign.prototype.footer.styleguide,aemdesign.core.footer'}"/>
13-
<!-- js: aemdesign.footer.v2 end -->
13+
<!-- js: aemdesign.prototype.footer.styleguide end -->
1414

1515
<!--/* Load authoring related client libraries */-->
1616
<!-- js: aemdesign.common.coralui start -->

0 commit comments

Comments
 (0)