From 5df494c2b6f522125e4cd8544280b6146983210b Mon Sep 17 00:00:00 2001 From: Alexis Deveria Date: Fri, 4 Sep 2009 14:52:21 +0000 Subject: [PATCH] Fixed remaining bug for 164 and additional bug that selects correct paint tab on change to gradient git-svn-id: http://svg-edit.googlecode.com/svn/trunk@561 eee81c28-f429-11dd-99c0-75d572ba1ddd --- editor/jgraduate/jquery.jgraduate.js | 2 +- editor/svg-editor.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/editor/jgraduate/jquery.jgraduate.js b/editor/jgraduate/jquery.jgraduate.js index 1218d60d..3fa4ca8f 100644 --- a/editor/jgraduate/jquery.jgraduate.js +++ b/editor/jgraduate/jquery.jgraduate.js @@ -389,7 +389,7 @@ jQuery.fn.jGraduate = var startx = -1, starty = -1; // for whatever reason, Opera does not allow $('image.stop') here, // and Firefox 1.5 does not allow $('.stop') - $('.stop, #gradPicker_jgraduate_svg image').mousedown(function(evt) { + $('.stop, #color_picker_jGraduate_GradContainer image').mousedown(function(evt) { draggingStop = this; startx = evt.clientX; starty = evt.clientY; diff --git a/editor/svg-editor.js b/editor/svg-editor.js index 345ce0eb..554b3725 100644 --- a/editor/svg-editor.js +++ b/editor/svg-editor.js @@ -743,11 +743,9 @@ function svg_edit_setup() { var colorPicker = function(elem) { var picker = elem.attr('id') == 'stroke_color' ? 'stroke' : 'fill'; var opacity = (picker == 'stroke' ? $('#stroke_opacity') : $('#fill_opacity')); - var paint = (picker == 'stroke' ? strokePaint : fillPaint); var title = (picker == 'stroke' ? 'Pick a Stroke Paint and Opacity' : 'Pick a Fill Paint and Opacity'); var was_none = false; - if (paint.type == "none") { // if it was none, then set to solid white paint = new $.jGraduate.Paint({solidColor: 'ffffff'}); @@ -784,7 +782,7 @@ function svg_edit_setup() { else { svgCanvas.setFillPaint(paint, true); } - + updateToolbar(); $('#color_picker').hide(); }, function(p) {