Merge branch 'refs/heads/master' into binding

Conflicts:
	js/components/layout/tools-list.reel/tools-list.html
	js/components/layout/tools-properties.reel/tools-properties.html
	js/document/document-html.js
	js/document/templates/app/main.js
	js/panels/Panel.reel/Panel.js
	node_modules/montage/ui/native-control.js

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

2 files changed, 50 insertions, 0 deletions

diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
index e8a699cc..1eecbb9a 100755
--- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
@@ -10,6 +10,16 @@ var newFileWorkflowControllerModule = require("js/io/ui/new-file-dialog/new-file
 
 var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
 
+    fileInputField: {
+        value: null,
+        serializable: true
+    },
+
+    newFileName: {
+        value: null,
+        serializable: true
+    },
+
     templateHeight:{
         value:"25 px"
     },
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
index 7227d532..e6202b07 100644
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -12,6 +12,46 @@ var Montage = require("montage/core/core").Montage,
 
 var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(Component, {
 
+    projectTypeTree: {
+        value: null,
+        serializable: true
+    },
+
+    cancelButton: {
+        value: null,
+        serializable: true
+    },
+
+    okButton: {
+        value: null,
+        serializable: true
+    },
+
+    templateIcons: {
+        value: null,
+        serializable: true
+    },
+
+    templatesContainer: {
+        value: null,
+        serializable: true
+    },
+
+    locationSelection: {
+        value: null,
+        serializable: true
+    },
+
+    newFileLocation: {
+        value: null,
+        serializable: true
+    },
+
+    error: {
+        value: null,
+        serializable: true
+    },
+
     newFileModel: {
         writable: true,
         enumerable:false,