Skip to content

Commit 3a8d169

Browse files
fix: Removing ember-scroll-to addon (#3852)
* add custom scroll action for side-menu * remove ember-scroll-to * remove jQuery Co-authored-by: Kush Trivedi <[email protected]>
1 parent 498bc7b commit 3a8d169

File tree

4 files changed

+25
-16
lines changed

4 files changed

+25
-16
lines changed

app/components/public/side-menu.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,23 @@ export default Component.extend({
99
this.set('shouldShowCallforSpeakers',
1010
speakersCall && speakersCall.announcement && (speakersCall.privacy === 'public'));
1111
},
12+
actions: {
13+
scrollToTarget() {
14+
document.querySelectorAll('.scroll').forEach(anchor => {
15+
anchor.addEventListener('click', function(e) {
16+
e.preventDefault();
17+
document.querySelector(this.getAttribute('href')).scrollIntoView({
18+
behavior: 'smooth'
19+
});
20+
21+
document.querySelectorAll('.scroll').forEach(node => {
22+
node.classList.remove('active');
23+
});
24+
e.target.classList.add('active');
25+
});
26+
});
27+
}
28+
},
1229
isSchedulePublished: computed('event.schedulePublishedOn', function() {
1330
return this.get('event.schedulePublishedOn') && this.get('event.schedulePublishedOn').toISOString() !== moment(0).toISOString();
1431
})

app/templates/components/public/side-menu.hbs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{{#if (and (not-eq session.currentRouteName 'public.cfs.new-session') (not-eq session.currentRouteName 'public.cfs.new-speaker') (not-eq session.currentRouteName 'public.cfs.edit-speaker') (not-eq session.currentRouteName 'public.cfs.edit-session'))}}
22
<div class="ui fluid vertical {{unless device.isMobile 'pointing'}} menu">
33
{{#if (eq session.currentRouteName 'public.index')}}
4-
{{#scroll-to href='#info' class='item active'}}
4+
<a href='#info' {{action "scrollToTarget"}} class='item active scroll'>
55
{{t 'Info'}}
6-
{{/scroll-to}}
6+
</a>
77
{{#if event.tickets.length}}
8-
{{#scroll-to href='#tickets' class='item'}}
8+
<a href='#tickets' {{action "scrollToTarget"}} class='item scroll'>
99
{{t 'Tickets'}}
10-
{{/scroll-to}}
10+
</a>
1111
{{/if}}
1212
{{#if event.speakers.length}}
1313
{{#link-to 'public.speakers' class='item'}}
@@ -46,19 +46,19 @@
4646
{{/if}}
4747
{{#if event.hasOwnerInfo}}
4848
{{#if (eq session.currentRouteName 'public.index')}}
49-
{{#scroll-to href='#owner' class='item'}}
49+
<a href='#owner' {{action "scrollToTarget"}} class='item scroll'>
5050
{{t 'Owner'}}
51-
{{/scroll-to}}
51+
</a>
5252
{{else}}
5353
<a class="item" href="{{href-to 'public.index'}}#owner">
5454
{{t 'Owner'}}
5555
</a>
5656
{{/if}}
5757
{{/if}}
5858
{{#if (eq session.currentRouteName 'public.index')}}
59-
{{#scroll-to href='#getting-here' class='item'}}
59+
<a href='#getting-here' class='item scroll'>
6060
{{t 'Getting here'}}
61-
{{/scroll-to}}
61+
</a>
6262
{{else}}
6363
<a class="item" href="{{href-to 'public.index'}}#getting-here">
6464
{{t 'Getting here'}}

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
"ember-resolver": "^7.0.0",
103103
"ember-route-action-helper": "^2.0.8",
104104
"ember-router-scroll": "^2.0.0",
105-
"ember-scroll-to": "^0.6.5",
106105
"ember-simple-auth": "^2.1.1",
107106
"ember-simple-auth-token": "^4.0.7",
108107
"ember-source": "~3.16.1",

yarn.lock

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6961,13 +6961,6 @@ ember-runtime-enumerable-includes-polyfill@^2.0.0:
69616961
ember-cli-babel "^6.9.0"
69626962
ember-cli-version-checker "^2.1.0"
69636963

6964-
ember-scroll-to@^0.6.5:
6965-
version "0.6.5"
6966-
resolved "https://registry.yarnpkg.com/ember-scroll-to/-/ember-scroll-to-0.6.5.tgz#d9a7658eed6b8ae0e3c71b93b03f59a8550b8a10"
6967-
dependencies:
6968-
ember-cli-babel "^6.3.0"
6969-
ember-cli-htmlbars "^2.0.1"
6970-
69716964
ember-simple-auth-token@^4.0.7:
69726965
version "4.0.7"
69736966
resolved "https://registry.yarnpkg.com/ember-simple-auth-token/-/ember-simple-auth-token-4.0.7.tgz#df4177d118b9f7a75a3879ceec04ab2c55e1cad2"

0 commit comments

Comments
 (0)