Merge pull request #10 from rox163/master

consume frost-core. update import conventions
ciena-attic · Apr 7, 2016 · 136715f · 136715f
2 parents 915d769 + 29cc4df
commit 136715f
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 31 deletions.
diff --git a/addon/pods/components/frost-scroll/component.js b/addon/pods/components/frost-scroll/component.js
@@ -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)
       })
     }
   })

diff --git a/addon/styles/_frost-scroll.scss b/addon/styles/_frost-scroll.scss
diff --git a/addon/styles/addon.scss b/addon/styles/addon.scss
@@ -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%;
+}
diff --git a/blueprints/ember-frost-scroll/index.js b/blueprints/ember-frost-scroll/index.js
@@ -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'}
       ]
     })
   }

diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -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'
-      ]
     }
   })
 

diff --git a/package.json b/package.json
@@ -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",
@@ -65,4 +63,4 @@
   "ember-addon": {
     "configPath": "tests/dummy/config"
   }
-}
+}
diff --git a/tests/dummy/app/pods/demo/controller.js b/tests/dummy/app/pods/demo/controller.js
@@ -9,9 +9,6 @@ export default Ember.Controller.extend({
         autoClear: true,
         clearDuration: 2000
       })
-    },
-    tabSelected (tab) {
-      this.set('selectedTab', tab)
     }
   }
 })
diff --git a/tests/dummy/app/styles/app.scss b/tests/dummy/app/styles/app.scss
@@ -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;