Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts:
	js/document/html-document.js

1 files changed, 21 insertions, 0 deletions

diff --git a/node_modules/components-data/textfield.json b/node_modules/components-data/textfield.json
new file mode 100644
index 00000000..4f8a1499
--- /dev/null
+++ b/node_modules/components-data/textfield.json
@@ -0,0 +1,21 @@
+{
+    "component": "textfield",
+
+    "module": "montage/ui/textfield.reel",
+
+    "name": "Textfield",
+
+    "properties": [
+
+        {
+            "name": "value",
+            "type": "string",
+            "default": "Button"
+        },
+        {
+            "name": "disabled",
+            "type": "boolean",
+            "default": "false"
+        }
+    ]
+}
\ No newline at end of file