Add controller model property to documentation.

emberjs · Aug 14, 2014 · 0546181 · 0546181
1 parent bec883d
commit 0546181
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/packages/ember-runtime/lib/mixins/controller.js b/packages/ember-runtime/lib/mixins/controller.js
@@ -45,7 +45,18 @@ export default Mixin.create(ActionHandler, ControllerContentModelAliasDeprecatio
 
   store: null,
 
+  /**
+    The controller's current model. When retrieving or modifying a controller's
+    model, this property should be used instead of the `content` property.
+
+    @property model
+    @public
+   */
   model: null,
+
+  /**
+    @private
+   */
   content: computed.alias('model')
 
 });