Skip to content

chore: update ember-concurrency #343

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.

Sign up for GitHub

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

Open
betocantu93 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

chore: update ember-concurrency #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
618f9ab
chore: update ember-concurrency
betocantu93 Jul 22, 2021
dde2ce7
refactor: do not use #with
betocantu93 Mar 2, 2022
5b7adb5
chore: bump ember-truth-helpers
betocantu93 Mar 2, 2022
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
115 changes: 63 additions & 52 deletions addon/templates/components/printable-pages/chapter.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,67 @@
{{#each this.pages as |page pageIndexInChapter|}}
{{#with (add this.startPage pageIndexInChapter) as |pageNumber|}}
{{#printable-pages/page-layout
pageLayout=pageLayout
pageNumber=pageNumber
}}
{{#printable-pages/chapter-page
pageIndexInChapter=pageIndexInChapter
pageMeta=(hash
current=pageNumber
pageNumber=pageNumber
chapterNumber=(inc this.chapter.index)
total=lastReportPage
isFirst=(eq pageNumber 1)
isFirstInChapter=(eq pageNumber this.startPage)
isLast=(eq pageNumber lastReportPage)
isLastInChapter=(eq pageNumber this.endPage)
)

registerSection=(action this.registerSection this.elementId)
renderNextItem=(action "renderNextItem" pageIndexInChapter)
onPageOverflow=(action "onPageOverflow" pageIndexInChapter)
renderNextPage=(action "renderNextPage" pageIndexInChapter)
as |pageComponent|
{{#let (add this.startPage pageIndexInChapter) as |pageNumber|}}
{{#if pageNumber}}
{{#printable-pages/page-layout
pageLayout=pageLayout
pageNumber=pageNumber
}}
{{#if (eq pageComponent.block "header")}}
{{yield (hash
page-header=(component "printable-pages/page-header" pageMeta=pageComponent.meta)
)}}
{{/if}}

{{#if (eq pageComponent.block "body")}}
{{yield (hash
number=pageComponent.meta
section=(component "printable-pages/section"
sectionMap=this.chapter.sectionMap
pageIndexInChapter=pageIndexInChapter
pageElement=pageComponent.element
{{#printable-pages/chapter-page
pageIndexInChapter=pageIndexInChapter
pageMeta=(hash
current=pageNumber
pageNumber=pageNumber
chapterNumber=(inc this.chapter.index)
total=lastReportPage
isFirst=(eq pageNumber 1)
isFirstInChapter=(eq pageNumber this.startPage)
isLast=(eq pageNumber lastReportPage)
isLastInChapter=(eq pageNumber this.endPage)
)
registerSection=(action this.registerSection this.elementId)
renderNextItem=(action "renderNextItem" pageIndexInChapter)
onPageOverflow=(action "onPageOverflow" pageIndexInChapter)
renderNextPage=(action "renderNextPage" pageIndexInChapter)
as |pageComponent|
}}
{{#if (eq pageComponent.block "header")}}
{{yield
(hash
page-header=(component
"printable-pages/page-header" pageMeta=pageComponent.meta
)
)
}}
{{/if}}

register=(action pageComponent.registerSection)
onSectionOverflow=pageComponent.onSectionOverflow
triggerRerender=this.triggerRerender
renderedItem=pageComponent.renderedItem
)
)}}
{{/if}}
{{#if (eq pageComponent.block "body")}}
{{yield
(hash
number=pageComponent.meta
section=(component
"printable-pages/section"
sectionMap=this.chapter.sectionMap
pageIndexInChapter=pageIndexInChapter
pageElement=pageComponent.element
register=(action pageComponent.registerSection)
onSectionOverflow=pageComponent.onSectionOverflow
triggerRerender=this.triggerRerender
renderedItem=pageComponent.renderedItem
)
)
}}
{{/if}}

{{#if (eq pageComponent.block "footer")}}
{{yield (hash
page-footer=(component "printable-pages/page-footer" pageMeta=pageComponent.meta)
)}}
{{/if}}
{{/printable-pages/chapter-page}}
{{/printable-pages/page-layout}}
{{/with}}
{{/each}}
{{#if (eq pageComponent.block "footer")}}
{{yield
(hash
page-footer=(component
"printable-pages/page-footer" pageMeta=pageComponent.meta
)
)
}}
{{/if}}
{{/printable-pages/chapter-page}}
{{/printable-pages/page-layout}}
{{/if}}
{{/let}}
{{/each}}
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
"ember-cli-babel": "^7.17.2",
"ember-cli-htmlbars": "^5.1.2",
"ember-composable-helpers": "^3.0.2",
"ember-concurrency": "^1.1.6",
"ember-concurrency": "^2.1.0",
"ember-math-helpers": "^2.14.0",
"ember-truth-helpers": "^2.1.0"
"ember-truth-helpers": "~3.0.0"
},
"devDependencies": {
"@ember/optional-features": "^1.3.0",
Expand Down
Loading