From 02adda7a98021da58ad44af08df1d9c107bf3d3b Mon Sep 17 00:00:00 2001 From: Daniel Shapiro Date: Sat, 21 Sep 2013 22:19:24 +0000 Subject: [PATCH] Fix bug with applying text attribute changes. Change to select mode AFTER setting new attribute on text element. https://code.google.com/p/svg-edit/issues/detail?id=1143 git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2525 eee81c28-f429-11dd-99c0-75d572ba1ddd --- editor/svgcanvas.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js index 4d311967..ad0b3852 100644 --- a/editor/svgcanvas.js +++ b/editor/svgcanvas.js @@ -6655,11 +6655,6 @@ var changeSelectedAttributeNoUndo = function(attr, newValue, elems) { var elem = elems[i]; if (elem == null) continue; - // Go into "select" mode for text changes - if (current_mode === "textedit" && attr !== "#text" && elem.textContent.length) { - textActions.toSelectMode(elem); - } - // Set x,y vals on elements that don't have them if ((attr === 'x' || attr === 'y') && no_xy_elems.indexOf(elem.tagName) >= 0) { var bbox = getStrokedBBox([elem]); @@ -6704,6 +6699,15 @@ var changeSelectedAttributeNoUndo = function(attr, newValue, elems) { setHref(elem, newValue); } else elem.setAttribute(attr, newValue); + + // Go into "select" mode for text changes + // NOTE: Important that this happens AFTER elem.setAttribute() or else attributes like + // font-size can get reset to their old value, ultimately by svgEditor.updateContextPanel(), + // after calling textActions.toSelectMode() below + if (current_mode === "textedit" && attr !== "#text" && elem.textContent.length) { + textActions.toSelectMode(elem); + } + // if (i==0) // selectedBBoxes[0] = svgedit.utilities.getBBox(elem); // Use the Firefox ffClone hack for text elements with gradients or