Merge branch 'timeline-local' into timeline-multiselect

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	resolved using theirs. (selectLayers)

1 files changed, 30 insertions, 2 deletions

diff --git a/node_modules/montage/ui/number-input.reel/number-input.js b/node_modules/montage/ui/number-input.reel/number-input.js
index dfd7235f..010c0b75 100644
--- a/node_modules/montage/ui/number-input.reel/number-input.js
+++ b/node_modules/montage/ui/number-input.reel/number-input.js
@@ -3,18 +3,46 @@
  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/number-input.reel"
+    @requires montage/ui/component
+    @requires montage/ui/text-input
+*/
+
 var Montage = require("montage").Montage,
     Component = require("ui/component").Component,
     TextInput = require("ui/text-input").TextInput;
+
 /**
- * The Number input
+ * Wraps the a &lt;input type="date"> element with binding support for the element's standard attributes.
+   @class module:"montage/ui/number-input.reel".NumberInput
+   @extends module:montage/text-input.TextInput
  */
 var NumberInput = exports.NumberInput = Montage.create(TextInput, {
 
 });
 
-NumberInput.addAttributes({
+NumberInput.addAttributes(/** @lends module:"montage/ui/number-input.reel".NumberInput */{
+
+/**
+        The maximum value displayed but the number control.
+        @type {number}
+        @default null
+*/
     max: {dataType: 'number'},
+
+/**
+        The minimum value displayed but the number control.
+        @type {number}
+        @default null
+*/
     min: {dataType: 'number'},
+
+/**
+        The amount the number changes with each step.
+        @type {number}
+        @default null
+*/
     step: null // number or 'any'
 });