Skip to content

Commit

Permalink
Merge pull request #99 from runspired/develop
Browse files Browse the repository at this point in the history
Fix (Firefox)
  • Loading branch information
runspired committed Jan 28, 2016
2 parents 23a808b + 31b36aa commit 126b557
Show file tree
Hide file tree
Showing 20 changed files with 205 additions and 327 deletions.
5 changes: 0 additions & 5 deletions .eslintignore

This file was deleted.

170 changes: 0 additions & 170 deletions .eslintrc

This file was deleted.

16 changes: 10 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
---
language: node_js
node_js:
- "4.1.1"
- "4.2.4"

sudo: false
sudo: required

cache:
directories:
- node_modules

env:
- EMBER_TRY_SCENARIO=default
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary

matrix:
fast_finish: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary

before_install:
- export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
- "npm config set spin false"
- "npm install -g npm@^2"
- wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
- tar -xjf phantomjs-2.0.0-ubuntu-12.04.tar.bz2
- sudo rm -rf /usr/local/phantomjs/bin/phantomjs
- sudo mv phantomjs /usr/local/phantomjs/bin/phantomjs
- npm config set spin false

install:
- npm install -g jscs
- npm install -g bower
- npm install
- bower install
Expand All @@ -36,3 +39,4 @@ script:
branches:
only:
- master
- develop
66 changes: 0 additions & 66 deletions Gruntfile.js

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015
Copyright (c) 2016

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down

0 comments on commit 126b557

Please sign in to comment.