aboutsummaryrefslogtreecommitdiff
path: root/js/io/ui/file-picker
diff options
context:
space:
mode:
authorJon Reid2012-06-15 10:10:41 -0700
committerJon Reid2012-06-15 10:10:41 -0700
commit526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch)
tree65939e59615aaa10a7db77211e71616ad531bd0e /js/io/ui/file-picker
parentb5b760ee82e5cc4da176914983a6002cbf86c11a (diff)
parent5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff)
downloadninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/io/ui/file-picker')
-rwxr-xr-xjs/io/ui/file-picker/file-input-field.reel/file-input-field.js10
-rw-r--r--js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js80
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,
9 9
10var FileInputField = exports.FileInputField = Montage.create(Component, { 10var FileInputField = exports.FileInputField = Montage.create(Component, {
11 11
12 findDirectory: {
13 value: null,
14 serializable: true
15 },
16
17 newFileDirectory: {
18 value: null,
19 serializable: true
20 },
21
12 didDraw: { 22 didDraw: {
13 enumerable: false, 23 enumerable: false,
14 value: function() { 24 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,
11 11
12var PickerNavigator = exports.PickerNavigator = Montage.create(Component, { 12var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
13 13
14 filterVal: {
15 value: null,
16 serializable: true
17 },
18
19 error: {
20 value: null,
21 serializable: true
22 },
23
24 addressBarUri: {
25 value: null,
26 serializable: true
27 },
28
29 forwardArrow: {
30 value: null,
31 serializable: true
32 },
33
34 backArrow: {
35 value: null,
36 serializable: true
37 },
38
39 leftNav: {
40 value: null,
41 serializable: true
42 },
43
44 iconViewContainer: {
45 value: null,
46 serializable: true
47 },
48
49 iconView: {
50 value: null,
51 serializable: true
52 },
53
54 treeView: {
55 value: null,
56 serializable: true
57 },
58
59 treeViewContainer: {
60 value: null,
61 serializable: true
62 },
63
64 okButton: {
65 value: null,
66 serializable: true
67 },
68
69 metadataSection: {
70 value: null,
71 serializable: true
72 },
73
74 filters: {
75 value: null,
76 serializable: true
77 },
78
79 refreshButton: {
80 value: null,
81 serializable: true
82 },
83
84 cancelButton: {
85 value: null,
86 serializable: true
87 },
88
89 resultsArea: {
90 value: null,
91 serializable: true
92 },
93
14 popup:{ 94 popup:{
15 enumerable: false, 95 enumerable: false,
16 writable: true, 96 writable: true,