Skip to content

Commit

Permalink
Update ember-scrollable (#792)
Browse files Browse the repository at this point in the history
* Update ember-scrollable

This uses my fork for now, but hopefully the changes will make it upstream

* Update

* Get things working again

* Update deprecate import path

* Update ember-scrollable again

* Fix missing `this`
  • Loading branch information
RobbieTheWagner authored Jul 14, 2022
1 parent 3c2d5c4 commit 65f12fa
Show file tree
Hide file tree
Showing 6 changed files with 159 additions and 748 deletions.
2 changes: 1 addition & 1 deletion addon/components/lt-body.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Component from '@ember/component';
import { deprecate } from '@ember/application/deprecations';
import { deprecate } from '@ember/debug';
import { computed, observer } from '@ember/object';
import { readOnly } from '@ember/object/computed';
import layout from 'ember-light-table/templates/components/lt-body';
Expand Down
2 changes: 1 addition & 1 deletion addon/templates/components/lt-scrollable.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{#if this.virtualScrollbar}}
<EmberScrollable
@classNames='lt-scrollable'
class="lt-scrollable"
@autoHide={{this.autoHide}}
@horizontal={{this.horizontal}}
@vertical={{this.vertical}}
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"ember-cli-string-helpers": "^6.1.0",
"ember-get-config": "^2.1.1",
"ember-in-viewport": "^4.0.2",
"ember-scrollable": "^1.0.2",
"ember-scrollable": "rwwagner90/ember-scrollable#e00bd9b3719d5b0ea04870edb63713d10903990b",
"ember-truth-helpers": "^3.0.0",
"ember-wormhole": "^0.6.0"
},
Expand All @@ -61,7 +61,7 @@
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-github-pages": "^0.2.2",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-mirage": "^2.4.0",
"ember-cli-mirage": "^3.0.0-alpha.3",
"ember-cli-sass": "^10.0.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
Expand All @@ -73,12 +73,12 @@
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "^1.0.0",
"ember-power-select": "^4.0.0",
"ember-power-select": "^5.0.4",
"ember-prism": "^0.12.0",
"ember-qunit": "^5.1.4",
"ember-resolver": "^8.0.2",
"ember-responsive": "^5.0.0",
"ember-source": "~3.28.0",
"ember-source": "~3.20.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^3.6.0",
"ember-try": "^1.4.0",
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/components/light-table-occlusion-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ module('Integration | Component | light table | occlusion', function (hooks) {

await render(hbs`
<div style="height: 500px">
{{#light-table table id='lightTable' occlusion=true estimatedRowHeight=30 as |t|}}
{{#light-table this.table id='lightTable' occlusion=true estimatedRowHeight=30 as |t|}}
{{t.body}}
{{t.foot fixed=fixed}}
{{t.foot fixed=this.fixed}}
{{/light-table}}
</div>
`);
Expand Down Expand Up @@ -237,7 +237,7 @@ module('Integration | Component | light table | occlusion', function (hooks) {
await render(hbs`
{{#light-table this.table height='500px' occlusion=true estimatedRowHeight=30 as |t|}}
{{t.body
rowComponent=(component "custom-row" classNames="custom-row" current=current)
rowComponent=(component "custom-row" classNames="custom-row" current=this.current)
}}
{{/light-table}}
`);
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/components/light-table-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ module('Integration | Component | light table', function (hooks) {
await render(hbs`
{{#light-table this.table height='40vh' as |t|}}
{{t.head fixed=true}}
{{t.body onScrolledToBottom=(action onScrolledToBottom)}}
{{t.body onScrolledToBottom=this.onScrolledToBottom}}
{{/light-table}}
`);

Expand Down Expand Up @@ -139,7 +139,7 @@ module('Integration | Component | light table', function (hooks) {
await render(hbs`
{{#light-table this.table height='40vh' id="table" as |t|}}
{{t.head fixed=true}}
{{t.body isInViewport=isInViewport inViewport=(action inViewport) onScrolledToBottom=(action onScrolledToBottom)}}
{{t.body isInViewport=this.isInViewport inViewport=this.inViewport onScrolledToBottom=this.onScrolledToBottom}}
{{/light-table}}
`);
let scrollContainer = find('#table .tse-scroll-content');
Expand Down Expand Up @@ -219,7 +219,7 @@ module('Integration | Component | light table', function (hooks) {
<div style="height: 500px">
{{#light-table this.table id='lightTable' as |t|}}
{{t.body}}
{{t.foot fixed=fixed}}
{{t.foot fixed=this.fixed}}
{{/light-table}}
</div>
`);
Expand Down Expand Up @@ -305,7 +305,7 @@ module('Integration | Component | light table', function (hooks) {
await render(hbs`
{{#light-table this.table as |t|}}
{{t.body
rowComponent=(component "custom-row" classNames="custom-row" current=current)
rowComponent=(component "custom-row" classNames="custom-row" current=this.current)
}}
{{/light-table}}
`);
Expand Down
Loading

0 comments on commit 65f12fa

Please sign in to comment.