deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix SVG-Edit code for rotating objects

Browse source 
A little math goes a long way ...

Also pick up some updates from SVG-Edit trunk.
This commit is contained in:
Jacques Distler 2010-02-10 15:41:47 -06:00
parent 1d8318cfd2
commit 9047e5d460
3 changed files with 76 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

27
public/svg-edit/editor/svg-editor.js
View file

@ -1513,7 +1513,6 @@ function svg_edit_setup() {
$('#image_save_opts input').val([curPrefs.img_save]);
// update resolution option with actual resolution
// TODO: what if SVG source is changed?
var res = svgCanvas.getResolution();
$('#canvas_width').val(res.w);
$('#canvas_height').val(res.h);
@ -1580,12 +1579,26 @@ function svg_edit_setup() {
svgCanvas.setImageTitle(new_title);
// update resolution
var x = parseInt($('#canvas_width').val());
var y = parseInt($('#canvas_height').val());
if(isNaN(x) || isNaN(y)) {
x ='fit';
var width = $('#canvas_width'), w = width.val();
var height = $('#canvas_height'), h = height.val();
if(w != "fit" && !svgCanvas.isValidUnit('width', w)) {
$.alert(uiStrings.invalidAttrValGiven);
width.parent().addClass('error');
return false;
}
if(!svgCanvas.setResolution(x,y)) {
width.parent().removeClass('error');
if(h != "fit" && !svgCanvas.isValidUnit('height', h)) {
$.alert(uiStrings.invalidAttrValGiven);
height.parent().addClass('error');
return false;
}
height.parent().removeClass('error');
if(!svgCanvas.setResolution(w, h)) {
$.alert(uiStrings.noContentToFitTo);
return false;
}
@ -2705,7 +2718,7 @@ function svg_edit_setup() {
updateCanvas(true);
});
// var revnums = "svg-editor.js ($Rev: 1367 $) ";
// var revnums = "svg-editor.js ($Rev: 1372 $) ";
// revnums += svgCanvas.getVersion();
// $('#copyright')[0].setAttribute("title", revnums);
return svgCanvas;