aboutsummaryrefslogtreecommitdiff
path: root/js/components
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/components
parent314709dd189807bfc762aa150bb1b29d2ccdf25b (diff)
parent6c1aa27b7753bc9007514859b42160fae265740d (diff)
downloadninja-b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8.tar.gz
Merge branch 'refs/heads/serialization'
Diffstat (limited to 'js/components')
-rw-r--r--js/components/about-box.reel/about-box.html5
-rwxr-xr-xjs/components/checkbox.reel/checkbox.html3
-rwxr-xr-xjs/components/colorbar.reel/colorbar.html5
-rwxr-xr-xjs/components/colorwheel.reel/colorwheel.html5
-rwxr-xr-xjs/components/combobox.reel/combobox.html3
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.html5
-rwxr-xr-xjs/components/hottext.reel/hottext.html5
-rwxr-xr-xjs/components/hottextunit.reel/hottextunit.html5
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html11
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js1
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html8
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html5
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html11
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.html5
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.html5
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html5
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html77
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html56
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.html14
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.html14
-rwxr-xr-xjs/components/menu/menu.reel/menu.html17
-rwxr-xr-xjs/components/popup-manager.reel/popup-manager.html5
-rwxr-xr-xjs/components/popup-manager.reel/popup-manager.js4
-rwxr-xr-xjs/components/popup.reel/popup.html5
-rwxr-xr-xjs/components/radio.reel/radio.html3
-rwxr-xr-xjs/components/slider.reel/slider.html5
-rwxr-xr-xjs/components/textfield.reel/textfield.html3
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html17
-rwxr-xr-xjs/components/tools-properties/eraser-properties.reel/eraser-properties.html5
-rwxr-xr-xjs/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html5
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html8
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html14
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.html5
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.html5
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.html8
-rwxr-xr-xjs/components/tools-properties/pan-properties.reel/pan-properties.html5
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html8
-rwxr-xr-xjs/components/tools-properties/pencil-properties.reel/pencil-properties.html5
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html17
-rwxr-xr-xjs/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html5
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html3
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html27
-rwxr-xr-xjs/components/tools-properties/subselection-properties.reel/subselection-properties.html5
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html3
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html56
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.html5
-rw-r--r--js/components/treeview/branch.reel/branch.html23
-rw-r--r--js/components/treeview/leaf.reel/leaf.html8
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html23
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.html8
-rw-r--r--js/components/treeview/treeview.reel/treeview.html17
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.html5
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.html5
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.html5
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html11
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.html14
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.html8
-rwxr-xr-xjs/components/ui/tree-basic/tree.reel/tree.html11
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.html5
59 files changed, 230 insertions, 409 deletions
diff --git a/js/components/about-box.reel/about-box.html b/js/components/about-box.reel/about-box.html
index 7142d605..1f41699e 100644
--- a/js/components/about-box.reel/about-box.html
+++ b/js/components/about-box.reel/about-box.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/components/about-box.reel", 15 "prototype": "js/components/about-box.reel",
16 "name": "AboutBox",
17 "properties": { 16 "properties": {
18 "element": {"#": "mainAboutBoxContainer"} 17 "element": {"#": "mainAboutBoxContainer"}
19 } 18 }
diff --git a/js/components/checkbox.reel/checkbox.html b/js/components/checkbox.reel/checkbox.html
index 3d523a98..a03d72fb 100755
--- a/js/components/checkbox.reel/checkbox.html
+++ b/js/components/checkbox.reel/checkbox.html
@@ -9,8 +9,7 @@
9 <script type="text/montage-serialization"> 9 <script type="text/montage-serialization">
10 { 10 {
11 "owner": { 11 "owner": {
12 "module": "js/components/checkbox.reel", 12 "prototype": "js/components/checkbox.reel",
13 "name": "Checkbox",
14 "properties": { 13 "properties": {
15 "element": {"#": "ch_comp"} 14 "element": {"#": "ch_comp"}
16 } 15 }
diff --git a/js/components/colorbar.reel/colorbar.html b/js/components/colorbar.reel/colorbar.html
index f74f1437..c5bc186a 100755
--- a/js/components/colorbar.reel/colorbar.html
+++ b/js/components/colorbar.reel/colorbar.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. 4 This file contains proprietary software owned by Motorola Mobility, Inc.
@@ -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/components/colorbar.reel", 19 "prototype": "js/components/colorbar.reel[ColorBar]",
20 "name": "ColorBar",
21 "properties": { 20 "properties": {
22 "element": {"#": "colorbar"} 21 "element": {"#": "colorbar"}
23 22
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html
index a9fbfbd9..ef955c2d 100755
--- a/js/components/colorwheel.reel/colorwheel.html
+++ b/js/components/colorwheel.reel/colorwheel.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. 4 This file contains proprietary software owned by Motorola Mobility, Inc.
@@ -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/components/colorwheel.reel", 19 "prototype": "js/components/colorwheel.reel[ColorWheel]",
20 "name": "ColorWheel",
21 "properties": { 20 "properties": {
22 "element": {"#": "colorwheel"} 21 "element": {"#": "colorwheel"}
23 22
diff --git a/js/components/combobox.reel/combobox.html b/js/components/combobox.reel/combobox.html
index d78cc9c1..a68dd37f 100755
--- a/js/components/combobox.reel/combobox.html
+++ b/js/components/combobox.reel/combobox.html
@@ -9,8 +9,7 @@
9 <script type="text/montage-serialization"> 9 <script type="text/montage-serialization">
10 { 10 {
11 "owner": { 11 "owner": {
12 "module": "js/components/combobox.reel", 12 "prototype": "js/components/combobox.reel",
13 "name": "Combobox",
14 "properties": { 13 "properties": {
15 "element": {"#": "cb_comp"} 14 "element": {"#": "cb_comp"}
16 } 15 }
diff --git a/js/components/gradientpicker.reel/gradientpicker.html b/js/components/gradientpicker.reel/gradientpicker.html
index f71c6705..afd42925 100755
--- a/js/components/gradientpicker.reel/gradientpicker.html
+++ b/js/components/gradientpicker.reel/gradientpicker.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. 4 This file contains proprietary software owned by Motorola Mobility, Inc.
@@ -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/components/gradientpicker.reel", 19 "prototype": "js/components/gradientpicker.reel[GradientPicker]",
20 "name": "GradientPicker",
21 "properties": { 20 "properties": {
22 "element": {"#": "gradientpicker"} 21 "element": {"#": "gradientpicker"}