Skip to content

Commit

Permalink
Merge pull request #1 from jordanyee/feat/ember-appkit
Browse files Browse the repository at this point in the history
Support Use with Ember App Kit
  • Loading branch information
jordanyee committed May 27, 2014
2 parents 94f7b28 + 8e8ee12 commit 004a18e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ See [here for a demo](http://aexmachina.github.io/ember-spin.js/).

{{x-spinner lines=12 length=6 shadow=true color="#00F" width=20}}

Be sure to include both `spin.js` and `x-spinner.js` in your app.

You need to include `x-spinner.js` after you define your `App = Ember.Application.create()`.
See [this discussion](http://discuss.emberjs.com/t/combining-component-logic-and-template-together-in-single-file/2879/10)
for a discussion of ways to improve this.
6 changes: 3 additions & 3 deletions x-spinner.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
*
* @see http://fgnass.github.io/spin.js/ for usage info
*/
App.XSpinnerComponent = Ember.Component.extend({
XSpinnerComponent = Ember.Component.extend({

lines : 12, // The number of lines to draw
length : 6, // The length of each line
width : 2, // The line thickness
Expand Down Expand Up @@ -56,4 +56,4 @@ App.XSpinnerComponent = Ember.Component.extend({
}.on('willDestroyElement')

});
Ember.Handlebars.helper('x-spinner', App.XSpinnerComponent);
Ember.Handlebars.helper('x-spinner', XSpinnerComponent);

0 comments on commit 004a18e

Please sign in to comment.