aboutsummaryrefslogtreecommitdiff
path: root/js/io/ui
diff options
context:
space:
mode:
authorhwc4872012-04-27 14:35:46 -0700
committerhwc4872012-04-27 14:35:46 -0700
commit1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce (patch)
tree3853b15ca684a7bdc7e7a8bdb7935be61ff85671 /js/io/ui
parent5a1965bf2ed9a54601ca16fd67555335c510ce08 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/io/ui')
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.html5
-rwxr-xr-xjs/io/ui/file-picker/file-input-field.reel/file-input-field.html5
-rwxr-xr-xjs/io/ui/file-picker/picker-navigator.reel/picker-navigator.html5
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html14
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html8
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.html8
6 files changed, 17 insertions, 28 deletions
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html
index e58041ec..a75266a3 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.html
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2 2
3<!-- <copyright> 3<!-- <copyright>
4 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 4 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
@@ -16,8 +16,7 @@
16 <script type="text/montage-serialization"> 16 <script type="text/montage-serialization">
17 { 17 {
18 "owner": { 18 "owner": {
19 "module": "js/io/ui/cloudpopup.reel", 19 "prototype": "js/io/ui/cloudpopup.reel[cloudpopup]",
20 "name": "cloudpopup",
21 "properties": { 20 "properties": {
22 "element": {"#": "cloud_popup"} 21 "element": {"#": "cloud_popup"}
23 } 22 }
diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
index 00df1c11..9113eb80 100755
--- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
+++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 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/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -19,8 +19,7 @@
19 }, 19 },
20 20
21 "owner":{ 21 "owner":{
22 "module": "js/io/ui/file-picker/file-input-field.reel", 22 "prototype": "js/io/ui/file-picker/file-input-field.reel",
23 "name": "FileInputField",
24 "properties": { 23 "properties": {
25 "element": {"#": "fileInputField"}, 24 "element": {"#": "fileInputField"},
26 "findDirectory": {"#": "findDirectory"}, 25 "findDirectory": {"#": "findDirectory"},
diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html
index f46068ec..7100a738 100755
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 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/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "owner":{ 13 "owner":{
14 "module": "js/io/ui/file-picker/picker-navigator.reel", 14 "prototype": "js/io/ui/file-picker/picker-navigator.reel",
15 "name":"PickerNavigator",
16 "properties":{ 15 "properties":{
17 "element": {"#": "picker"}, 16 "element": {"#": "picker"},
18 "filterVal" : {"#": "filterVal"}, 17 "filterVal" : {"#": "filterVal"},
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
index 1f9d9b9f..236b4f4e 100755
--- 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
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 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/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "hottextHeight": { 13 "hottextHeight": {
14 "module": "js/components/hottextunit.reel", 14 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
15 "name": "HotTextUnit",
16 "properties": { 15 "properties": {
17 "element": {"#": "templateHeight"}, 16 "element": {"#": "templateHeight"},
18 "minValue":25, 17 "minValue":25,
@@ -31,8 +30,7 @@
31 }, 30 },
32 31
33 "hottextWidth": { 32 "hottextWidth": {
34 "module": "js/components/hottextunit.reel", 33 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
35 "name": "HotTextUnit",
36 "properties": { 34 "properties": {
37 "element": {"#": "templateWidth"}, 35 "element": {"#": "templateWidth"},
38 "minValue":25, 36 "minValue":25,
@@ -51,8 +49,7 @@
51 }, 49 },
52 50
53 "fileInputField":{ 51 "fileInputField":{
54 "module": "js/io/ui/file-picker/file-input-field.reel", 52 "prototype": "js/io/ui/file-picker/file-input-field.reel",
55 "name": "FileInputField",
56 "properties": { 53 "properties": {
57 "element": {"#": "fileInputField"} 54 "element": {"#": "fileInputField"}
58 } 55 }
@@ -66,8 +63,7 @@
66 }, 63 },
67 64
68 "owner":{ 65 "owner":{
69 "module": "js/io/ui/new-file-dialog/new-file-location.reel", 66 "prototype": "js/io/ui/new-file-dialog/new-file-location.reel",
70 "name": "NewFileLocation",
71 "properties": { 67 "properties": {
72 "element": {"#": "newfileLocation"}, 68 "element": {"#": "newfileLocation"},
73 "fileInputField": {"@": "fileInputField"}, 69 "fileInputField": {"@": "fileInputField"},
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
index d4043658..58303a57 100755
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 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/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,16 +11,14 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "newFileLocation":{ 13 "newFileLocation":{
14 "module": "js/io/ui/new-file-dialog/new-file-location.reel", 14 "prototype": "js/io/ui/new-file-dialog/new-file-location.reel",
15 "name": "NewFileLocation",
16 "properties": { 15 "properties": {
17 "element": {"#": "right-bottom"} 16 "element": {"#": "right-bottom"}
18 } 17 }
19 }, 18 },
20 19
21 "owner":{ 20 "owner":{
22 "module": "js/io/ui/new-file-dialog/new-file-options-navigator.reel", 21 "prototype": "js/io/ui/new-file-dialog/new-file-options-navigator.reel",
23 "name": "NewFileOptionsNavigator",
24 "properties": { 22 "properties": {
25 "element": {"#": "newfile"}, 23 "element": {"#": "newfile"},
26 "projectTypeTree": {"#": "projectTypeTree"}, 24 "projectTypeTree": {"#": "projectTypeTree"},
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.html b/js/io/ui/save-as-dialog.reel/save-as-dialog.html
index 453d7a96..999f2057 100644
--- a/js/io/ui/save-as-dialog.reel/save-as-dialog.html
+++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 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/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "fileInputField":{ 13 "fileInputField":{
14 "module": "js/io/ui/file-picker/file-input-field.reel", 14 "prototype": "js/io/ui/file-picker/file-input-field.reel",
15 "name": "FileInputField",
16 "properties": { 15 "properties": {
17 "element": {"#": "fileInputField"} 16 "element": {"#": "fileInputField"}
18 } 17 }
@@ -26,8 +25,7 @@
26 }, 25 },
27 26
28 "owner":{ 27 "owner":{
29 "module": "js/io/ui/new-file-dialog/new-file-location.reel", 28 "prototype": "js/io/ui/new-file-dialog/new-file-location.reel[SaveAsDialog]",
30 "name": "SaveAsDialog",
31 "properties": { 29 "properties": {
32 "element": {"#": "saveAsDialog"}, 30 "element": {"#": "saveAsDialog"},
33 "fileInputField": {"@": "fileInputField"}, 31 "fileInputField": {"@": "fileInputField"},
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 15:26:19 +0000