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

consume frost-core. update import conventions #10

Merged
merged 1 commit into from
Apr 7, 2016
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions addon/pods/components/frost-scroll/component.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
import Ember from 'ember'
import _ from 'lodash/lodash'

const {Component, on, run} = Ember

const scrollYEndContext = {
name: 'on-scroll-y-end'
}
const debouncePeriod = 150

export default Ember.Component.extend({
export default Component.extend({
classNames: ['frost-scroll'],

initializeScroll: Ember.on('didInsertElement', function () {
Ember.run.scheduleOnce('afterRender', this, () => {
initializeScroll: on('didInsertElement', function () {
run.scheduleOnce('afterRender', this, () => {
window.Ps.initialize(this.$()[0])
})

if (_.isFunction(this.attrs['on-scroll-y-end'])) {
this.$().on('ps-y-reach-end', () => {
Ember.run.debounce(scrollYEndContext, this.attrs['on-scroll-y-end'], debouncePeriod, true)
run.debounce(scrollYEndContext, this.attrs['on-scroll-y-end'], debouncePeriod, true)
})
}
})
Expand Down
9 changes: 0 additions & 9 deletions addon/styles/_frost-scroll.scss

This file was deleted.

13 changes: 11 additions & 2 deletions addon/styles/addon.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
@import 'node_modules/ember-frost-theme/scss/frost-theme';
@import './frost-scroll';
@import 'node_modules/ember-frost-core/addon/styles/frost-theme';

.frost-scroll {
position: relative;
overflow: hidden;
}

.frost-scroll.full {
width: 100%;
height: 100%;
}
2 changes: 1 addition & 1 deletion blueprints/ember-frost-scroll/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = {
afterInstall: function () {
return this.addAddonsToProject({
packages: [
{name: 'ember-frost-theme', target: '^1.0.3'}
{name: 'ember-frost-core', target: '>=0.0.14 <2.0.0'}
]
})
}
Expand Down
5 changes: 0 additions & 5 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ module.exports = function (defaults) {
var app = new EmberApp(defaults, {
'ember-cli-mocha': {
useLintTree: false
},
sassOptions: {
includePaths: [
'bower_components/bourbon/app/assets/stylesheets'
]
}
})

Expand Down
6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@
"ember-data": "^2.4.0",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.4",
"ember-frost-css-core": "^1.1.2",
"ember-frost-icons": "^1.4.0",
"ember-frost-theme": "^1.1.0",
"ember-frost-core": ">=0.0.14 <2.0.0",
"ember-load-initializers": "^0.5.1",
"ember-lodash": "^0.0.6",
"ember-resolver": "^2.0.3",
Expand All @@ -65,4 +63,4 @@
"ember-addon": {
"configPath": "tests/dummy/config"
}
}
}
3 changes: 0 additions & 3 deletions tests/dummy/app/pods/demo/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ export default Ember.Controller.extend({
autoClear: true,
clearDuration: 2000
})
},
tabSelected (tab) {
this.set('selectedTab', tab)
}
}
})
5 changes: 2 additions & 3 deletions tests/dummy/app/styles/app.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import 'bourbon';
@import 'node_modules/ember-frost-css-core/scss/frost-core';
@import 'node_modules/ember-frost-theme/scss/frost-theme';
@import 'node_modules/ember-frost-core/addon/styles/frost-theme';
@import 'node_modules/ember-frost-core/addon/styles/frost-app';

.dummy-body {
margin-left: 20px;
Expand Down