diff options
author | Jose Antonio Marquez | 2012-06-13 14:03:00 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-13 14:03:00 -0700 |
commit | efbe5f83157a8dcbcc209c88877d9cd0113d4d20 (patch) | |
tree | 50565e097fe4a9db59e554af179f66938fa59f1c /js/io/ui | |
parent | ae90152ae2889a10d44c22e1eeb5bff16cc44a19 (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-efbe5f83157a8dcbcc209c88877d9cd0113d4d20.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/io/ui')
4 files changed, 140 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 | ||
10 | var FileInputField = exports.FileInputField = Montage.create(Component, { | 10 | var 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 | ||
12 | var PickerNavigator = exports.PickerNavigator = Montage.create(Component, { | 12 | var 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, |
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 | |||
10 | 10 | ||
11 | var NewFileLocation = exports.NewFileLocation = Montage.create(Component, { | 11 | var NewFileLocation = exports.NewFileLocation = Montage.create(Component, { |
12 | 12 | ||
13 | fileInputField: { | ||
14 | value: null, | ||
15 | serializable: true | ||
16 | }, | ||
17 | |||
18 | newFileName: { | ||
19 | value: null, | ||
20 | serializable: true | ||
21 | }, | ||
22 | |||
13 | templateHeight:{ | 23 | templateHeight:{ |
14 | value:"25 px" | 24 | value:"25 px" |
15 | }, | 25 | }, |
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, | |||
12 | 12 | ||
13 | var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(Component, { | 13 | var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(Component, { |
14 | 14 | ||
15 | projectTypeTree: { | ||
16 | value: null, | ||
17 | serializable: true | ||
18 | }, | ||
19 | |||
20 | cancelButton: { | ||
21 | value: null, | ||
22 | serializable: true | ||
23 | }, | ||
24 | |||
25 | okButton: { | ||
26 | value: null, | ||
27 | serializable: true | ||
28 | }, | ||
29 | |||
30 | templateIcons: { | ||
31 | value: null, | ||
32 | serializable: true | ||
33 | }, | ||
34 | |||
35 | templatesContainer: { | ||
36 | value: null, | ||
37 | serializable: true | ||
38 | }, | ||
39 | |||
40 | locationSelection: { | ||
41 | value: null, | ||
42 | serializable: true | ||
43 | }, | ||
44 | |||
45 | newFileLocation: { | ||
46 | value: null, | ||
47 | serializable: true | ||
48 | }, | ||
49 | |||
50 | error: { | ||
51 | value: null, | ||
52 | serializable: true | ||
53 | }, | ||
54 | |||
15 | newFileModel: { | 55 | newFileModel: { |
16 | writable: true, | 56 | writable: true, |
17 | enumerable:false, | 57 | enumerable:false, |