Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

2 files changed, 90 insertions, 0 deletions

diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.js b/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
index a5fab11c..11d7e5b2 100755
--- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
+++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
@@ -9,6 +9,16 @@ var Montage = require("montage/core/core").Montage,
 
 var FileInputField = exports.FileInputField = Montage.create(Component, {
 
+    findDirectory: {
+        value: null,
+        serializable: true
+    },
+
+    newFileDirectory: {
+        value: null,
+        serializable: true
+    },
+
     didDraw: {
         enumerable: false,
         value: function() {
diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
index 945b0301..8295c68e 100644
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
@@ -11,6 +11,86 @@ var Montage = require("montage/core/core").Montage,
 
 var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
 
+    filterVal: {
+        value: null,
+        serializable: true
+    },
+
+    error: {
+        value: null,
+        serializable: true
+    },
+
+    addressBarUri: {
+        value: null,
+        serializable: true
+    },
+
+    forwardArrow: {
+        value: null,
+        serializable: true
+    },
+
+    backArrow: {
+        value: null,
+        serializable: true
+    },
+
+    leftNav: {
+        value: null,
+        serializable: true
+    },
+
+    iconViewContainer: {
+        value: null,
+        serializable: true
+    },
+
+    iconView: {
+        value: null,
+        serializable: true
+    },
+
+    treeView: {
+        value: null,
+        serializable: true
+    },
+
+    treeViewContainer: {
+        value: null,
+        serializable: true
+    },
+
+    okButton: {
+        value: null,
+        serializable: true
+    },
+
+    metadataSection: {
+        value: null,
+        serializable: true
+    },
+
+    filters: {
+        value: null,
+        serializable: true
+    },
+
+    refreshButton: {
+        value: null,
+        serializable: true
+    },
+
+    cancelButton: {
+        value: null,
+        serializable: true
+    },
+
+    resultsArea: {
+        value: null,
+        serializable: true
+    },
+
     popup:{
         enumerable: false,
         writable: true,