aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-27 14:21:35 -0700
committerValerio Virgillito2012-04-27 14:21:35 -0700
commitb08cc404d32dd1d4dbc2139ce8f06d7d88b681a8 (patch)
treeae45391131c7c5203ae8e0d3470d106d835c8c6b /js/panels
parent314709dd189807bfc762aa150bb1b29d2ccdf25b (diff)
parent6c1aa27b7753bc9007514859b42160fae265740d (diff)
downloadninja-b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8.tar.gz
Merge branch 'refs/heads/serialization'
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html11
-rwxr-xr-xjs/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html5
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html17
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html18
-rwxr-xr-xjs/panels/Panel.reel/Panel.html24
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html24
-rwxr-xr-xjs/panels/Project/projectpanelbase.reel/projectpanelbase.html5
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.html5
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html47
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html5
-rw-r--r--js/panels/Timeline/Span.reel/Span.html5
-rw-r--r--js/panels/Timeline/Style.reel/Style.html14
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html23
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html38
-rw-r--r--js/panels/Timeline/Track.reel/Track.html11
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html5
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.html11
-rwxr-xr-xjs/panels/color/colorchippopup.reel/colorchippopup.html5
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.html5
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.html5
-rwxr-xr-xjs/panels/color/colortoolbar.reel/colortoolbar.html5
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.html14
-rw-r--r--js/panels/presets/animations-presets.reel/animations-presets.html14
-rw-r--r--js/panels/presets/content.reel/content.html17
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.html14
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html14
-rwxr-xr-xjs/panels/properties.reel/properties.html26
-rwxr-xr-xjs/panels/properties.reel/properties.js1
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.html9
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html9
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html9
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html6
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.html9
-rwxr-xr-xjs/panels/properties.reel/sections/position-and-size.reel/position-and-size.html15
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html36
35 files changed, 169 insertions, 312 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
index 98b2b61d..c62b2b23 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.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 "resizer1": { 13 "resizer1": {
14 "module": "js/panels/Resizer", 14 "prototype": "js/panels/Resizer",
15 "name": "Resizer",
16 "properties": { 15 "properties": {
17 "element": {"#": "subPanelResizer"}, 16 "element": {"#": "subPanelResizer"},
18 "panel": {"#": "nj-section-stylesheets"}, 17 "panel": {"#": "nj-section-stylesheets"},
@@ -21,16 +20,14 @@
21 }, 20 },
22 21
23 "ComputedStyleSubPanel1": { 22 "ComputedStyleSubPanel1": {
24 "module": "js/panels/CSSPanel/ComputedStyleSubPanel.reel", 23 "prototype": "js/panels/CSSPanel/ComputedStyleSubPanel.reel",
25 "name": "ComputedStyleSubPanel",
26 "properties": { 24 "properties": {
27 "element": {"#": "nj-computed-sub-panel"} 25 "element": {"#": "nj-computed-sub-panel"}
28 } 26 }
29 }, 27 },
30 28
31 "owner": { 29 "owner": {
32 "module": "js/panels/CSSPanel/CSSPanelBase.reel", 30 "prototype": "js/panels/CSSPanel/CSSPanelBase.reel",
33 "name": "CSSPanelBase",
34 "properties": { 31 "properties": {
35 "element": {"#": "css_panel"}, 32 "element": {"#": "css_panel"},
36 "computedStyleSubPanel": {"@": "ComputedStyleSubPanel1"} 33 "computedStyleSubPanel": {"@": "ComputedStyleSubPanel1"}
diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
index c30d2fb4..53c243a8 100755
--- a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
+++ b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.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/>
@@ -12,8 +12,7 @@
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "owner": { 14 "owner": {
15 "module": "js/panels/CSSPanel/ComputedStyleSubPanel.reel", 15 "prototype": "js/panels/CSSPanel/ComputedStyleSubPanel.reel",
16 "name": "ComputedStyleSubPanel",
17 "properties": { 16 "properties": {
18 "element": {"#": "nj-css-panel-computed"}, 17 "element": {"#": "nj-css-panel-computed"},
19 "groupDropDown": {"#": "nj-css-group-select"}, 18 "groupDropDown": {"#": "nj-css-group-select"},
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
index 4e41512f..741ff6aa 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.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/>
@@ -47,12 +47,10 @@
47 ] 47 ]
48 }, 48 },
49 "materialInfo": { 49 "materialInfo": {
50 "module": "js/panels/Materials/materials-popup.reel", 50 "prototype": "js/panels/Materials/materials-popup.reel"
51 "name": "MaterialsPopup"
52 }, 51 },
53 "materialsController" : { 52 "materialsController" : {
54 "module": "js/controllers/tree-controller", 53 "prototype": "js/controllers/tree-controller",
55 "name": "TreeController",
56 "properties" : { 54 "properties" : {
57 "branchKey" : "children", 55 "branchKey" : "children",
58 "labelKey" : "label", 56 "labelKey" : "label",
@@ -66,8 +64,7 @@
66 } 64 }
67 }, 65 },
68 "materialsContainer" : { 66 "materialsContainer" : {
69 "module" : "js/components/treeview/treeview.reel", 67 "prototype" : "js/components/treeview/treeview.reel",
70 "name" : "Treeview",
71 "properties" : { 68 "properties" : {
72 "element" : {"#": "materials_library_tree"}, 69 "element" : {"#": "materials_library_tree"},
73 "branchComponent" : {"@": "branch" }, 70 "branchComponent" : {"@": "branch" },
@@ -76,12 +73,10 @@
76 } 73 }
77 }, 74 },
78 "branch" : { 75 "branch" : {
79 "module" : "js/components/treeview/ninja-branch.reel", 76 "prototype" : "js/components/treeview/ninja-branch.reel[Branch]"
80 "name" : "Branch"
81 }, 77 },
82 "owner": { 78 "owner": {
83 "module": "js/panels/Materials/materials-library-panel.reel", 79 "prototype": "js/panels/Materials/materials-library-panel.reel[MaterialsLibraryPanels]",
84 "name": "MaterialsLibraryPanels",
85 "properties": { 80 "properties": {
86 "element": {"#": "materials_library_panel"}, 81 "element": {"#": "materials_library_panel"},
87 "_materialInfo": {"@": "materialInfo"} 82 "_materialInfo": {"@": "materialInfo"}
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html
index ae0ee2c8..9fdbc00d 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.html
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -14,32 +14,28 @@
14 <script type="text/montage-serialization"> 14 <script type="text/montage-serialization">
15 { 15 {
16 "okButton": { 16 "okButton": {
17 "module": "montage/ui/button.reel", 17 "prototype": "montage/ui/button.reel",
18 "name": "Button",
19 "properties": { 18 "properties": {
20 "element": {"#": "mp_ok_btn"}, 19 "element": {"#": "mp_ok_btn"},
21 "label": "OK" 20 "label": "OK"