Skip to content

Commit 4904694

Browse files
author
sourabh1031
committed
Enable Scrolling to Top
1 parent 87877cf commit 4904694

File tree

6 files changed

+212
-8
lines changed

6 files changed

+212
-8
lines changed

‎app/pods/classroom/timeline/controller.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { inject as service } from '@ember-decorators/service';
44
import { computed } from '@ember-decorators/object';
55

66
export default class TimelineController extends Controller {
7-
queryParams = ['showFeedback']
7+
queryParams = ['showFeedback','preserveScrollPosition']
88
showFeedback = false
99

1010
@service api

‎app/pods/classroom/timeline/template.hbs

+4-4
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,19 @@
6868
</div>
6969
</div>
7070
<div class="tab-nav">
71-
{{link-to 'Overview' 'classroom.timeline.overview' class="tab-items" tagName="div"}}
71+
{{link-to 'Overview' 'classroom.timeline.overview' (query-params preserveScrollPosition=true) class="tab-items" tagName="div"}}
7272
{{#link-to 'classroom.timeline.overview' class="tab-icons" tagName="div"}}
7373
<img src="/images/menu-white.svg" alt="Overview">
7474
{{/link-to}}
75-
{{link-to 'Course Content' 'classroom.timeline.contents'class="tab-items" tagName="div"}}
75+
{{link-to 'Course Content' 'classroom.timeline.contents' (query-params preserveScrollPosition=true) class="tab-items" tagName="div"}}
7676
{{#link-to 'classroom.timeline.contents'class="tab-icons" tagName="div"}}
7777
<img src="/images/docs-white.svg" alt="Course Content">
7878
{{/link-to}}
79-
{{link-to 'Announcements' 'classroom.timeline.announcements'class="tab-items" tagName="div"}}
79+
{{link-to 'Announcements' 'classroom.timeline.announcements' (query-params preserveScrollPosition=true) class="tab-items" tagName="div"}}
8080
{{#link-to 'classroom.timeline.announcements'class="tab-icons" tagName="div"}}
8181
<img src="/images/announcement-white.svg" alt="Announcements">
8282
{{/link-to}}
83-
{{link-to 'Ask Your Doubts' 'classroom.timeline.doubts' class="tab-items" tagName="div"}}
83+
{{link-to 'Ask Your Doubts' 'classroom.timeline.doubts' (query-params preserveScrollPosition=true) class="tab-items" tagName="div"}}
8484
{{#link-to 'classroom.timeline.doubts' class="tab-icons" tagName="div"}}
8585
<img src="/images/support-white.svg" alt="Ask Your Doubts">
8686
{{/link-to}}

‎app/router.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import EmberRouter from '@ember/routing/router';
2+
import RouterScroll from 'ember-router-scroll';
23
import config from './config/environment';
34
import googlePageview from './mixins/google-pageview';
45

5-
const Router = EmberRouter.extend(googlePageview, {
6+
const Router = EmberRouter.extend(googlePageview, RouterScroll,{
67
location: config.locationType,
78
rootURL: config.rootURL
89
});

‎config/environment.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ module.exports = function(environment) {
66
podModulePrefix: 'codingblocks-online/pods',
77
environment: environment,
88
rootURL: '/',
9-
locationType: 'auto',
9+
locationType: 'router-scroll',
10+
historySupportMiddleware: true,
1011
'ember-simple-auth-token': {
1112
identificationField: 'code',
1213
passwordField: 'code',
@@ -139,4 +140,4 @@ module.exports = function(environment) {
139140
};
140141

141142

142-
// 341997496266637
143+
// 341997496266637

‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
"ember-monaco": "^1.0.2",
6161
"ember-qunit": "^3.4.1",
6262
"ember-resolver": "^5.0.1",
63+
"ember-router-scroll": "^1.1.0",
6364
"ember-simple-auth": "^1.4.2",
6465
"ember-simple-auth-token": "git+https://github.com/abhishek97/ember-simple-auth-token.git",
6566
"ember-source": "~3.8.0",

‎yarn.lock

+201
Original file line numberDiff line numberDiff line change
@@ -1368,6 +1368,141 @@
13681368
dependencies:
13691369
"@types/estree" "*"
13701370

1371+
"@types/ember@^3.1.0":
1372+
version "3.1.0"
1373+
resolved "https://registry.yarnpkg.com/@types/ember/-/ember-3.1.0.tgz#3c44b846c41a1340bc823910f9222746585b3314"
1374+
integrity sha512-RHP/N7k81XIS16DLF/yTfnWEKdFFftRAUgjWO1oKNJ5ho3+iTH3vVq8u11PrhaHd+FHXNB1XKV20d5o1KEOnUQ==
1375+
dependencies:
1376+
"@types/ember__application" "*"
1377+
"@types/ember__array" "*"
1378+
"@types/ember__component" "*"
1379+
"@types/ember__controller" "*"
1380+
"@types/ember__debug" "*"
1381+
"@types/ember__engine" "*"
1382+
"@types/ember__error" "*"
1383+
"@types/ember__object" "*"
1384+
"@types/ember__polyfills" "*"
1385+
"@types/ember__routing" "*"
1386+
"@types/ember__runloop" "*"
1387+
"@types/ember__service" "*"
1388+
"@types/ember__string" "*"
1389+
"@types/ember__test" "*"
1390+
"@types/ember__utils" "*"
1391+
"@types/htmlbars-inline-precompile" "*"
1392+
"@types/jquery" "*"
1393+
"@types/rsvp" "*"
1394+
1395+
"@types/ember__application@*":
1396+
version "3.0.7"
1397+
resolved "https://registry.yarnpkg.com/@types/ember__application/-/ember__application-3.0.7.tgz#8a34f6d75661256d6d6859dcdde848bdd3bea47e"
1398+
integrity sha512-7M5Oba1u9fQ1rLs/LeyHqDhnMAqJJF+K2HBBYkbPkD8hf+DR8Ae5PvWXgHwjAmiiWe559zJcapCqawPgzMw8lg==
1399+
dependencies:
1400+
"@types/ember__application" "*"
1401+
"@types/ember__engine" "*"
1402+
"@types/ember__object" "*"
1403+
"@types/ember__routing" "*"
1404+
1405+
"@types/ember__array@*":
1406+
version "3.0.4"
1407+
resolved "https://registry.yarnpkg.com/@types/ember__array/-/ember__array-3.0.4.tgz#6b04b9188da1c315d808304c989a6e7ed24d7ad3"
1408+
integrity sha512-WPqytL1qOKoNpcY3eHKp8f7lejTGFyiySAH+yPhXMX1X2F6Y8nkCQGmmTQ9W9+nYQbyVlA3SCXqd1uTzCEOLjg==
1409+
dependencies:
1410+
"@types/ember__array" "*"
1411+
"@types/ember__object" "*"
1412+
1413+
"@types/ember__component@*":
1414+
version "3.0.5"
1415+
resolved "https://registry.yarnpkg.com/@types/ember__component/-/ember__component-3.0.5.tgz#ae0a64d53ec3bff7a100347fac52320cba068c22"
1416+
integrity sha512-pGDNR2OkPjNIcpdV/XEtzU/yE5n+vzRcYHtUCaA7dn0qoMAAiMPkJjeNMGkWQIv1q+aLyXvjiV9elcP2i1HA9g==
1417+
dependencies:
1418+
"@types/ember__component" "*"
1419+
"@types/ember__object" "*"
1420+
"@types/jquery" "*"
1421+
1422+
"@types/ember__controller@*":
1423+
version "3.0.6"
1424+
resolved "https://registry.yarnpkg.com/@types/ember__controller/-/ember__controller-3.0.6.tgz#dbfbc1480a4584efb719746b3562636398bf6261"
1425+
integrity sha512-flwfLteYs8/kSo759PYMEvKESbANIdUHhj05Gxv1aEvqQnpzNiGYTol32USO6XWi13Ui7MyxdFiWS06dj9NwMQ==
1426+
dependencies:
1427+
"@types/ember__object" "*"
1428+
1429+
"@types/ember__debug@*":
1430+
version "3.0.4"
1431+
resolved "https://registry.yarnpkg.com/@types/ember__debug/-/ember__debug-3.0.4.tgz#cdf87a580688a0e3053820eff6f390fbb7ba0e80"
1432+
integrity sha512-jTdLdNGvDn3MhktfskhdxOaDHO09QtQqeh+krI7EDePl2+Xom+KnNeveFeCkzxDkYOa+/R7UNSxW4yN/3YTw3w==
1433+
dependencies:
1434+
"@types/ember__debug" "*"
1435+
"@types/ember__engine" "*"
1436+
"@types/ember__object" "*"
1437+
1438+
"@types/ember__engine@*":
1439+
version "3.0.4"
1440+
resolved "https://registry.yarnpkg.com/@types/ember__engine/-/ember__engine-3.0.4.tgz#7e79d72653f5c7fd9f6d828d32540be372128aca"
1441+
integrity sha512-DfbM0iKgF8mvthZwshDgYn8H1BZQJOk42X5b183K7vbkaye49seeTnPDelrVRRnlMXH6BA6OHAghY92axwVLzw==
1442+
dependencies:
1443+
"@types/ember__engine" "*"
1444+
"@types/ember__object" "*"
1445+
1446+
"@types/ember__error@*":
1447+
version "3.0.3"
1448+
resolved "https://registry.yarnpkg.com/@types/ember__error/-/ember__error-3.0.3.tgz#73e5d9f05212d7965e7c2f4df39abdbf5ea41ab1"
1449+
integrity sha512-P1+YLJJ9xzc8w5mKYtXsrS070MOTjsNeoGoEHnj7nO5IfeyC34yTHdceW9hoBMRLZs2tZ+cjElUNdR1kxpl+oA==
1450+
1451+
"@types/ember__object@*":
1452+
version "3.1.1"
1453+
resolved "https://registry.yarnpkg.com/@types/ember__object/-/ember__object-3.1.1.tgz#ea0a8313fc80ac5af4826190da3e688d72f02d58"
1454+
integrity sha512-VQk38Dqiz0fVNt4RIrxyIanDqCFYDZB6QPHzdMjnjQSGeEHh130B+lFECtNQrO1V9czXzm588qpIBdPp9N2H9g==
1455+
dependencies:
1456+
"@types/ember__object" "*"
1457+
"@types/rsvp" "*"
1458+
1459+
"@types/ember__polyfills@*":
1460+
version "3.0.5"
1461+
resolved "https://registry.yarnpkg.com/@types/ember__polyfills/-/ember__polyfills-3.0.5.tgz#8f2c97b42f089afed53b4c137a6d7bbf4f7aa12e"
1462+
integrity sha512-yffc3Alk/Z12LwpRXvchcqrmou5fo37wZMoFiAOiqBYzJO3JL9gcYcrYuwg0eBdR/EwOr3aUeE8S+XAqXx3pIQ==
1463+
1464+
"@types/ember__routing@*":
1465+
version "3.0.9"
1466+
resolved "https://registry.yarnpkg.com/@types/ember__routing/-/ember__routing-3.0.9.tgz#3387d4f60b1ea3211d96e8bb9700129125c95538"
1467+
integrity sha512-E78LjdZB55Ayw0mSrFYNBxDLR6AhtuFL6JkSpySQuGmfcmEcywwlK1XDxEI5j92pMuUAZdKXaPfpOIkA0Vk0yg==
1468+
dependencies:
1469+
"@types/ember__component" "*"
1470+
"@types/ember__controller" "*"
1471+
"@types/ember__object" "*"
1472+
"@types/ember__routing" "*"
1473+
"@types/ember__service" "*"
1474+
1475+
"@types/ember__runloop@*":
1476+
version "3.0.5"
1477+
resolved "https://registry.yarnpkg.com/@types/ember__runloop/-/ember__runloop-3.0.5.tgz#7101cc0d5b06d2b578a34ce4b9e8355d9061ac71"
1478+
integrity sha512-9K5P0HgP5XxOzZqovsSU5iZfn2czpNMCbA9b1NLhDMdfPqySu7Ow3x0pJIj46hmRuaA2P3f/6PrXIlgsOB0fFQ==
1479+
dependencies:
1480+
"@types/ember__runloop" "*"
1481+
1482+
"@types/ember__service@*":
1483+
version "3.0.5"
1484+
resolved "https://registry.yarnpkg.com/@types/ember__service/-/ember__service-3.0.5.tgz#6e566ae03eb26ec16ea6cc84e9cc190d926b791b"
1485+
integrity sha512-mThqrHMYVGSvsLRwJRWW0HV2DJ9WwLxiC13kSffhRqAKjQfeyq6ELoGtbXXMY3ri/nnGQJ6MVYY142s7AWdT/A==
1486+
dependencies:
1487+
"@types/ember__object" "*"
1488+
1489+
"@types/ember__string@*":
1490+
version "3.0.6"
1491+
resolved "https://registry.yarnpkg.com/@types/ember__string/-/ember__string-3.0.6.tgz#79b10b0fc0136a9c86536bc55cbd18cae9a9bd3b"
1492+
integrity sha512-VBKH8nR/uK2tlr9eob8Nl+0cKP62GNtFWqq4PVGusnBMPFktGley1gsUhqNYJ9G3y2mvVfikicxM2/bE5AMYLA==
1493+
1494+
"@types/ember__test@*":
1495+
version "3.0.5"
1496+
resolved "https://registry.yarnpkg.com/@types/ember__test/-/ember__test-3.0.5.tgz#8435b9b3caa5b97a9057d8f4e922c20f2279f93f"
1497+
integrity sha512-7F45zVSaM1hqXtv0bTMOLwgvATPfAGsnvU5CmMdUpuLBHRnOIe5HDAx0s1Yr4I318IAT5LgAX180dIJmXs1/+g==
1498+
dependencies:
1499+
"@types/ember__application" "*"
1500+
1501+
"@types/ember__utils@*":
1502+
version "3.0.2"
1503+
resolved "https://registry.yarnpkg.com/@types/ember__utils/-/ember__utils-3.0.2.tgz#d4c32007d0c84c95faa9221a1582b87ac3b1b4f3"
1504+
integrity sha512-d6fswmNDozslgUk+0DfC1oG0vD8R5ivvrEe0t3BuWSnF+TVyYhj24KZINecpBySg/4RODCg2IVV1GeRsimqzkg==
1505+
13711506
"@types/estree@*", "@types/[email protected]":
13721507
version "0.0.39"
13731508
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
@@ -1387,6 +1522,18 @@
13871522
"@types/minimatch" "*"
13881523
"@types/node" "*"
13891524

1525+
"@types/htmlbars-inline-precompile@*":
1526+
version "1.0.1"
1527+
resolved "https://registry.yarnpkg.com/@types/htmlbars-inline-precompile/-/htmlbars-inline-precompile-1.0.1.tgz#de564513fabb165746aecd76369c87bd85e5bbb4"
1528+
integrity sha512-sVD2e6QAAHW0Y6Btse+tTA9k9g0iKm87wjxRsgZRU5EwSooz80tenbV+fA+f2BI2g0G2CqxsS1rIlwQCtPRQow==
1529+
1530+
"@types/jquery@*":
1531+
version "3.3.29"
1532+
resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.29.tgz#680a2219ce3c9250483722fccf5570d1e2d08abd"
1533+
integrity sha512-FhJvBninYD36v3k6c+bVk1DSZwh7B5Dpb/Pyk3HKVsiohn0nhbefZZ+3JXbWQhFyt0MxSl2jRDdGQPHeOHFXrQ==
1534+
dependencies:
1535+
"@types/sizzle" "*"
1536+
13901537
"@types/minimatch@*", "@types/minimatch@^3.0.3":
13911538
version "3.0.3"
13921539
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -1402,6 +1549,16 @@
14021549
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.44.tgz#70bb8b5fab1f9e461c2a46a5a4fedfe3af6e2f87"
14031550
integrity sha512-hR+jK4kSOX+u5aQ6Zj6az5N4l1AeXH37/sOenbgxJvkO450C5qQL4/1twdufIMLC3o3hNfJNrPfQn0ivMdKfPg==
14041551

1552+
"@types/rsvp@*", "@types/rsvp@^4.0.2":
1553+
version "4.0.2"
1554+
resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.2.tgz#bf9f72eaa6771292638a85bb8ce1db97e754b371"
1555+
integrity sha512-48ZwxFD1hdBj8QMOSNGA2kYuo3+SKh8OEYh5cMi7cPRZXBF9jwVPV4yqA7EcJTNlAJL0v99pEUYetl0TsufMQA==
1556+
1557+
"@types/sizzle@*":
1558+
version "2.3.2"
1559+
resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47"
1560+
integrity sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==
1561+
14051562
"@types/tmp@^0.0.33":
14061563
version "0.0.33"
14071564
resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.0.33.tgz#1073c4bc824754ae3d10cfab88ab0237ba964e4d"
@@ -4593,6 +4750,17 @@ ember-ajax@^4.0.1:
45934750
ember-cli-babel "^6.16.0"
45944751
najax "^1.0.3"
45954752

4753+
ember-app-scheduler@^1.0.5:
4754+
version "1.0.8"
4755+
resolved "https://registry.yarnpkg.com/ember-app-scheduler/-/ember-app-scheduler-1.0.8.tgz#37adacce2fa5ab59324e2c0b08f3c4a3568025b4"
4756+
integrity sha512-fYCOhQTLb1b+TZ2PBSqyvHXVAxf7qfWD0ZSJTd/IdU/xbLJSt34X75w7qK2uBHZCkVvCNm/ATW3pjFC/0zYk7A==
4757+
dependencies:
4758+
"@types/ember" "^3.1.0"
4759+
"@types/rsvp" "^4.0.2"
4760+
ember-cli-babel "^7.1.3"
4761+
ember-cli-typescript "^2.0.0"
4762+
ember-compatibility-helpers "^1.1.2"
4763+
45964764
ember-asset-loader@^0.4.3:
45974765
version "0.4.3"
45984766
resolved "https://registry.yarnpkg.com/ember-asset-loader/-/ember-asset-loader-0.4.3.tgz#cb59e1d0631f71046fc6e043a78337fea7f4c0a2"
@@ -4950,6 +5118,24 @@ ember-cli-test-loader@^2.2.0:
49505118
dependencies:
49515119
ember-cli-babel "^6.8.1"
49525120

5121+
ember-cli-typescript@^2.0.0:
5122+
version "2.0.1"
5123+
resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-2.0.1.tgz#9c46729213b9e1d13f5c3ff8421d772134aa889e"
5124+
integrity sha512-xwSEQOUNM621Wt+XJWpbLhBIeqC/dM1lDS+oZQ2nSjxp4MLZkpKuiVBqdbBWcURbvv8ghoVQPfy8wYU4JIFkLA==
5125+
dependencies:
5126+
"@babel/plugin-proposal-class-properties" "^7.1.0"
5127+
"@babel/plugin-transform-typescript" "^7.1.0"
5128+
ansi-to-html "^0.6.6"
5129+
debug "^4.0.0"
5130+
ember-cli-babel-plugin-helpers "^1.0.0"
5131+
execa "^1.0.0"
5132+
fs-extra "^7.0.0"
5133+
resolve "^1.5.0"
5134+
rsvp "^4.8.1"
5135+
semver "^6.0.0"
5136+
stagehand "^1.0.0"
5137+
walk-sync "^1.0.0"
5138+
49535139
ember-cli-typescript@^2.0.0-beta.2:
49545140
version "2.0.0-rc.2"
49555141
resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-2.0.0-rc.2.tgz#d8253097279ed292c20e739ee72f8fb994dbb6b7"
@@ -5457,6 +5643,16 @@ ember-router-generator@^1.2.3:
54575643
dependencies:
54585644
recast "^0.11.3"
54595645

5646+
ember-router-scroll@^1.1.0:
5647+
version "1.1.0"
5648+
resolved "https://registry.yarnpkg.com/ember-router-scroll/-/ember-router-scroll-1.1.0.tgz#17f7ead22a4e9f43a8956d942ca37b5e507bada5"
5649+
integrity sha512-1eFbmsfY/DN95/3zhrMZSTGFavwtgWf7HrfM7SFipu/+Dn7w8Y5dWtqbk/hqE8FTDMiklFR52VcjTHEffRu0sw==
5650+
dependencies:
5651+
ember-app-scheduler "^1.0.5"
5652+
ember-cli-babel "^7.1.2"
5653+
ember-compatibility-helpers "^1.1.2"
5654+
ember-getowner-polyfill "^2.2.0"
5655+
54605656
ember-runtime-enumerable-includes-polyfill@^2.0.0:
54615657
version "2.1.0"
54625658
resolved "https://registry.yarnpkg.com/ember-runtime-enumerable-includes-polyfill/-/ember-runtime-enumerable-includes-polyfill-2.1.0.tgz#dc6d4a028471e4acc350dfd2a149874fb20913f5"
@@ -10681,6 +10877,11 @@ scss-tokenizer@^0.2.3:
1068110877
resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
1068210878
integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
1068310879

10880+
semver@^6.0.0:
10881+
version "6.1.0"
10882+
resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.0.tgz#e95dc415d45ecf03f2f9f83b264a6b11f49c0cca"
10883+
integrity sha512-kCqEOOHoBcFs/2Ccuk4Xarm/KiWRSLEX9CAZF8xkJ6ZPlIoTZ8V5f7J16vYLJqDbR7KrxTJpR2lqjIEm2Qx9cQ==
10884+
1068410885
semver@~5.3.0:
1068510886
version "5.3.0"
1068610887
resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"

0 commit comments

Comments
 (0)