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, 17 insertions, 0 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
new file mode 100644
index 00000000..b5fd0a66
--- /dev/null
+++ b/node_modules/montage/ui/number-input.reel/number-input.js
@@ -0,0 +1,17 @@
+/* <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,
+    StandardInputAttributes = require("ui/text-input").StandardInputAttributes;
+/**
+ * The Number input
+ */
+var NumberInput = exports.NumberInput = Montage.create(TextInput, {
+
+});
+
+NumberInput.addAttributes(StandardInputAttributes);