Merge branch 'refs/heads/NinjaInternal' into Color

Conflicts:
	js/controllers/elements/shapes-controller.js
	js/data/pi/pi-data.js
	js/panels/properties/content.reel/content.js

1 files changed, 31 insertions, 0 deletions

diff --git a/node_modules/montage/ui/date-input.reel/date-input.js b/node_modules/montage/ui/date-input.reel/date-input.js
new file mode 100644
index 00000000..af163258
--- /dev/null
+++ b/node_modules/montage/ui/date-input.reel/date-input.js
@@ -0,0 +1,31 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ 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> */
+var Montage = require("montage").Montage,
+    Component = require("ui/component").Component,
+    TextInput = require("ui/text-input").TextInput;
+/**
+ * The Component wrapper for input type="date"
+ */
+var DateInput = exports.DateInput = Montage.create(TextInput, {
+    hasTemplate: {value: true}
+});
+
+DateInput.addAttributes({
+        autocomplete: null,
+        disabled: {dataType: 'boolean'},
+        list: null, // list of autocomplete options
+        max: null,
+        maxlength: null,
+        min: null,
+        multiple: null,
+        name: null,
+        pattern: null,
+        placeholder: null,
+        readonly: {dataType: 'boolean'},
+        required: {dataType: 'boolean'},
+        size: null,
+        src: null
+});