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

Fixed issue 329, also made zoom reset on New Image. Made some code more efficient. 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@947 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Alexis Deveria 2009-11-16 17:04:19 +00:00
parent 082523f7f7
commit e9ff3cf682
2 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
editor/svg-editor.js
View File

@ -749,10 +749,7 @@ function svg_edit_setup() {
var dblclickZoom = function(){ var dblclickZoom = function(){
if (toolButtonClick('#tool_zoom')) { if (toolButtonClick('#tool_zoom')) {
var res = svgCanvas.getResolution(); zoomImage();
setResolution(res.w, res.h);
$('#zoom').val(100);
svgCanvas.setZoom(1);
setSelectMode(); setSelectMode();
} }
}; };
@ -824,6 +821,8 @@ function svg_edit_setup() {
var clickClear = function(){ var clickClear = function(){
if( confirm(uiStrings.QwantToClear) ) { if( confirm(uiStrings.QwantToClear) ) {
svgCanvas.clear(); svgCanvas.clear();
svgCanvas.setResolution(640, 480);
zoomImage();
populateLayers(); populateLayers();
updateContextPanel(); updateContextPanel();
} }
@ -876,28 +875,14 @@ function svg_edit_setup() {
svgCanvas.cloneSelectedElements(); svgCanvas.cloneSelectedElements();
}; };
var clickAlignLeft = function(){ var clickAlign = function() {
svgCanvas.alignSelectedElements('l', $('#align_relative_to option:selected').val() ); var letter = this.id.replace('tool_align','').charAt(0);
}; svgCanvas.alignSelectedElements(letter, $('#align_relative_to').val());
var clickAlignCenter = function(){
svgCanvas.alignSelectedElements('c', $('#align_relative_to option:selected').val() );
};
var clickAlignRight = function(){
svgCanvas.alignSelectedElements('r', $('#align_relative_to option:selected').val() );
};
var clickAlignTop = function(){
svgCanvas.alignSelectedElements('t', $('#align_relative_to option:selected').val() );
};
var clickAlignMiddle = function(){
svgCanvas.alignSelectedElements('m', $('#align_relative_to option:selected').val() );
};
var clickAlignBottom = function(){
svgCanvas.alignSelectedElements('b', $('#align_relative_to option:selected').val() );
}; };
var zoomImage = function(zoomIn) { var zoomImage = function(multiplier) {
var res = svgCanvas.getResolution(); var res = svgCanvas.getResolution();
var multiplier = zoomIn? res.zoom * 2 : res.zoom * 0.5; multiplier = multiplier?res.zoom * multiplier:1;
setResolution(res.w * multiplier, res.h * multiplier, true); setResolution(res.w * multiplier, res.h * multiplier, true);
$('#zoom').val(multiplier * 100); $('#zoom').val(multiplier * 100);
svgCanvas.setZoom(multiplier); svgCanvas.setZoom(multiplier);
@ -967,6 +952,7 @@ function svg_edit_setup() {
} }
svgCanvas.clearSelection(); svgCanvas.clearSelection();
hideSourceEditor(); hideSourceEditor();
zoomImage();
populateLayers(); populateLayers();
setTitle(svgCanvas.getImageTitle()); setTitle(svgCanvas.getImageTitle());
}; };
@ -1243,12 +1229,7 @@ function svg_edit_setup() {
$('#tool_clone_multi').click(clickClone); $('#tool_clone_multi').click(clickClone);
$('#tool_group').click(clickGroup); $('#tool_group').click(clickGroup);
$('#tool_ungroup').click(clickGroup); $('#tool_ungroup').click(clickGroup);
$('#tool_alignleft').click(clickAlignLeft); $('[id^=tool_align]').click(clickAlign);
$('#tool_aligncenter').click(clickAlignCenter);
$('#tool_alignright').click(clickAlignRight);
$('#tool_aligntop').click(clickAlignTop);
$('#tool_alignmiddle').click(clickAlignMiddle);
$('#tool_alignbottom').click(clickAlignBottom);
// these two lines are required to make Opera work properly with the flyout mechanism // these two lines are required to make Opera work properly with the flyout mechanism
$('#tools_rect_show').click(clickSquare); $('#tools_rect_show').click(clickSquare);
$('#tools_ellipse_show').click(clickCircle); $('#tools_ellipse_show').click(clickCircle);
@ -1351,8 +1332,8 @@ function svg_edit_setup() {
['shift+right', function(){rotateSelected(1)}], ['shift+right', function(){rotateSelected(1)}],
['shift+O', selectPrev], ['shift+O', selectPrev],
['shift+P', selectNext], ['shift+P', selectNext],
['ctrl+up', function(evt){zoomImage(true);evt.preventDefault();}], ['ctrl+up', function(evt){zoomImage(2);evt.preventDefault();}],
['ctrl+down', function(evt){zoomImage();evt.preventDefault();}], ['ctrl+down', function(evt){zoomImage(.5);evt.preventDefault();}],
['up', function(evt){moveSelected(0,-1);evt.preventDefault();}], ['up', function(evt){moveSelected(0,-1);evt.preventDefault();}],
['down', function(evt){moveSelected(0,1);evt.preventDefault();}], ['down', function(evt){moveSelected(0,1);evt.preventDefault();}],
['left', function(evt){moveSelected(-1,0);evt.preventDefault();}], ['left', function(evt){moveSelected(-1,0);evt.preventDefault();}],

2
editor/svgcanvas.js
View File

@ -1933,6 +1933,8 @@ function BatchCommand(text) {
} }
// make sure the elements are in the correct order // make sure the elements are in the correct order
// See: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-compareDocumentPosition
selectedElements.sort(function(a,b) { selectedElements.sort(function(a,b) {
if(a && b && a.compareDocumentPosition) { if(a && b && a.compareDocumentPosition) {
return 3 - (b.compareDocumentPosition(a) & 6); return 3 - (b.compareDocumentPosition(a) & 6);