Skip to content

Commit

Permalink
Merge pull request #23 from PoslinskiNet/feature-upgrade-packages
Browse files Browse the repository at this point in the history
Package upgrades
  • Loading branch information
PoslinskiNet committed Jul 1, 2017
2 parents a763ffb + 1c5bb3e commit 878fd4d
Show file tree
Hide file tree
Showing 14 changed files with 4,925 additions and 100 deletions.
4 changes: 0 additions & 4 deletions .bowerrc

This file was deleted.

32 changes: 0 additions & 32 deletions .jshintrc

This file was deleted.

8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ node_js:

sudo: false

dist: trusty

addons:
chrome: stable

cache:
directories:
- $HOME/.npm
Expand All @@ -26,12 +31,9 @@ matrix:

before_install:
- npm config set spin false
- npm install -g bower phantomjs-prebuilt
- bower --version

install:
- npm install
- bower install

script:
- npm test
2 changes: 2 additions & 0 deletions addon/test-helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ IntroJSComponent.reopen({
})
});

export default IntroJSComponent;

/**
* Goes to the next step of the intro
* @returns {Promise}
Expand Down
3 changes: 0 additions & 3 deletions bower.json

This file was deleted.

11 changes: 1 addition & 10 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@ module.exports = {
included: function(app) {
this._super.included(app);

var shim = isFastBoot() ? 'intro-js-fastboot.js' : 'intro-js.js';

app.import('vendor/ember-introjs/intro.js');
app.import('vendor/ember-introjs/introjs.css');

app.import('vendor/ember-introjs/shims/' + shim);
app.import('vendor/ember-introjs/shims/intro-js.js');
},

introJsPath() {
Expand All @@ -34,10 +32,3 @@ module.exports = {
return mergeTrees(trees);
},
};

// Checks to see whether this build is targeting FastBoot. Note that we cannot
// check this at boot time--the environment variable is only set once the build
// has started, which happens after this file is evaluated.
function isFastBoot() {
return process.env.EMBER_CLI_FASTBOOT === 'true';
}
Loading

0 comments on commit 878fd4d

Please sign in to comment.