Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

3 files changed, 3 insertions, 3 deletions

diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
index c3209654..ff165f9a 100755
--- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
+++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
@@ -12,7 +12,7 @@
     {
 
         "newFileDirectory": {
-            "prototype": "montage/ui/textfield.reel",
+            "prototype": "montage/ui/input-text.reel",
             "properties": {
                 "element": {"#": "newFileDirectory"}
             }
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
index f9a42887..0c410a47 100755
--- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
@@ -56,7 +56,7 @@
         },
 
         "newFileName": {
-            "prototype": "montage/ui/textfield.reel",
+            "prototype": "montage/ui/input-text.reel",
             "properties": {
                 "element": {"#": "newFileName"}
             }
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.html b/js/io/ui/save-as-dialog.reel/save-as-dialog.html
index dcdb073f..99f98ddb 100644
--- a/js/io/ui/save-as-dialog.reel/save-as-dialog.html
+++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.html
@@ -18,7 +18,7 @@
         },
 
         "newFileName": {
-            "prototype": "montage/ui/textfield.reel",
+            "prototype": "montage/ui/input-text.reel",
             "properties": {
                 "element": {"#": "newFileName"}
             }