zcy
/
svgedit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug in last revision where labels for imported images weren't showing 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1650 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Alexis Deveria 2010-07-29 15:22:09 +00:00
parent 35ac12a3c9
commit e79a15f22a
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
editor/svg-editor.html
View File

@ -225,17 +225,6 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
</div> </div>
<div id="g_panel">
<div class="tool_sep"></div>
<label id="group_title" title="Group identification label">
<span>label:</span>
<input id="g_title" data-attr="title" size="10" type="text"/>
</label>
<div class="push_button" id="tool_ungroup" title="Ungroup Elements [G]"></div>
</div>
<div id="rect_panel"> <div id="rect_panel">
<div class="toolset"> <div class="toolset">
<label id="rect_width_tool" title="Change rectangle width"> <label id="rect_width_tool" title="Change rectangle width">
@ -361,14 +350,23 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
<!-- formerly gsvg_panel --> <!-- formerly gsvg_panel -->
<div id="container_panel"> <div id="container_panel">
<div class="tool_sep"></div>
<!-- Add viewBox field here? --> <!-- Add viewBox field here? -->
<label id="group_title" title="Group identification label">
<span>label:</span>
<input id="g_title" data-attr="title" size="10" type="text"/>
</label>
</div> </div>
<div id="use_panel"> <div id="use_panel">
<div class="tool_sep"></div>
<div class="push_button" id="tool_unlink_use" title="Break link to reference element (make unique)"></div> <div class="push_button" id="tool_unlink_use" title="Break link to reference element (make unique)"></div>
</div> </div>
<div id="g_panel">
<div class="push_button" id="tool_ungroup" title="Ungroup Elements [G]"></div>
</div>
<div id="path_node_panel"> <div id="path_node_panel">

8
editor/svg-editor.js
View File

@ -1407,10 +1407,9 @@
var el_name = elem.tagName; var el_name = elem.tagName;
if($(elem).data('gsvg')) { // if($(elem).data('gsvg')) {
$('#container_panel').show(); // $('#g_panel').show();
$('#g_panel').show(); // }
}
if(panels[el_name]) { if(panels[el_name]) {
var cur_panel = panels[el_name]; var cur_panel = panels[el_name];
@ -1449,6 +1448,7 @@
setImageURL(href); setImageURL(href);
} // image } // image
else if(el_name == 'g' || el_name == 'use') { else if(el_name == 'g' || el_name == 'use') {
$('#container_panel').show();
var title = svgCanvas.getTitle(); var title = svgCanvas.getTitle();
$('#g_title').val(title); $('#g_title').val(title);
} }