Skip to content

Enable Scrolling to Top #420

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

Closed
wants to merge 1 commit into from
Closed
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
2 changes: 1 addition & 1 deletion app/pods/classroom/timeline/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { inject as service } from '@ember-decorators/service';
import { computed } from '@ember-decorators/object';

export default class TimelineController extends Controller {
queryParams = ['showFeedback']
queryParams = ['showFeedback','preserveScrollPosition']
showFeedback = false

@service api
Expand Down
8 changes: 4 additions & 4 deletions app/pods/classroom/timeline/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,19 @@
</div>
</div>
<div class="tab-nav">
{{link-to 'Overview' 'classroom.timeline.overview' class="tab-items" tagName="div"}}
{{link-to 'Overview' 'classroom.timeline.overview' (query-params preserveScrollPosition=true) class="tab-items" tagName="div"}}
{{#link-to 'classroom.timeline.overview' class="tab-icons" tagName="div"}}
<img src="/images/menu-white.svg" alt="Overview">
{{/link-to}}
{{link-to 'Course Content' 'classroom.timeline.contents'class="tab-items" tagName="div"}}
{{link-to 'Course Content' 'classroom.timeline.contents' (query-params preserveScrollPosition=true) class="tab-items" tagName="div"}}
{{#link-to 'classroom.timeline.contents'class="tab-icons" tagName="div"}}
<img src="/images/docs-white.svg" alt="Course Content">
{{/link-to}}
{{link-to 'Announcements' 'classroom.timeline.announcements'class="tab-items" tagName="div"}}
{{link-to 'Announcements' 'classroom.timeline.announcements' (query-params preserveScrollPosition=true) class="tab-items" tagName="div"}}
{{#link-to 'classroom.timeline.announcements'class="tab-icons" tagName="div"}}
<img src="/images/announcement-white.svg" alt="Announcements">
{{/link-to}}
{{link-to 'Ask Your Doubts' 'classroom.timeline.doubts' class="tab-items" tagName="div"}}
{{link-to 'Ask Your Doubts' 'classroom.timeline.doubts' (query-params preserveScrollPosition=true) class="tab-items" tagName="div"}}
{{#link-to 'classroom.timeline.doubts' class="tab-icons" tagName="div"}}
<img src="/images/support-white.svg" alt="Ask Your Doubts">
{{/link-to}}
Expand Down
3 changes: 2 additions & 1 deletion app/router.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import EmberRouter from '@ember/routing/router';
import RouterScroll from 'ember-router-scroll';
import config from './config/environment';
import googlePageview from './mixins/google-pageview';

const Router = EmberRouter.extend(googlePageview, {
const Router = EmberRouter.extend(googlePageview, RouterScroll,{
location: config.locationType,
rootURL: config.rootURL
});
Expand Down
5 changes: 3 additions & 2 deletions config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ module.exports = function(environment) {
podModulePrefix: 'codingblocks-online/pods',
environment: environment,
rootURL: '/',
locationType: 'auto',
locationType: 'router-scroll',
historySupportMiddleware: true,
'ember-simple-auth-token': {
identificationField: 'code',
passwordField: 'code',
Expand Down Expand Up @@ -139,4 +140,4 @@ module.exports = function(environment) {
};


// 341997496266637
// 341997496266637
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
"ember-monaco": "^1.0.2",
"ember-qunit": "^3.4.1",
"ember-resolver": "^5.0.1",
"ember-router-scroll": "^1.1.0",
"ember-simple-auth": "^1.4.2",
"ember-simple-auth-token": "git+https://github.com/abhishek97/ember-simple-auth-token.git",
"ember-source": "~3.8.0",
Expand Down
201 changes: 201 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1368,6 +1368,141 @@
dependencies:
"@types/estree" "*"

"@types/ember@^3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@types/ember/-/ember-3.1.0.tgz#3c44b846c41a1340bc823910f9222746585b3314"
integrity sha512-RHP/N7k81XIS16DLF/yTfnWEKdFFftRAUgjWO1oKNJ5ho3+iTH3vVq8u11PrhaHd+FHXNB1XKV20d5o1KEOnUQ==
dependencies:
"@types/ember__application" "*"
"@types/ember__array" "*"
"@types/ember__component" "*"
"@types/ember__controller" "*"
"@types/ember__debug" "*"
"@types/ember__engine" "*"
"@types/ember__error" "*"
"@types/ember__object" "*"
"@types/ember__polyfills" "*"
"@types/ember__routing" "*"
"@types/ember__runloop" "*"
"@types/ember__service" "*"
"@types/ember__string" "*"
"@types/ember__test" "*"
"@types/ember__utils" "*"
"@types/htmlbars-inline-precompile" "*"
"@types/jquery" "*"
"@types/rsvp" "*"

"@types/ember__application@*":
version "3.0.7"
resolved "https://registry.yarnpkg.com/@types/ember__application/-/ember__application-3.0.7.tgz#8a34f6d75661256d6d6859dcdde848bdd3bea47e"
integrity sha512-7M5Oba1u9fQ1rLs/LeyHqDhnMAqJJF+K2HBBYkbPkD8hf+DR8Ae5PvWXgHwjAmiiWe559zJcapCqawPgzMw8lg==
dependencies:
"@types/ember__application" "*"
"@types/ember__engine" "*"
"@types/ember__object" "*"
"@types/ember__routing" "*"

"@types/ember__array@*":
version "3.0.4"
resolved "https://registry.yarnpkg.com/@types/ember__array/-/ember__array-3.0.4.tgz#6b04b9188da1c315d808304c989a6e7ed24d7ad3"
integrity sha512-WPqytL1qOKoNpcY3eHKp8f7lejTGFyiySAH+yPhXMX1X2F6Y8nkCQGmmTQ9W9+nYQbyVlA3SCXqd1uTzCEOLjg==
dependencies:
"@types/ember__array" "*"
"@types/ember__object" "*"

"@types/ember__component@*":
version "3.0.5"
resolved "https://registry.yarnpkg.com/@types/ember__component/-/ember__component-3.0.5.tgz#ae0a64d53ec3bff7a100347fac52320cba068c22"
integrity sha512-pGDNR2OkPjNIcpdV/XEtzU/yE5n+vzRcYHtUCaA7dn0qoMAAiMPkJjeNMGkWQIv1q+aLyXvjiV9elcP2i1HA9g==
dependencies:
"@types/ember__component" "*"
"@types/ember__object" "*"
"@types/jquery" "*"

"@types/ember__controller@*":
version "3.0.6"
resolved "https://registry.yarnpkg.com/@types/ember__controller/-/ember__controller-3.0.6.tgz#dbfbc1480a4584efb719746b3562636398bf6261"
integrity sha512-flwfLteYs8/kSo759PYMEvKESbANIdUHhj05Gxv1aEvqQnpzNiGYTol32USO6XWi13Ui7MyxdFiWS06dj9NwMQ==
dependencies:
"@types/ember__object" "*"

"@types/ember__debug@*":
version "3.0.4"
resolved "https://registry.yarnpkg.com/@types/ember__debug/-/ember__debug-3.0.4.tgz#cdf87a580688a0e3053820eff6f390fbb7ba0e80"
integrity sha512-jTdLdNGvDn3MhktfskhdxOaDHO09QtQqeh+krI7EDePl2+Xom+KnNeveFeCkzxDkYOa+/R7UNSxW4yN/3YTw3w==
dependencies:
"@types/ember__debug" "*"
"@types/ember__engine" "*"
"@types/ember__object" "*"

"@types/ember__engine@*":
version "3.0.4"
resolved "https://registry.yarnpkg.com/@types/ember__engine/-/ember__engine-3.0.4.tgz#7e79d72653f5c7fd9f6d828d32540be372128aca"
integrity sha512-DfbM0iKgF8mvthZwshDgYn8H1BZQJOk42X5b183K7vbkaye49seeTnPDelrVRRnlMXH6BA6OHAghY92axwVLzw==
dependencies:
"@types/ember__engine" "*"
"@types/ember__object" "*"

"@types/ember__error@*":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@types/ember__error/-/ember__error-3.0.3.tgz#73e5d9f05212d7965e7c2f4df39abdbf5ea41ab1"
integrity sha512-P1+YLJJ9xzc8w5mKYtXsrS070MOTjsNeoGoEHnj7nO5IfeyC34yTHdceW9hoBMRLZs2tZ+cjElUNdR1kxpl+oA==

"@types/ember__object@*":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@types/ember__object/-/ember__object-3.1.1.tgz#ea0a8313fc80ac5af4826190da3e688d72f02d58"
integrity sha512-VQk38Dqiz0fVNt4RIrxyIanDqCFYDZB6QPHzdMjnjQSGeEHh130B+lFECtNQrO1V9czXzm588qpIBdPp9N2H9g==
dependencies:
"@types/ember__object" "*"
"@types/rsvp" "*"

"@types/ember__polyfills@*":
version "3.0.5"
resolved "https://registry.yarnpkg.com/@types/ember__polyfills/-/ember__polyfills-3.0.5.tgz#8f2c97b42f089afed53b4c137a6d7bbf4f7aa12e"
integrity sha512-yffc3Alk/Z12LwpRXvchcqrmou5fo37wZMoFiAOiqBYzJO3JL9gcYcrYuwg0eBdR/EwOr3aUeE8S+XAqXx3pIQ==

"@types/ember__routing@*":
version "3.0.9"
resolved "https://registry.yarnpkg.com/@types/ember__routing/-/ember__routing-3.0.9.tgz#3387d4f60b1ea3211d96e8bb9700129125c95538"
integrity sha512-E78LjdZB55Ayw0mSrFYNBxDLR6AhtuFL6JkSpySQuGmfcmEcywwlK1XDxEI5j92pMuUAZdKXaPfpOIkA0Vk0yg==
dependencies:
"@types/ember__component" "*"
"@types/ember__controller" "*"
"@types/ember__object" "*"
"@types/ember__routing" "*"
"@types/ember__service" "*"

"@types/ember__runloop@*":
version "3.0.5"
resolved "https://registry.yarnpkg.com/@types/ember__runloop/-/ember__runloop-3.0.5.tgz#7101cc0d5b06d2b578a34ce4b9e8355d9061ac71"
integrity sha512-9K5P0HgP5XxOzZqovsSU5iZfn2czpNMCbA9b1NLhDMdfPqySu7Ow3x0pJIj46hmRuaA2P3f/6PrXIlgsOB0fFQ==
dependencies:
"@types/ember__runloop" "*"

"@types/ember__service@*":
version "3.0.5"
resolved "https://registry.yarnpkg.com/@types/ember__service/-/ember__service-3.0.5.tgz#6e566ae03eb26ec16ea6cc84e9cc190d926b791b"
integrity sha512-mThqrHMYVGSvsLRwJRWW0HV2DJ9WwLxiC13kSffhRqAKjQfeyq6ELoGtbXXMY3ri/nnGQJ6MVYY142s7AWdT/A==
dependencies:
"@types/ember__object" "*"

"@types/ember__string@*":
version "3.0.6"
resolved "https://registry.yarnpkg.com/@types/ember__string/-/ember__string-3.0.6.tgz#79b10b0fc0136a9c86536bc55cbd18cae9a9bd3b"
integrity sha512-VBKH8nR/uK2tlr9eob8Nl+0cKP62GNtFWqq4PVGusnBMPFktGley1gsUhqNYJ9G3y2mvVfikicxM2/bE5AMYLA==

"@types/ember__test@*":
version "3.0.5"
resolved "https://registry.yarnpkg.com/@types/ember__test/-/ember__test-3.0.5.tgz#8435b9b3caa5b97a9057d8f4e922c20f2279f93f"
integrity sha512-7F45zVSaM1hqXtv0bTMOLwgvATPfAGsnvU5CmMdUpuLBHRnOIe5HDAx0s1Yr4I318IAT5LgAX180dIJmXs1/+g==
dependencies:
"@types/ember__application" "*"

"@types/ember__utils@*":
version "3.0.2"
resolved "https://registry.yarnpkg.com/@types/ember__utils/-/ember__utils-3.0.2.tgz#d4c32007d0c84c95faa9221a1582b87ac3b1b4f3"
integrity sha512-d6fswmNDozslgUk+0DfC1oG0vD8R5ivvrEe0t3BuWSnF+TVyYhj24KZINecpBySg/4RODCg2IVV1GeRsimqzkg==

"@types/estree@*", "@types/[email protected]":
version "0.0.39"
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
Expand All @@ -1387,6 +1522,18 @@
"@types/minimatch" "*"
"@types/node" "*"

"@types/htmlbars-inline-precompile@*":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@types/htmlbars-inline-precompile/-/htmlbars-inline-precompile-1.0.1.tgz#de564513fabb165746aecd76369c87bd85e5bbb4"
integrity sha512-sVD2e6QAAHW0Y6Btse+tTA9k9g0iKm87wjxRsgZRU5EwSooz80tenbV+fA+f2BI2g0G2CqxsS1rIlwQCtPRQow==

"@types/jquery@*":
version "3.3.29"
resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.29.tgz#680a2219ce3c9250483722fccf5570d1e2d08abd"
integrity sha512-FhJvBninYD36v3k6c+bVk1DSZwh7B5Dpb/Pyk3HKVsiohn0nhbefZZ+3JXbWQhFyt0MxSl2jRDdGQPHeOHFXrQ==
dependencies:
"@types/sizzle" "*"

"@types/minimatch@*", "@types/minimatch@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
Expand All @@ -1402,6 +1549,16 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.44.tgz#70bb8b5fab1f9e461c2a46a5a4fedfe3af6e2f87"
integrity sha512-hR+jK4kSOX+u5aQ6Zj6az5N4l1AeXH37/sOenbgxJvkO450C5qQL4/1twdufIMLC3o3hNfJNrPfQn0ivMdKfPg==

"@types/rsvp@*", "@types/rsvp@^4.0.2":
version "4.0.2"
resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.2.tgz#bf9f72eaa6771292638a85bb8ce1db97e754b371"
integrity sha512-48ZwxFD1hdBj8QMOSNGA2kYuo3+SKh8OEYh5cMi7cPRZXBF9jwVPV4yqA7EcJTNlAJL0v99pEUYetl0TsufMQA==

"@types/sizzle@*":
version "2.3.2"
resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47"
integrity sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==

"@types/tmp@^0.0.33":
version "0.0.33"
resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.0.33.tgz#1073c4bc824754ae3d10cfab88ab0237ba964e4d"
Expand Down Expand Up @@ -4593,6 +4750,17 @@ ember-ajax@^4.0.1:
ember-cli-babel "^6.16.0"
najax "^1.0.3"

ember-app-scheduler@^1.0.5:
version "1.0.8"
resolved "https://registry.yarnpkg.com/ember-app-scheduler/-/ember-app-scheduler-1.0.8.tgz#37adacce2fa5ab59324e2c0b08f3c4a3568025b4"
integrity sha512-fYCOhQTLb1b+TZ2PBSqyvHXVAxf7qfWD0ZSJTd/IdU/xbLJSt34X75w7qK2uBHZCkVvCNm/ATW3pjFC/0zYk7A==
dependencies:
"@types/ember" "^3.1.0"
"@types/rsvp" "^4.0.2"
ember-cli-babel "^7.1.3"
ember-cli-typescript "^2.0.0"
ember-compatibility-helpers "^1.1.2"

ember-asset-loader@^0.4.3:
version "0.4.3"
resolved "https://registry.yarnpkg.com/ember-asset-loader/-/ember-asset-loader-0.4.3.tgz#cb59e1d0631f71046fc6e043a78337fea7f4c0a2"
Expand Down Expand Up @@ -4950,6 +5118,24 @@ ember-cli-test-loader@^2.2.0:
dependencies:
ember-cli-babel "^6.8.1"

ember-cli-typescript@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-2.0.1.tgz#9c46729213b9e1d13f5c3ff8421d772134aa889e"
integrity sha512-xwSEQOUNM621Wt+XJWpbLhBIeqC/dM1lDS+oZQ2nSjxp4MLZkpKuiVBqdbBWcURbvv8ghoVQPfy8wYU4JIFkLA==
dependencies:
"@babel/plugin-proposal-class-properties" "^7.1.0"
"@babel/plugin-transform-typescript" "^7.1.0"
ansi-to-html "^0.6.6"
debug "^4.0.0"
ember-cli-babel-plugin-helpers "^1.0.0"
execa "^1.0.0"
fs-extra "^7.0.0"
resolve "^1.5.0"
rsvp "^4.8.1"
semver "^6.0.0"
stagehand "^1.0.0"
walk-sync "^1.0.0"

ember-cli-typescript@^2.0.0-beta.2:
version "2.0.0-rc.2"
resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-2.0.0-rc.2.tgz#d8253097279ed292c20e739ee72f8fb994dbb6b7"
Expand Down Expand Up @@ -5457,6 +5643,16 @@ ember-router-generator@^1.2.3:
dependencies:
recast "^0.11.3"

ember-router-scroll@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/ember-router-scroll/-/ember-router-scroll-1.1.0.tgz#17f7ead22a4e9f43a8956d942ca37b5e507bada5"
integrity sha512-1eFbmsfY/DN95/3zhrMZSTGFavwtgWf7HrfM7SFipu/+Dn7w8Y5dWtqbk/hqE8FTDMiklFR52VcjTHEffRu0sw==
dependencies:
ember-app-scheduler "^1.0.5"
ember-cli-babel "^7.1.2"
ember-compatibility-helpers "^1.1.2"
ember-getowner-polyfill "^2.2.0"

ember-runtime-enumerable-includes-polyfill@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/ember-runtime-enumerable-includes-polyfill/-/ember-runtime-enumerable-includes-polyfill-2.1.0.tgz#dc6d4a028471e4acc350dfd2a149874fb20913f5"
Expand Down Expand Up @@ -10681,6 +10877,11 @@ scss-tokenizer@^0.2.3:
resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==

semver@^6.0.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.0.tgz#e95dc415d45ecf03f2f9f83b264a6b11f49c0cca"
integrity sha512-kCqEOOHoBcFs/2Ccuk4Xarm/KiWRSLEX9CAZF8xkJ6ZPlIoTZ8V5f7J16vYLJqDbR7KrxTJpR2lqjIEm2Qx9cQ==

semver@~5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
Expand Down