diff options
author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
tree | c51112223ceb9121cd595a60335eb2795215590f /js/io/ui/new-file-dialog | |
parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/io/ui/new-file-dialog')
8 files changed, 1098 insertions, 0 deletions
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css new file mode 100755 index 00000000..e79082a6 --- /dev/null +++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css | |||
@@ -0,0 +1,68 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | .newfileLocation .newFileName{ | ||
8 | width:65%; | ||
9 | margin-left:5px; | ||
10 | text-shadow: 1px 1px 1px #000; | ||
11 | } | ||
12 | |||
13 | .newfileLocation .newFileDirectory{ | ||
14 | width:70%; | ||
15 | margin-left:5px; | ||
16 | text-shadow: 1px 1px 1px #000; | ||
17 | } | ||
18 | |||
19 | .newfileLocation .templateSelection{ | ||
20 | float:left; | ||
21 | width:20%; | ||
22 | height:90%; | ||
23 | padding-right: 10px; | ||
24 | } | ||
25 | |||
26 | .newfileLocation .templateSelection .template{ | ||
27 | width:80%; | ||
28 | height:60%; | ||
29 | background-color: #e1e1e1; | ||
30 | border:1px solid #000000; | ||
31 | box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.8); | ||
32 | } | ||
33 | |||
34 | .newfileLocation .locationSelection{ | ||
35 | float:left; | ||
36 | width:75%; | ||
37 | text-shadow: 1px 1px 1px #000; | ||
38 | } | ||
39 | |||
40 | .newfileLocation .locationSelection div{ | ||
41 | padding-bottom: 5px; | ||
42 | } | ||
43 | |||
44 | .newfileLocation .locationSelection input{ | ||
45 | margin-left: 5px; | ||
46 | white-space: nowrap; | ||
47 | text-shadow: 1px 1px 1px #333; | ||
48 | } | ||
49 | |||
50 | .newfileLocation .templatePx{ | ||
51 | padding-left: 5px; | ||
52 | white-space: nowrap; | ||
53 | } | ||
54 | |||
55 | .newfileLocation .nameText{ | ||
56 | margin-right:28px; | ||
57 | text-shadow: 1px 1px 1px #000; | ||
58 | } | ||
59 | |||
60 | .newfileLocation .hottextunit{ | ||
61 | float: none; | ||
62 | display: inline; | ||
63 | } | ||
64 | |||
65 | .newfileLocation .fileExtension{ | ||
66 | color:#FFF; | ||
67 | text-shadow: 1px 1px 1px #000; | ||
68 | } | ||
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html new file mode 100755 index 00000000..7340251c --- /dev/null +++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html | |||
@@ -0,0 +1,94 @@ | |||
1 | <!DOCTYPE HTML> | ||
2 | <!-- <copyright> | ||
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> --> | ||
7 | <html> | ||
8 | <head> | ||
9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
10 | <link rel="stylesheet" type="text/css" href="new-file-location.css"> | ||
11 | <script type="text/montage-serialization"> | ||
12 | { | ||
13 | "hottextHeight": { | ||
14 | "module": "js/components/hottextunit.reel", | ||
15 | "name": "HotTextUnit", | ||
16 | "properties": { | ||
17 | "element": {"#": "templateHeight"}, | ||
18 | "minValue":25, | ||
19 | "maxValue" :2000, | ||
20 | "stepSize" :5, | ||
21 | "acceptableUnits" : ["px"], | ||
22 | "units" : "px" | ||
23 | }, | ||
24 | "bindings": { | ||
25 | "value": { | ||
26 | "boundObject": {"@": "owner"}, | ||
27 | "boundObjectPropertyPath": "templateHeight", | ||
28 | "oneway": false | ||
29 | } | ||
30 | } | ||
31 | }, | ||
32 | |||
33 | "hottextWidth": { | ||
34 | "module": "js/components/hottextunit.reel", | ||
35 | "name": "HotTextUnit", | ||
36 | "properties": { | ||
37 | "element": {"#": "templateWidth"}, | ||
38 | "minValue":25, | ||
39 | "maxValue" :2000, | ||
40 | "stepSize" :5, | ||
41 | "acceptableUnits" : ["px"], | ||
42 | "units" : "px" | ||
43 | }, | ||
44 | "bindings": { | ||
45 | "value": { | ||
46 | "boundObject": {"@": "owner"}, | ||
47 | "boundObjectPropertyPath": "templateWidth", | ||
48 | "oneway": false | ||
49 | } | ||
50 | } | ||
51 | }, | ||
52 | |||
53 | "fileInputField":{ | ||
54 | "module": "js/io/ui/file-picker/file-input-field.reel", | ||
55 | "name": "FileInputField", | ||
56 | "properties": { | ||
57 | "element": {"#": "fileInputField"} | ||
58 | } | ||
59 | }, | ||
60 | |||
61 | "owner":{ | ||
62 | "module": "js/io/ui/new-file-dialog/new-file-location.reel", | ||
63 | "name": "NewFileLocation", | ||
64 | "properties": { | ||
65 | "element": {"#": "newfileLocation"}, | ||
66 | "fileInputField": {"@": "fileInputField"}, | ||
67 | "newFileName": {"#": "newFileName"} | ||
68 | } | ||
69 | } | ||
70 | } | ||
71 | </script> | ||
72 | </head> | ||
73 | <body> | ||
74 | <div id="newfileLocation" class="newfileLocation"> | ||
75 | <div class="templateSelection"> | ||
76 | <div class="template"></div> | ||
77 | </div> | ||
78 | <div class="locationSelection"> | ||
79 | <div> | ||
80 | <span class="nameText">NAME:</span> | ||
81 | <input id="newFileName" class="nj-skinned newFileName" type="search" value="" /> | ||
82 | <span class="fileExtension"></span> | ||
83 | </div> | ||
84 | <div> | ||
85 | <span>DIRECTORY:</span> | ||
86 | <div id="fileInputField"></div> | ||
87 | </div> | ||
88 | <br /> | ||
89 | <div style="display:none;"><span>WIDTH:</span><span class="templatePx" id="templateWidth"></span></div> | ||
90 | <div style="display:none;"><span>HEIGHT:</span><span class="templatePx" id="templateHeight"></span></div> | ||
91 | </div> | ||
92 | </div> | ||
93 | </body> | ||
94 | </html> \ No newline at end of file | ||
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 new file mode 100755 index 00000000..fae8f9c7 --- /dev/null +++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js | |||
@@ -0,0 +1,56 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | var Montage = require("montage/core/core").Montage; | ||
8 | var Component = require("montage/ui/component").Component; | ||
9 | var newFileWorkflowControllerModule = require("js/io/ui/new-file-dialog/new-file-workflow-controller"); | ||
10 | |||
11 | var NewFileLocation = exports.NewFileLocation = Montage.create(Component, { | ||
12 | |||
13 | templateHeight:{ | ||
14 | enumerable: true, | ||
15 | value:"25 px" | ||
16 | }, | ||
17 | |||
18 | templateWidth:{ | ||
19 | enumerable: true, | ||
20 | value:"25 px" | ||
21 | }, | ||
22 | |||
23 | willDraw: { | ||
24 | enumerable: false, | ||
25 | value: function() {} | ||
26 | }, | ||