aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components')
-rw-r--r--js/components/about-box.reel/about-box.html7
-rwxr-xr-xjs/components/checkbox.reel/checkbox.html5
-rwxr-xr-xjs/components/colorbar.reel/colorbar.html7
-rwxr-xr-xjs/components/colorwheel.reel/colorwheel.html7
-rwxr-xr-xjs/components/combobox.reel/combobox.html5
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.html7
-rwxr-xr-xjs/components/hottext.reel/hottext.html7
-rwxr-xr-xjs/components/hottextunit.reel/hottextunit.html7
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html19
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js5
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html18
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js2
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html11
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html17
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.html9
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.css4
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.html7
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.css4
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html7
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html87
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html92
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.html24
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.html24
-rwxr-xr-xjs/components/menu/menu.reel/menu.html23
-rwxr-xr-xjs/components/popup-manager.reel/popup-manager.html7
-rwxr-xr-xjs/components/popup-manager.reel/popup-manager.js4
-rwxr-xr-xjs/components/popup.reel/popup.html7
-rwxr-xr-xjs/components/radio.reel/radio.html5
-rwxr-xr-xjs/components/slider.reel/slider.html13
-rwxr-xr-xjs/components/textfield.reel/textfield.html5
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html27
-rwxr-xr-xjs/components/tools-properties/eraser-properties.reel/eraser-properties.html7
-rwxr-xr-xjs/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html7
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html18
-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.html7
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.html11
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.html12
-rwxr-xr-xjs/components/tools-properties/pan-properties.reel/pan-properties.html7
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html10
-rwxr-xr-xjs/components/tools-properties/pencil-properties.reel/pencil-properties.html7
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html29
-rwxr-xr-xjs/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html7
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html7
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html53
-rwxr-xr-xjs/components/tools-properties/subselection-properties.reel/subselection-properties.html7
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html25
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.js6
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html95
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.html11
-rw-r--r--js/components/treeview/branch.reel/branch.html31
-rw-r--r--js/components/treeview/leaf.reel/leaf.html12
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html33
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.html12
-rw-r--r--js/components/treeview/treeview.reel/treeview.html21
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.html17
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.html11
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.html11
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html17
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.html20
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.html16
-rwxr-xr-xjs/components/ui/tree-basic/tree.reel/tree.html17
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.html13
63 files changed, 428 insertions, 616 deletions
diff --git a/js/components/about-box.reel/about-box.html b/js/components/about-box.reel/about-box.html
index 7142d605..ecdd4389 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 }
@@ -22,7 +21,7 @@
22 </script> 21 </script>
23</head> 22</head>
24<body> 23<body>
25<div class="mainAboutBoxContainer" id="mainAboutBoxContainer"> 24<div data-montage-id="mainAboutBoxContainer" class="mainAboutBoxContainer">
26 <div id="about_box_ninja_logo"></div> 25 <div id="about_box_ninja_logo"></div>
27 <div id="aboutBoxTextBlock" class="baseAboutBoxText"> 26 <div id="aboutBoxTextBlock" class="baseAboutBoxText">
28 <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p> 27 <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p>
diff --git a/js/components/checkbox.reel/checkbox.html b/js/components/checkbox.reel/checkbox.html
index 3d523a98..ded91fc2 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 }
@@ -19,6 +18,6 @@
19 </script> 18 </script>
20</head> 19</head>
21<body> 20<body>
22 <input id="ch_comp" class="nj-skinned" type="checkbox"> 21 <input data-montage-id="ch_comp" class="nj-skinned" type="checkbox">
23</body> 22</body>
24</html> \ No newline at end of file 23</html> \ No newline at end of file
diff --git a/js/components/colorbar.reel/colorbar.html b/js/components/colorbar.reel/colorbar.html
index f74f1437..2e189c87 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
@@ -30,7 +29,7 @@
30 29
31 <body> 30 <body>
32 31
33 <canvas id="colorbar" class="colorbar"></canvas> 32 <canvas data-montage-id="colorbar" class="colorbar"></canvas>
34 33
35 </body> 34 </body>
36 35
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html
index a9fbfbd9..707bd637 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",