You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by zo...@apache.org on 2010/06/03 21:42:31 UTC
svn commit: r951130 - in
/incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat:
Component.js configuration/Theme.js
Author: zoe
Date: Thu Jun 3 19:42:31 2010
New Revision: 951130
URL: http://svn.apache.org/viewvc?rev=951130&view=rev
Log:
ARIES-319 Try moving outline colors to Theme
Modified:
incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/Component.js
incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/configuration/Theme.js
Modified: incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/Component.js
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/Component.js?rev=951130&r1=951129&r2=951130&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/Component.js (original)
+++ incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/Component.js Thu Jun 3 19:42:31 2010
@@ -299,16 +299,20 @@ updateAfterMove : function() {
dojo.publish("goat.component.move." + this.id, [ this ]);
},
pulse : function() {
- var endColor = this.selected ? "#FF3030" : "#808080";
+ if(this.selected) {
+ var endColor = theme.bundleOutlineColor1;
+ } else {
+ var endColor = theme.bundleOutlineColor0;
+ }
dojox.gfx.fx.animateStroke( {
shape : this.outline,
duration : 500,
color : {
- start : "#6F0000",
+ start : theme.bundleOutlineColor2,
end : endColor
},
width : {
- start : 10,
+ start : 7,
end : 2
},
join : {
@@ -317,13 +321,16 @@ pulse : function() {
}).play();
},
glow : function() {
- var endColor = this.selected ? "#FF3030" : "#808080";
- // this.outline.setStroke({width: 2, color: '#808080'});
+ if(this.selected) {
+ var endColor = theme.bundleOutlineColor1;
+ } else {
+ var endColor = theme.bundleOutlneColor0;
+ }
dojox.gfx.fx.animateStroke( {
shape : this.outline,
duration : 500,
color : {
- start : "#FF3030",
+ start : theme.bundleOutlineColor2,
end : endColor
},
width : {
@@ -343,7 +350,7 @@ onClick : function() {
onMouseEnter : function() {
this.outline.setStroke( {
width : 3,
- color : '#FF3030'
+ color : theme.bundleOutlineColor1
});
this.selected = true;
dojo.publish("goat.component.onenter." + this.id, [ this ]);
Modified: incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/configuration/Theme.js
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/configuration/Theme.js?rev=951130&r1=951129&r2=951130&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/configuration/Theme.js (original)
+++ incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/configuration/Theme.js Thu Jun 3 19:42:31 2010
@@ -31,6 +31,9 @@ dojo.declare("goat.configuration.Theme",
showState : null,
showVersion : null,
bundleBackgroundColor: "#ffff80",
+ bundleOutlineColor0: "#808080",
+ bundleOutlineColor1: "#BA98E2",
+ bundleOutlineColor2: "#682DAE",
constructor : function() {
this.greyOutInactiveBundles = true;