Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 34 insertions, 2 deletions

diff --git a/node_modules/montage/ui/image.reel/image.js b/node_modules/montage/ui/image.reel/image.js
index 5deebbf6..149f650b 100755
--- a/node_modules/montage/ui/image.reel/image.js
+++ b/node_modules/montage/ui/image.reel/image.js
@@ -3,20 +3,52 @@
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
+
+/**
+    @module "montage/ui/image.reel"
+    @requires montage/ui/component
+    @requires montage/ui/native-control
+*/
 var Montage = require("montage").Montage,
     Component = require("ui/component").Component,
     NativeControl = require("ui/native-control").NativeControl;
 
 /**
- * The <img> native control with binding support for the standard attributes
+ * Wraps the a &lt;img> element with binding support for its standard attributes.
+   @class module:"montage/ui/image.reel".Image
+   @extends module:montage/native-control.NativeControl
  */
 var Image = exports.Image = Montage.create(NativeControl, {
 
 });
 
-Image.addAttributes({
+Image.addAttributes(/** @lends module:"montage/ui/image.reel".Image */{
+
+/**
+    A text description to display in place of the image.
+    @type {string}
+    @default null
+*/
         alt: null,
+
+/**
+    The height of the image in CSS pixels.
+    @type {number}
+    @default null
+*/
         height: null,
+
+/**
+    The URL where the image is located.
+    @type {string}
+    @default null
+*/
         src: null,
+
+/**
+    The width of the image in CSS pixels.
+    @type {number}
+    @default null
+*/
         width: null
 });