fixed Issue#50

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@227 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Pavol Rusnak 2009-06-29 17:34:02 +00:00
parent 3ab00a7148
commit d1299beb5c
1 changed files with 6 additions and 3 deletions

View File

@ -425,7 +425,7 @@ function svg_edit_setup() {
var oldbg = elem.css('background');
var color = elem.css('background-color');
var was_none = false;
if (color == 'transparent') {
if (color == 'transparent' || color == 'initial') {
color = new $.jPicker.Color({ hex: 'ffffff' });
was_none = true;
} else {
@ -440,7 +440,7 @@ function svg_edit_setup() {
}
var pos = elem.position();
picker = 'stroke';
$('#color_picker').css({'left': pos.left, 'top': pos.top-300}).jPicker({
$('#color_picker').css({'left': pos.left + 40, 'bottom': 104 - pos.top}).jPicker({
images: { clientPath: "jpicker/images/" },
color: { active: color }
}, function(color){
@ -452,7 +452,10 @@ function svg_edit_setup() {
}
$('#color_picker').hide();
}
, null, function(){
, function(color){
elem.css('background', '#' + this.settings.color.active.hex);
}
, function(){
elem.css('background', oldbg);
if (was_none) {
if (elem.attr('id') == 'stroke_color') {