Skip to content

Commit

Permalink
Merge pull request #105 from sandersky/master
Browse files Browse the repository at this point in the history
Fix issue with Ember 2.11
  • Loading branch information
sandersky committed Feb 17, 2017
2 parents dd8fef1 + 9d740b0 commit df8563e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
16 changes: 9 additions & 7 deletions addon/components/frost-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

import Ember from 'ember'
const {$, A, isEmpty, set} = Ember
const {$, A, isEmpty, run, set} = Ember
import computed, {readOnly} from 'ember-computed-decorators'
import {Component} from 'ember-frost-core'
import {selection} from 'ember-frost-list'
Expand Down Expand Up @@ -99,12 +99,14 @@ export default Component.extend({
return []
}
return items.map(item => {
set(item, 'isExpanded', isEmpty(expandedItems) ? false : expandedItems.some(
selectedItem => itemComparator(selectedItem, item))
)
set(item, 'isSelected', isEmpty(selectedItems) ? false : selectedItems.some(
selectedItem => itemComparator(selectedItem, item))
)
run.next(() => {
set(item, 'isExpanded', isEmpty(expandedItems) ? false : expandedItems.some(
selectedItem => itemComparator(selectedItem, item))
)
set(item, 'isSelected', isEmpty(selectedItems) ? false : selectedItems.some(
selectedItem => itemComparator(selectedItem, item))
)
})
return item
})
},
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
"ember-test-utils": "^1.10.3",
"ember-truth-helpers": "1.3.0",
"loader.js": "^4.0.0",
"pull-report": "^0.3.1",
"sinon-chai": "^2.8.0",
"smoke-and-mirrors": "~0.6.2"
},
Expand Down

0 comments on commit df8563e

Please sign in to comment.