Skip to content
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

Update all the things #142

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Replace some actions
  • Loading branch information
RobbieTheWagner committed Jul 14, 2022
commit 9a986f3f9782b1dd77829a7a584bbe5d5ab68e4d
16 changes: 8 additions & 8 deletions addon/templates/components/ember-scrollable.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
@horizontal={{true}}
@showHandle={{this.showHandle}}
@isDragging={{this.isHorizontalDragging}}
@onJumpTo={{action 'horizontalJumpTo'}}
@onDrag={{action 'horizontalDrag'}}
@onDragStart={{action 'horizontalDragBoundary' true}}
@onDragEnd={{action 'horizontalDragBoundary' false}}
@onJumpTo={{this.horizontalJumpTo}}
@onDrag={{this.horizontalDrag}}
@onDragStart={{fn this.horizontalDragBoundary true}}
@onDragEnd={{fn this.horizontalDragBoundary false}}
/>
{{/if}}
{{#if this.vertical}}
Expand All @@ -26,10 +26,10 @@
@horizontal={{false}}
@showHandle={{this.showHandle}}
@isDragging={{this.isVerticalDragging}}
@onJumpTo={{action 'verticalJumpTo'}}
@onDrag={{action 'verticalDrag'}}
@onDragStart={{action 'verticalBoundaryEvent' true}}
@onDragEnd={{action 'verticalBoundaryEvent' false}}
@onJumpTo={{this.verticalJumpTo}}
@onDrag={{this.verticalDrag}}
@onDragStart={{fn this.verticalBoundaryEvent true}}
@onDragEnd={{fn this.verticalBoundaryEvent false}}
/>
{{/if}}
<ScrollContentElement
Expand Down
10 changes: 5 additions & 5 deletions tests/dummy/app/templates/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class='output'>
{{! BEGIN-SNIPPET vertical }}
<div style='height: 400px;'>
<EmberScrollable @onScrolledToBottom={{action 'log' 'Bottom reached!'}}>
<EmberScrollable @onScrolledToBottom={{fn this.log 'Bottom reached!'}}>
<p>
Some content
</p>
Expand Down Expand Up @@ -190,7 +190,7 @@
<h1>
No Scroll
</h1>
<button type='button' {{action 'toggleHeight'}}>
<button type='button' {{on 'click' this.toggleHeight}}>
Make {{if this.isShort 'Overflow' 'No Overflow'}}
</button>
<div class='output'>
Expand Down Expand Up @@ -267,7 +267,7 @@
<EmberScrollable
@horizontal={{true}}
@vertical={{true}}
@onScrolledToBottom={{action 'log' 'Bottom reached!'}}
@onScrolledToBottom={{fn this.log 'Bottom reached!'}}
>
<div class='wide-content'>
<p>
Expand Down Expand Up @@ -348,7 +348,7 @@
<h1>
Auto resizing
</h1>
<button type='button' {{action 'toggleHeight'}}>
<button type='button' {{on "click" this.toggleHeight}}>
Make {{if this.isShort 'Tall' 'Short'}}
</button>
<p>
Expand All @@ -358,7 +358,7 @@
<div class='output'>
{{! BEGIN-SNIPPET vertical }}
<div class={{if this.isShort 'is-short' 'is-tall'}}>
<EmberScrollable @onScrolledToBottom={{action 'log' 'Bottom reached!'}}>
<EmberScrollable @onScrolledToBottom={{fn this.log 'Bottom reached!'}}>
<p>
Some content
</p>
Expand Down