aboutsummaryrefslogtreecommitdiff
path: root/js/io/ui/new-file-dialog
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-13 13:51:39 -0700
committerNivesh Rajbhandari2012-06-13 13:51:39 -0700
commit263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch)
tree7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/io/ui/new-file-dialog
parent1bb2778224982aea7b9781c6559bb659983a400f (diff)
parenta827f2769d75848c0ba0bff03a927c1f2706322b (diff)
downloadninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/io/ui/new-file-dialog')
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js10
-rw-r--r--js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js40
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
10 10
11var NewFileLocation = exports.NewFileLocation = Montage.create(Component, { 11var 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
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,