From a7a58d73f14fb846aa4dd9ca3bad63f59f07a0b2 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Thu, 6 Feb 2020 20:34:55 +0530 Subject: [PATCH 1/3] add custom scroll action for side-menu --- app/components/public/side-menu.js | 17 +++++++++++++++++ app/templates/components/public/side-menu.hbs | 16 ++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/app/components/public/side-menu.js b/app/components/public/side-menu.js index 051884dedf1..fc2971b3c33 100644 --- a/app/components/public/side-menu.js +++ b/app/components/public/side-menu.js @@ -1,3 +1,4 @@ +import $ from 'jquery'; import Component from '@ember/component'; import { computed } from '@ember/object'; import moment from 'moment'; @@ -9,6 +10,22 @@ export default Component.extend({ this.set('shouldShowCallforSpeakers', speakersCall && speakersCall.announcement && (speakersCall.privacy === 'public')); }, + actions: { + scrollToTarget() { + document.querySelectorAll('.scroll').forEach(anchor => { + anchor.addEventListener('click', function(e) { + e.preventDefault(); + document.querySelector(this.getAttribute('href')).scrollIntoView({ + behavior: 'smooth' + }); + $('.scroll').each(function() { + $(this).removeClass('active'); + }); + $(this).addClass('active'); + }); + }); + } + }, isSchedulePublished: computed('event.schedulePublishedOn', function() { return this.get('event.schedulePublishedOn') && this.get('event.schedulePublishedOn').toISOString() !== moment(0).toISOString(); }) diff --git a/app/templates/components/public/side-menu.hbs b/app/templates/components/public/side-menu.hbs index d162f87cd3e..c8300301991 100644 --- a/app/templates/components/public/side-menu.hbs +++ b/app/templates/components/public/side-menu.hbs @@ -1,13 +1,13 @@ {{#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'))}}
{{#if (eq session.currentRouteName 'public.index')}} - {{#scroll-to href='#info' class='item active'}} + {{t 'Info'}} - {{/scroll-to}} + {{#if event.tickets.length}} - {{#scroll-to href='#tickets' class='item'}} + {{t 'Tickets'}} - {{/scroll-to}} + {{/if}} {{#if event.speakers.length}} {{#link-to 'public.speakers' class='item'}} @@ -46,9 +46,9 @@ {{/if}} {{#if event.hasOwnerInfo}} {{#if (eq session.currentRouteName 'public.index')}} - {{#scroll-to href='#owner' class='item'}} + {{t 'Owner'}} - {{/scroll-to}} + {{else}} {{t 'Owner'}} @@ -56,9 +56,9 @@ {{/if}} {{/if}} {{#if (eq session.currentRouteName 'public.index')}} - {{#scroll-to href='#getting-here' class='item'}} + {{t 'Getting here'}} - {{/scroll-to}} + {{else}} {{t 'Getting here'}} From 6dc590700e12c6bbb8d9f3b3d668c21f7a9c8e92 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Thu, 6 Feb 2020 20:38:28 +0530 Subject: [PATCH 2/3] remove ember-scroll-to --- package.json | 1 - yarn.lock | 7 ------- 2 files changed, 8 deletions(-) diff --git a/package.json b/package.json index 6e3c61d3d81..98f23d63dcd 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,6 @@ "ember-resolver": "^7.0.0", "ember-route-action-helper": "^2.0.8", "ember-router-scroll": "^2.0.0", - "ember-scroll-to": "^0.6.5", "ember-simple-auth": "^2.1.1", "ember-simple-auth-token": "^4.0.7", "ember-source": "~3.16.1", diff --git a/yarn.lock b/yarn.lock index 65930971ca1..30e1973c2fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6960,13 +6960,6 @@ ember-runtime-enumerable-includes-polyfill@^2.0.0: ember-cli-babel "^6.9.0" ember-cli-version-checker "^2.1.0" -ember-scroll-to@^0.6.5: - version "0.6.5" - resolved "https://registry.yarnpkg.com/ember-scroll-to/-/ember-scroll-to-0.6.5.tgz#d9a7658eed6b8ae0e3c71b93b03f59a8550b8a10" - dependencies: - ember-cli-babel "^6.3.0" - ember-cli-htmlbars "^2.0.1" - ember-simple-auth-token@^4.0.7: version "4.0.7" resolved "https://registry.yarnpkg.com/ember-simple-auth-token/-/ember-simple-auth-token-4.0.7.tgz#df4177d118b9f7a75a3879ceec04ab2c55e1cad2" From a984ac73e87e156aae295c4eb94bd9512f6ee636 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Thu, 6 Feb 2020 22:07:52 +0530 Subject: [PATCH 3/3] remove jQuery --- app/components/public/side-menu.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/components/public/side-menu.js b/app/components/public/side-menu.js index fc2971b3c33..be2bbbd66db 100644 --- a/app/components/public/side-menu.js +++ b/app/components/public/side-menu.js @@ -1,4 +1,3 @@ -import $ from 'jquery'; import Component from '@ember/component'; import { computed } from '@ember/object'; import moment from 'moment'; @@ -18,10 +17,11 @@ export default Component.extend({ document.querySelector(this.getAttribute('href')).scrollIntoView({ behavior: 'smooth' }); - $('.scroll').each(function() { - $(this).removeClass('active'); + + document.querySelectorAll('.scroll').forEach(node => { + node.classList.remove('active'); }); - $(this).addClass('active'); + e.target.classList.add('active'); }); }); }