aboutsummaryrefslogtreecommitdiff
path: root/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
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/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
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/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js')
-rw-r--r--js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js40
1 files changed, 40 insertions, 0 deletions
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
13var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(Component, { 13var 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,