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

Fixed issue 692 by applying adrianbjones' patch and making some adjustments

Browse Source 
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1752 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Alexis Deveria
2010-09-24 17:44:34 +00:00
parent d826136331
commit e2401669ad
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/svg-editor.html
View File

@@ -686,6 +686,8 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
<li><a href="#paste">Paste</a></li> <li><a href="#paste">Paste</a></li>
<li><a href="#paste_in_place">Paste in Place</a></li> <li><a href="#paste_in_place">Paste in Place</a></li>
<li class="separator"><a href="#delete">Delete</a></li> <li class="separator"><a href="#delete">Delete</a></li>
<li class="separator"><a href="#group">Group</a></li>
<li><a href="#ungroup">Ungroup</a></li>
<li class="separator"><a href="#move_up">Bring Forward</a></li> <li class="separator"><a href="#move_up">Bring Forward</a></li>
<li><a href="#move_down">Send Backward</a></li> <li><a href="#move_down">Send Backward</a></li>
</ul> </ul>

18
editor/svg-editor.js
View File

@@ -1406,6 +1406,7 @@
return; return;
} }
var is_node = currentMode == 'pathedit'; //elem ? (elem.id && elem.id.indexOf('pathpointgrip') == 0) : false; var is_node = currentMode == 'pathedit'; //elem ? (elem.id && elem.id.indexOf('pathpointgrip') == 0) : false;
var menu_items = $('#cmenu_canvas li');
$('#selected_panel, #multiselected_panel, #g_panel, #rect_panel, #circle_panel,\ $('#selected_panel, #multiselected_panel, #g_panel, #rect_panel, #circle_panel,\
#ellipse_panel, #line_panel, #text_panel, #image_panel, #container_panel, #use_panel').hide(); #ellipse_panel, #line_panel, #text_panel, #image_panel, #container_panel, #use_panel').hide();
if (elem != null) { if (elem != null) {
@@ -1541,7 +1542,7 @@
else if(el_name == 'image') { else if(el_name == 'image') {
setImageURL(svgCanvas.getHref(elem)); setImageURL(svgCanvas.getHref(elem));
} // image } // image
else if(el_name == 'g' || el_name == 'use') { else if(el_name === 'g' || el_name === 'use') {
$('#container_panel').show(); $('#container_panel').show();
var title = svgCanvas.getTitle(); var title = svgCanvas.getTitle();
var label = $('#g_title')[0]; var label = $('#g_title')[0];
@@ -1553,13 +1554,20 @@
} else { } else {
label.removeAttribute(d); label.removeAttribute(d);
} }
if(el_name === 'g') {
menu_items.enableContextMenuItems('#ungroup');
}
} }
} }
} // if (elem != null) } // if (elem != null)
else if (multiselected) { else if (multiselected) {
$('#multiselected_panel').show(); $('#multiselected_panel').show();
menu_items
.enableContextMenuItems('#group')
.disableContextMenuItems('#ungroup');
} else { } else {
$('#cmenu_canvas li').disableContextMenuItems('#delete,#cut,#copy,#move_up,#move_down'); menu_items.disableContextMenuItems('#delete,#cut,#copy,#group,#ungroup,#move_up,#move_down');
} }
// update history buttons // update history buttons
@@ -3886,6 +3894,12 @@
case 'paste_in_place': case 'paste_in_place':
svgCanvas.pasteElements('in_place'); svgCanvas.pasteElements('in_place');
break; break;
case 'group':
svgCanvas.groupSelectedElements();
break;
case 'ungroup':
svgCanvas.ungroupSelectedElement();
break;
case 'move_down': case 'move_down':
moveUpDownSelected('Down'); moveUpDownSelected('Down');
break; break;