From 47b6e11be9ff2db65fe9b2ac0007d02b087e0dfe Mon Sep 17 00:00:00 2001 From: Bruno Heridet Date: Tue, 19 Feb 2013 11:13:03 +0000 Subject: [PATCH] simplified getPaint() git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2427 eee81c28-f429-11dd-99c0-75d572ba1ddd --- editor/svg-editor.js | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/editor/svg-editor.js b/editor/svg-editor.js index 9df94f0b..89c72ae6 100644 --- a/editor/svg-editor.js +++ b/editor/svg-editor.js @@ -1356,27 +1356,19 @@ var getPaint = function(color, opac, type) { // update the editor's fill paint - var opts = null; + var opts = { alpha: opac }; if (color.indexOf('url(#') === 0) { var refElem = svgCanvas.getRefElem(color); if (refElem) { refElem = refElem.cloneNode(true); } else { - refElem = $('#' + type + '_color defs *')[0]; + refElem = $('#' + type + '_color defs *')[0]; } - - opts = { alpha: opac }; opts[refElem.tagName] = refElem; } else if (color.indexOf('#') === 0) { - opts = { - alpha: opac, - solidColor: color.substr(1) - }; + opts.solidColor = color.substr(1); } else { - opts = { - alpha: opac, - solidColor: 'none' - }; + opts.solidColor = 'none'; } return new $.jGraduate.Paint(opts); };