aboutsummaryrefslogtreecommitdiff
path: root/js/panels/color
diff options
context:
space:
mode:
authorEric Guzman2012-04-30 13:48:43 -0700
committerEric Guzman2012-04-30 13:48:43 -0700
commit23d8efd4ed9e8fd43f516595009679fb44c8096d (patch)
tree7d5be06e6417102702a49ece24fca82528aced7a /js/panels/color
parentae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/color')
-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
4 files changed, 8 insertions, 12 deletions
diff --git a/js/panels/color/colorchippopup.reel/colorchippopup.html b/js/panels/color/colorchippopup.reel/colorchippopup.html
index 1ae40cc1..ff0c6498 100755
--- a/js/panels/color/colorchippopup.reel/colorchippopup.html
+++ b/js/panels/color/colorchippopup.reel/colorchippopup.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/panels/Color/colorchippopup.reel", 19 "prototype": "js/panels/Color/colorchippopup.reel",
20 "name": "colorchippopup",
21 "properties": { 20 "properties": {
22 "element": {"#": "cc_popup"} 21 "element": {"#": "cc_popup"}
23 } 22 }
diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.html b/js/panels/color/colorpanelbase.reel/colorpanelbase.html
index d4330596..f40bd448 100755
--- a/js/panels/color/colorpanelbase.reel/colorpanelbase.html
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.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/>
@@ -13,8 +13,7 @@
13 <script type="text/montage-serialization"> 13 <script type="text/montage-serialization">
14 { 14 {
15 "owner": { 15 "owner": {
16 "module": "js/panels/Color/ColorPanelBase.reel", 16 "prototype": "js/panels/Color/ColorPanelBase.reel",
17 "name": "ColorPanelBase",
18 "properties": { 17 "properties": {
19 "element": {"#": "cp_expanded"} 18 "element": {"#": "cp_expanded"}
20 } 19 }
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
index feebb45c..0698a6dc 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.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/>
@@ -14,8 +14,7 @@
14 <script type="text/montage-serialization"> 14 <script type="text/montage-serialization">
15 { 15 {
16 "owner": { 16 "owner": {
17 "module": "js/panels/Color/colorpanelpopup.reel", 17 "prototype": "js/panels/Color/colorpanelpopup.reel[ColorPanelPopup]",
18 "name": "ColorPanelPopup",
19 "properties": { 18 "properties": {
20 "element": {"#": "cpp_popup"} 19 "element": {"#": "cpp_popup"}
21 } 20 }
diff --git a/js/panels/color/colortoolbar.reel/colortoolbar.html b/js/panels/color/colortoolbar.reel/colortoolbar.html
index 9ab54836..e32a475c 100755
--- a/js/panels/color/colortoolbar.reel/colortoolbar.html
+++ b/js/panels/color/colortoolbar.reel/colortoolbar.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2 2
3<!DOCTYPE html> 3<!DOCTYPE html>
4<!-- <copyright> 4<!-- <copyright>
@@ -16,8 +16,7 @@
16 { 16 {
17 17
18 "owner": { 18 "owner": {
19 "module": "js/panels/Color/colortoolbar.reel", 19 "prototype": "js/panels/Color/colortoolbar.reel[ColorToolbar]",
20 "name": "ColorToolbar",
21 "properties": { 20 "properties": {
22 "element": {"#": "colortoolbar"} 21 "element": {"#": "colortoolbar"}
23 } 22 }