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

Updated ember-cli 2.12.3 inter-dependencies #132

Merged
merged 2 commits into from
Aug 11, 2017
Merged
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
4 changes: 2 additions & 2 deletions blueprints/ember-frost-object-browser/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ const blueprintHelper = require('ember-frost-core/blueprint-helper')
module.exports = {
afterInstall: function (options) {
const addonsToAdd = [
{name: 'ember-frost-core', target: '^1.14.3'},
{name: 'ember-frost-list', target: '^5.3.1'}
{name: 'ember-frost-core', target: '1.23.10'},
{name: 'ember-frost-list', target: '5.8.2'}
]

// Get the packages installed in the consumer app/addon. Packages that are already installed in the consumer within
Expand Down
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,43 +41,43 @@
"ember-cli-chai": "~0.3.2",
"ember-cli-code-coverage": "^0.3.10",
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-htmlbars-inline-precompile": "^0.3.6",
"ember-cli-htmlbars-inline-precompile": "0.3.12",
"ember-cli-import-polyfill": "0.2.0",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-mocha": "~0.13.2",
"ember-cli-moment-shim": "^3.1.0",
"ember-cli-moment-shim": "^3.3.3",
"ember-cli-notifications": "^4.1.5",
"ember-cli-shims": "^1.0.2",
"ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^1.2.0",
"ember-code-snippet": "1.7.0",
"ember-computed-decorators": "~0.3.0",
"ember-concurrency": "~0.7.19",
"ember-data": "~2.11.0",
"ember-data": "~2.12.0",
"ember-data-factory-guy": "2.10.0",
"ember-elsewhere": "~0.4.1",
"ember-elsewhere": "1.0.1",
"ember-export-application-global": "^1.0.5",
"ember-frost-bunsen": "^14.20.0",
"ember-frost-date-picker": "^6.0.0",
"ember-frost-fields": "^4.2.5",
"ember-frost-info-bar": "^8.0.0",
"ember-frost-popover": "^4.2.5",
"ember-frost-sort": "^7.2.0",
"ember-frost-tabs": "^5.2.4",
"ember-frost-date-picker": "^7.2.7",
"ember-frost-fields": "^4.2.9",
"ember-frost-info-bar": "^8.3.9",
"ember-frost-popover": "^4.2.11",
"ember-frost-sort": "^7.2.9",
"ember-frost-tabs": "^5.2.9",
"ember-frost-test": "^1.0.2",
"ember-hook": "^1.4.1",
"ember-load-initializers": "^0.6.0",
"ember-math-helpers": "2.0.4",
"ember-one-way-controls": "1.1.2",
"ember-pikaday-shim": "~0.1.0",
"ember-prop-types": "^3.11.0",
"ember-pikaday-shim": "~0.1.2",
"ember-prop-types": "^3.14.1",
"ember-resolver": "^2.0.3",
"ember-run-raf": "1.1.2",
"ember-simple-uuid": "~0.1.4",
"ember-sinon": "~0.6.0",
"ember-sortable": "~1.9.3",
"ember-source": "~2.12.0",
"ember-spread": "^1.1.4",
"ember-spread": "^1.2.2",
"ember-symbol-observable": "~0.1.2",
"ember-test-utils": "^4.0.0",
"ember-truth-helpers": "^1.3.0",
Expand All @@ -94,9 +94,9 @@
"dependencies": {
"ember-cli-babel": "^5.1.7",
"ember-cli-htmlbars": "^1.1.1",
"ember-cli-sass": "^5.1.0",
"ember-frost-core": "^1.14.3",
"ember-frost-list": "^5.3.1"
"ember-cli-sass": "5.6.0",
"ember-frost-core": "1.23.10",
"ember-frost-list": "5.8.2"
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down
4 changes: 2 additions & 2 deletions tests/dummy/app/pods/application/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class='frost-modal-demo-title'>
Demos
</div>
{{#frost-scroll class='frost-modal-demo-selectors'}}
{{#frost-scroll class='frost-modal-demo-selectors' hook='demos'}}
{{#link-to 'overview'}}Overview{{/link-to}}
{{#link-to 'helpers'}}Helpers{{/link-to}}
<div class='frost-modal-demo-selector-title'>
Expand All @@ -21,7 +21,7 @@
</div>
{{/frost-scroll}}
</div>
{{#frost-scroll class='frost-modal-demo-example'}}
{{#frost-scroll class='frost-modal-demo-example' hook='content'}}
{{outlet}}
{{/frost-scroll}}
</div>
7 changes: 7 additions & 0 deletions tests/dummy/app/pods/client/template.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{{! BEGIN-SNIPPET client-template }}
{{frost-object-browser
hook='clientObjectBrowser'
filters=(component 'frost-bunsen-form'
autofocus=false
bunsenModel=filterModel
Expand All @@ -8,6 +9,7 @@
value=filters
)
content=(component 'frost-list'
hook='clientList'
item=(component 'list-item')
itemExpansion=(component 'list-item-expansion')
items=items
Expand All @@ -26,30 +28,35 @@
)
)
controls=(component 'frost-action-bar'
hook='clientActionBar'
selectedItems=selectedItems
controls=(array
(component 'frost-button'
hook='clientSingleSelectButton'
disabled=(single-select selectedItems)
priority='secondary'
size='medium'
text='Single-select'
onClick=(action 'onGenericAction' selectedItems 'Single-select enabled action')
)
(component 'frost-button'
hook='clientMultiSelectButton'
disabled=(multi-select selectedItems)
priority='secondary'
size='medium'
text='Multi-select'
onClick=(action 'onGenericAction' selectedItems 'Multi-select enabled action')
)
(component 'frost-button'
hook='clientLabelButton'
disabled=(not labelIncludesF)
priority='secondary'
size='medium'
text="Label includes 'f'"
onClick=(action 'onGenericAction' selectedItems 'Custom enabled action')
)
(component 'frost-link'
hook='clientDetailLink'
priority='primary'
routeNames=detailLinkRouteNames
size='medium'
Expand Down
7 changes: 7 additions & 0 deletions tests/dummy/app/pods/server/template.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{{! BEGIN-SNIPPET server-template}}
{{frost-object-browser
hook='serverObjectBrowser'
filters=(component 'frost-bunsen-form'
autofocus=false
bunsenModel=filterModel
Expand All @@ -8,6 +9,7 @@
value=filters
)
content=(component 'frost-list'
hook='serverList'
item=(component 'list-item')
itemExpansion=(component 'list-item-expansion')
items=items
Expand All @@ -22,30 +24,35 @@
)
)
controls=(component 'frost-action-bar'
hook='serverActionBar'
selectedItems=selectedItems
controls=(array
(component 'frost-button'
hook='serverSingleSelectButton'
disabled=(single-select selectedItems)
priority='secondary'
size='medium'
text='Single-select'
onClick=(action 'onGenericAction' selectedItems 'Single-select enabled action')
)
(component 'frost-button'
hook='serverMultiSelectButton'
disabled=(multi-select selectedItems)
priority='secondary'
size='medium'
text='Multi-select'
onClick=(action 'onGenericAction' selectedItems 'Multi-select enabled action')
)
(component 'frost-button'
hook='serverLabelButton'
disabled=(not labelIncludesF)
priority='secondary'
size='medium'
text="Label includes 'f'"
onClick=(action 'onGenericAction' selectedItems 'Custom enabled action')
)
(component 'frost-link'
hook='serverDetailLink'
priority='primary'
routeNames=detailLinkRouteNames
size='medium'
Expand Down