merge update branch

addon/create-mixin.js

@@ -41,7 +41,7 @@ export default function(bindEvent, unbindEvent) {
             mousetrap = new Mousetrap(document.body);
           } else if (actionObject.scoped) {
             if (Ember.typeOf(actionObject.scoped) === 'boolean') {
-              mousetrap = new Mousetrap(self.get('element'));
+              mousetrap = new Mousetrap(this.get('element'));
             } else if (Ember.typeOf(actionObject.scoped) === 'string') {
               mousetrap = new Mousetrap(document.querySelector(actionObject.scoped));
             }

index.js

@@ -1,16 +1,32 @@
 /* jshint node: true */
 'use strict';
+var path = require('path');
+var resolve = require('resolve');
+var Funnel = require('broccoli-funnel');
+var mergeTrees = require('broccoli-merge-trees');
+var fastbootTransform = require('fastboot-transform');
 
 module.exports = {
   name: 'ember-keyboard-shortcuts',
+
   included: function(app) {
     this._super.included.apply(this, arguments);
-    if (typeof app.import !== 'function' && app.app) {
-      app = app.app;
-    }
-    if (typeof app.import !== 'function' && app.app) {
-      app = app.app;
+    app.import('vendor/mousetrap/mousetrap.js');
+  },
+
+  treeForVendor: function(tree) {
+    var trees = [];
+    var mousetrap = fastbootTransform(new Funnel(this.pathBase('mousetrap'), {
+      destDir: 'mousetrap'
+    }));
+    trees = trees.concat([mousetrap]);
+    if (tree) {
+      trees.push(tree);
     }
-    app.import(app.bowerDirectory + '/mousetrap/mousetrap.js');
-  }
-};
+    return mergeTrees(trees);
+  },
+
+  pathBase: function(packageName) {
+    return path.dirname(resolve.sync(packageName + '/package.json', { basedir: __dirname }));
+  },
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-keyboard-shortcuts",
-  "version": "0.3.4",
+  "version": "0.3.0",
   "directories": {
     "doc": "doc",
     "test": "tests"
@@ -30,31 +30,33 @@
   "author": "Trym Skaar <[email protected]>",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "0.2.3",
-    "ember-cli-app-version": "0.3.3",
-    "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "0.0.8",
-    "ember-cli-htmlbars": "0.7.4",
-    "ember-cli-ic-ajax": "0.1.1",
-    "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.3.10",
-    "ember-cli-uglify": "1.0.1",
-    "ember-data": "1.0.0-beta.16.1",
-    "ember-export-application-global": "^1.0.2",
-    "ember-disable-prototype-extensions": "^1.0.0",
-    "ember-try": "0.0.4"
+    "broccoli-asset-rev": "~2.6.0",
+    "ember-cli": "~2.16.2",
+    "ember-source": "~2.16.0",
+    "ember-cli-app-version": "~3.1.0",
+    "ember-cli-content-security-policy": "~1.0.0",
+    "ember-cli-dependency-checker": "~2.0.1",
+    "ember-cli-htmlbars": "~2.0.3",
+    "ember-cli-ic-ajax": "~1.0.0",
+    "ember-cli-inject-live-reload": "~1.7.0",
+    "ember-cli-qunit": "~4.0.1",
+    "ember-cli-uglify": "~2.0.0",
+    "ember-export-application-global": "~2.0.0",
+    "ember-disable-prototype-extensions": "~1.1.3",
+    "ember-try": "~0.2.17"
   },
   "description": "ember-cli addon that uses mousetrap to facilitate keyboard shortcuts",
   "keywords": [
     "ember-addon",
     "mousetrap"
   ],
   "dependencies": {
-    "ember-cli-babel": "^5.0.0"
+    "ember-cli-babel": "~6.8.2",
+    "mousetrap": "~1.6.1",
+    "fastboot-transform": "~0.1.2"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",
     "defaultBlueprint": "ember-keyboard-shortcuts"
   }
-}
+}