Skip to content

Commit

Permalink
Merge pull request #347 from BenMorganIO/ember-fastboot-support
Browse files Browse the repository at this point in the history
don't import hammerjs and match media if being called from node
  • Loading branch information
SaladFork committed Apr 26, 2016
2 parents aca9d98 + dbb0c34 commit 42910f8
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@ module.exports = {
included: function(app) {
this._super.included(app);

app.import(app.bowerDirectory + '/hammer.js/hammer.js');
app.import(app.bowerDirectory + '/matchMedia/matchMedia.js');
if (!process.env.EMBER_CLI_FASTBOOT) {
app.import(app.bowerDirectory + '/hammer.js/hammer.js')
app.import(app.bowerDirectory + '/matchMedia/matchMedia.js');
};

app.import('vendor/propagating.js');
},

Expand Down

0 comments on commit 42910f8

Please sign in to comment.