Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO

Conflicts:
	js/io/document/document-controller.js
	js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
	js/io/ui/save-as-dialog.reel/save-as-dialog.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 8 insertions, 29 deletions

diff --git a/node_modules/montage/ui/textfield.reel/textfield.js b/node_modules/montage/ui/textfield.reel/textfield.js
index e90e20c6..b16e685b 100755..100644
--- a/node_modules/montage/ui/textfield.reel/textfield.js
+++ b/node_modules/montage/ui/textfield.reel/textfield.js
@@ -3,36 +3,15 @@
  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/textfield.reel"
-    @requires montage/core/core
-    @requires montage/ui/editable-text
-*/
 var Montage = require("montage").Montage,
-    EditableText = require("ui/editable-text").EditableText;
-/**
-    @class module:"montage/ui/textfield.reel".Textfield
-    @extends module:montage/ui/editable-text.EditableText
-*/
-var Textfield = exports.Textfield = Montage.create(EditableText,/** @lends module:"montage/ui/textfield.reel".Textfield# */ {
-/**
-        Description TODO
-        @type {Property}
-        @default null
-    */
-    delegate: {
-        enumerable: true,
-        value: null
-    },
+    Component = require("ui/component").Component,
+    TextInput = require("ui/text-input").TextInput,
+    StandardInputAttributes = require("ui/text-input").StandardInputAttributes;
 /**
-  Description TODO
-  @private
-*/
-    _drawSpecific: {
-        enumerable: false,
-        value: function() {
-            this.element.classList.add('montage-textfield');
-        }
-    }
+ * The Text input
+ */
+var Textfield = exports.Textfield = Montage.create(TextInput, {
 });
 
+// Standard <input> tag attributes - http://www.w3.org/TR/html5/the-input-element.html#the-input-element
+Textfield.addAttributes(StandardInputAttributes);