Merge branch 'master' into pentool

Conflicts:
	js/tools/PenTool.js

1 files changed, 8 insertions, 1 deletions

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 374e3d48..453d7a96 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,13 +18,20 @@
             }
         },
 
+        "newFileName": {
+            "prototype": "montage/ui/textfield.reel",
+            "properties": {
+                "element": {"#": "newFileName"}
+            }
+        },
+
         "owner":{
             "module": "js/io/ui/new-file-dialog/new-file-location.reel",
             "name": "SaveAsDialog",
             "properties": {
                 "element": {"#": "saveAsDialog"},
                 "fileInputField": {"@": "fileInputField"},
-                "newFileName": {"#": "newFileName"},
+                "newFileName": {"@": "newFileName"},
                 "error":{"#": "error"},
                 "okButton":{"#": "okButton"},
                 "cancelButton":{"#": "cancelButton"}