fix funnel and string prototypes

ember-admin · Aug 18, 2015 · e9b4471 · e9b4471
1 parent 4afc7b1
commit e9b4471
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/addon/components/admin-drag-and-drop-zone.js b/addon/components/admin-drag-and-drop-zone.js
@@ -142,7 +142,7 @@ export default Ember.Component.extend({
   _params: function(file) {
     var params;
     params = {
-      assetable_type: Ember.String.singularize(this.get('controllerName')).classify(),
+      assetable_type: Ember.String.classify(Ember.String.singularize(this.get('controllerName'))),
       content_type: file.type,
       original_filename: file.name,
       is_main: true

diff --git a/package.json b/package.json
@@ -42,7 +42,6 @@
     "active-model-adapter": "1.13.3",
     "broccoli-asset-rev": "^2.0.2",
     "broccoli-concat": "0.0.12",
-    "broccoli-funnel": "^0.2.3",
     "broccoli-merge-trees": "^0.2.1",
     "broccoli-static-compiler": "^0.2.1",
     "ember-cli": "1.13.1",
@@ -66,6 +65,7 @@
   },
   "dependencies": {
     "ember-cli-babel": "^5.0.0",
+    "broccoli-funnel": "^0.2.3",
     "ember-cli-htmlbars": "0.7.9"
   }
 }