Merge pull request #53 from rwjblue/updates

Various fixes...

Author: rwjblue

app/components/instance-method.js

@@ -6,7 +6,8 @@ const { computed } = Ember;
 export default InstanceItemComponent.extend({
   itemType: 'method',
   routeName: 'klass.methods.method',
-  parameterSentence: computed('item.params.@each', function(){
-    return this.get('item.params').mapProperty('name').join(', ');
+
+  parameterSentence: computed('item.params.[]', function(){
+    return this.get('item.params').mapBy('name').join(', ');
   })
 });

app/controllers/filtered.js

@@ -1,12 +1,13 @@
 import Ember from "ember";
 
-const { Mixin } = Ember;
+const { Mixin, inject } = Ember;
 const { alias } = Ember.computed;
 
 export default Mixin.create({
-  needs: ['klass'],
-  private: alias('controllers.klass.private'),
-  deprecated: alias('controllers.klass.deprecated'),
-  inherited: alias('controllers.klass.inherited'),
-  protected: alias('controllers.klass.protected')
+  klass: inject.controller(),
+
+  private: alias('klass.private'),
+  deprecated: alias('klass.deprecated'),
+  inherited: alias('klass.inherited'),
+  protected: alias('klass.protected')
 });

app/controllers/klass/events.js

@@ -1,6 +1,6 @@
 import Ember from "ember";
 import FilteredController from "../filtered";
 
-const { ArrayController } = Ember;
+const { Controller } = Ember;
 
-export default ArrayController.extend(FilteredController);
+export default Controller.extend(FilteredController);

app/controllers/klass/methods.js

@@ -1,6 +1,6 @@
 import Ember from "ember";
 import FilteredController from "../filtered";
 
-const { ArrayController } = Ember;
+const { Controller } = Ember;
 
-export default ArrayController.extend(FilteredController);
+export default Controller.extend(FilteredController);

app/controllers/klass/properties.js

@@ -1,6 +1,6 @@
 import Ember from "ember";
 import FilteredController from "../filtered";
 
-const { ArrayController } = Ember;
+const { Controller } = Ember;
 
-export default ArrayController.extend(FilteredController);
+export default Controller.extend(FilteredController);

bower.json

@@ -3,7 +3,7 @@
   "dependencies": {
     "bourbon": "~3.2.3",
     "waypoints": "~3.1.0",
-    "ember": "1.13.11",
+    "ember": "1.13.13",
     "ember-cli-shims": "0.0.6",
     "ember-cli-test-loader": "0.2.1",
     "ember-load-initializers": "0.1.7",

package.json

@@ -38,7 +38,7 @@
     "ember-cli-release": "0.2.8",
     "ember-cli-sri": "^1.2.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-cli-yuidoc-converter": "git://github.com/gregone/ember-cli-yuidoc-converter.git#exec-sync",
+    "ember-cli-yuidoc-converter": "git://github.com/trek/ember-cli-yuidoc-converter.git#7bc04b2",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.4"
   }