diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index 722cc229..aa94f807 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -1,6 +1,8 @@
var palette = ["#000000","#202020","#404040","#606060","#808080","#a0a0a0","#c0c0c0","#e0e0e0","#ffffff","#800000","#ff0000","#808000","#ffff00","#008000","#00ff00","#008080","#00ffff","#000080","#0000ff","#800080","#ff00ff","#2b0000","#550000","#800000","#aa0000","#d40000","#ff0000","#ff2a2a","#ff5555","#ff8080","#ffaaaa","#ffd5d5","#280b0b","#501616","#782121","#a02c2c","#c83737","#d35f5f","#de8787","#e9afaf","#f4d7d7","#241c1c","#483737","#6c5353","#916f6f","#ac9393","#c8b7b7","#e3dbdb","#2b1100","#552200","#803300","#aa4400","#d45500","#ff6600","#ff7f2a","#ff9955","#ffb380","#ffccaa","#ffe6d5","#28170b","#502d16","#784421","#a05a2c","#c87137","#d38d5f","#deaa87","#e9c6af","#f4e3d7","#241f1c","#483e37","#6c5d53","#917c6f","#ac9d93","#c8beb7","#e3dedb","#2b2200","#554400","#806600","#aa8800","#d4aa00","#ffcc00","#ffd42a","#ffdd55","#ffe680","#ffeeaa","#fff6d5","#28220b","#504416","#786721","#a0892c","#c8ab37","#d3bc5f","#decd87","#e9ddaf","#f4eed7","#24221c","#484537","#6c6753","#918a6f","#aca793","#c8c4b7","#e3e2db","#222b00","#445500","#668000","#88aa00","#aad400","#ccff00","#d4ff2a","#ddff55","#e5ff80","#eeffaa","#f6ffd5","#22280b","#445016","#677821","#89a02c","#abc837","#bcd35f","#cdde87","#dde9af","#eef4d7","#22241c","#454837","#676c53","#8a916f","#a7ac93","#c4c8b7","#e2e3db","#112b00","#225500","#338000","#44aa00","#55d400","#66ff00","#7fff2a","#99ff55","#b3ff80","#ccffaa","#e5ffd5","#17280b","#2d5016","#447821","#5aa02c","#71c837","#8dd35f","#aade87","#c6e9af","#e3f4d7","#1f241c","#3e4837","#5d6c53","#7c916f","#9dac93","#bec8b7","#dee3db","#002b00","#005500","#008000","#00aa00","#00d400","#00ff00","#2aff2a","#55ff55","#80ff80","#aaffaa","#d5ffd5","#0b280b","#165016","#217821","#2ca02c","#37c837","#5fd35f","#87de87","#afe9af","#d7f4d7","#1c241c","#374837","#536c53","#6f916f","#93ac93","#b7c8b7","#dbe3db","#002b11","#005522","#008033","#00aa44","#00d455","#00ff66","#2aff80","#55ff99","#80ffb3","#aaffcc","#d5ffe6","#0b2817","#16502d","#217844","#2ca05a","#37c871","#5fd38d","#87deaa","#afe9c6","#d7f4e3","#1c241f","#37483e","#536c5d","#6f917c","#93ac9d","#b7c8be","#dbe3de","#002b22","#005544","#008066","#00aa88","#00d4aa","#00ffcc","#2affd5","#55ffdd","#80ffe6","#aaffee","#d5fff6","#0b2822","#165044","#217867","#2ca089","#37c8ab","#5fd3bc","#87decd","#afe9dd","#d7f4ee","#1c2422","#374845","#536c67","#6f918a","#93aca7","#b7c8c4","#dbe3e2","#00222b","#004455","#006680","#0088aa","#00aad4","#00ccff","#2ad4ff","#55ddff","#80e5ff","#aaeeff","#d5f6ff","#0b2228","#164450","#216778","#2c89a0","#37abc8","#5fbcd3","#87cdde","#afdde9","#d7eef4","#1c2224","#374548","#53676c","#6f8a91","#93a7ac","#b7c4c8","#dbe2e3","#00112b","#002255","#003380","#0044aa","#0055d4","#0066ff","#2a7fff","#5599ff","#80b3ff","#aaccff","#d5e5ff","#0b1728","#162d50","#214478","#2c5aa0","#3771c8","#5f8dd3","#87aade","#afc6e9","#d7e3f4","#1c1f24","#373e48","#535d6c","#6f7c91","#939dac","#b7bec8","#dbdee3","#00002b","#000055","#000080","#0000aa","#0000d4","#0000ff","#2a2aff","#5555ff","#8080ff","#aaaaff","#d5d5ff","#0b0b28","#161650","#212178","#2c2ca0","#3737c8","#5f5fd3","#8787de","#afafe9","#d7d7f4","#1c1c24","#373748","#53536c","#6f6f91","#9393ac","#b7b7c8","#dbdbe3","#11002b","#220055","#330080","#4400aa","#5500d4","#6600ff","#7f2aff","#9955ff","#b380ff","#ccaaff","#e5d5ff","#170b28","#2d1650","#442178","#5a2ca0","#7137c8","#8d5fd3","#aa87de","#c6afe9","#e3d7f4","#1f1c24","#3e3748","#5d536c","#7c6f91","#9d93ac","#beb7c8","#dedbe3","#22002b","#440055","#660080","#8800aa","#aa00d4","#cc00ff","#d42aff","#dd55ff","#e580ff","#eeaaff","#f6d5ff","#220b28","#441650","#672178","#892ca0","#ab37c8","#bc5fd3","#cd87de","#ddafe9","#eed7f4","#221c24","#453748","#67536c","#8a6f91","#a793ac","#c4b7c8","#e2dbe3","#2b0022","#550044","#800066","#aa0088","#d400aa","#ff00cc","#ff2ad4","#ff55dd","#ff80e5","#ffaaee","#ffd5f6","#280b22","#501644","#782167","#a02c89","#c837ab","#d35fbc","#de87cd","#e9afdd","#f4d7ee","#241c22","#483745","#6c5367","#916f8a","#ac93a7","#c8b7c4","#e3dbe2","#2b0011","#550022","#800033","#aa0044","#d40055","#ff0066","#ff2a7f","#ff5599","#ff80b2","#ffaacc","#ffd5e5","#280b17","#50162d","#782144","#a02c5a","#c83771","#d35f8d","#de87aa","#e9afc6","#f4d7e3","#241c1f","#48373e","#6c535d","#916f7c","#ac939d","#c8b7be","#e3dbde"]
$(document).ready(function(){
+ var canvas = new SvgCanvas(document.getElementById("svgcanvas"));
+
var str = '
'
$.each(palette, function(i,item){
str += '
';
@@ -13,23 +15,23 @@ $(document).ready(function(){
$('#tools_ellipse').css({'left': pos.left+2, 'top': pos.top+2});
$('#stroke_width').change(function(){
- SvgCanvas.setStrokeWidth(this.options[this.selectedIndex].value);
+ canvas.setStrokeWidth(this.options[this.selectedIndex].value);
});
$('#stroke_style').change(function(){
- SvgCanvas.setStrokeStyle(this.options[this.selectedIndex].value);
+ canvas.setStrokeStyle(this.options[this.selectedIndex].value);
});
$('#stroke_opacity').change(function(){
- SvgCanvas.setStrokeOpacity(this.options[this.selectedIndex].value);
+ canvas.setStrokeOpacity(this.options[this.selectedIndex].value);
});
$('#fill_opacity').change(function(){
- SvgCanvas.setFillOpacity(this.options[this.selectedIndex].value);
+ canvas.setFillOpacity(this.options[this.selectedIndex].value);
});
$('#group_opacity').change(function(){
- SvgCanvas.setOpacity(this.options[this.selectedIndex].value);
+ canvas.setOpacity(this.options[this.selectedIndex].value);
});
$('.palette_item').click(function(){
@@ -40,7 +42,7 @@ $(document).ready(function(){
} else {
$('#fill_color').css('background', color);
}
- SvgCanvas.setFillColor(color);
+ canvas.setFillColor(color);
});
$('.palette_item').rightClick(function(){
@@ -51,7 +53,7 @@ $(document).ready(function(){
} else {
$('#stroke_color').css('background', color);
}
- SvgCanvas.setStrokeColor(color);
+ canvas.setStrokeColor(color);
});
// This is a common function used when a tool has been clicked (chosen)
@@ -67,62 +69,62 @@ $(document).ready(function(){
$('#tool_select').click(function(){
toolButtonClick(this);
- SvgCanvas.setMode('select');
+ canvas.setMode('select');
});
$('#tool_path').click(function(){
toolButtonClick(this);
- SvgCanvas.setMode('path');
+ canvas.setMode('path');
});
$('#tool_line').click(function(){
toolButtonClick(this);
- SvgCanvas.setMode('line');
+ canvas.setMode('line');
});
$('#tool_square').click(function(){
toolButtonClick('#tools_rect_show');
- SvgCanvas.setMode('square');
+ canvas.setMode('square');
});
$('#tool_rect').click(function(){
toolButtonClick('#tools_rect_show');
- SvgCanvas.setMode('rect');
+ canvas.setMode('rect');
});
$('#tool_fhrect').click(function(){
toolButtonClick('#tools_rect_show');
- SvgCanvas.setMode('fhrect');
+ canvas.setMode('fhrect');
});
$('#tool_circle').click(function(){
toolButtonClick('#tools_ellipse_show');
- SvgCanvas.setMode('circle');
+ canvas.setMode('circle');
});
$('#tool_ellipse').click(function(){
toolButtonClick('#tools_ellipse_show');
- SvgCanvas.setMode('ellipse');
+ canvas.setMode('ellipse');
});
$('#tool_fhellipse').click(function(){
toolButtonClick('#tools_ellipse_show');
- SvgCanvas.setMode('fhellipse');
+ canvas.setMode('fhellipse');
});
$('#tool_delete').click(function(){
toolButtonClick(this);
- SvgCanvas.setMode('delete');
+ canvas.setMode('delete');
});
$('#tool_clear').click(function(){
if( confirm('Do you want to clear the drawing?') ) {
- SvgCanvas.clear();
+ canvas.clear();
}
});
$('#tool_submit').click(function(){
- SvgCanvas.save();
+ canvas.save();
});
var colorPicker = function(elem) {
@@ -151,9 +153,9 @@ $(document).ready(function(){
}, function(color){
elem.css('background', '#' + this.settings.color.active.hex);
if (elem.attr('id') == 'stroke_color') {
- SvgCanvas.setStrokeColor('#' + this.settings.color.active.hex);
+ canvas.setStrokeColor('#' + this.settings.color.active.hex);
} else if (elem.attr('id') == 'fill_color') {
- SvgCanvas.setFillColor('#' + this.settings.color.active.hex);
+ canvas.setFillColor('#' + this.settings.color.active.hex);
}
$('#color_picker').hide();
}
@@ -161,9 +163,9 @@ $(document).ready(function(){
elem.css('background', oldbg);
if (was_none) {
if (elem.attr('id') == 'stroke_color') {
- SvgCanvas.setStrokeColor('none');
+ canvas.setStrokeColor('none');
} else if (elem.attr('id') == 'fill_color') {
- SvgCanvas.setFillColor('none');
+ canvas.setFillColor('none');
}
}
$('#color_picker').hide();
diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js
index 0bbcde90..299afdeb 100644
--- a/editor/svgcanvas.js
+++ b/editor/svgcanvas.js
@@ -1,19 +1,19 @@
var svgcanvas = null;
-function svgCanvasInit(event) {
- svgcanvas = new SvgCanvas(event.target.ownerDocument);
- svgcanvas.setup(event);
- parent.SvgCanvas = svgcanvas;
-}
-
-function SvgCanvas(doc)
+function SvgCanvas(c)
{
// private members
-
- var svgdoc = doc;
- var svgroot = svgdoc.documentElement;
+ var container = c;
var svgns = "http://www.w3.org/2000/svg";
+
+ var svgdoc = c.ownerDocument;
+ var svgroot = svgdoc.createElementNS(svgns, "svg");
+ svgroot.setAttribute("width",640);
+ svgroot.setAttribute("height",480);
+ svgroot.setAttributeNS(null,"id","svgroot");
+ container.appendChild(svgroot);
+
var d_attr = null;
var started = false;
var obj_num = 1;
@@ -72,7 +72,7 @@ function SvgCanvas(doc)
var shape = svgdoc.createElementNS(svgns, data.element);
assignAttributes(shape, data.attr);
cleanupElement(shape);
- svgdoc.documentElement.appendChild(shape);
+ svgroot.appendChild(shape);
return shape;
}
@@ -120,10 +120,10 @@ function SvgCanvas(doc)
// public events
- this.mouseDown = function(evt)
+ var mouseDown = function(evt)
{
- var x = evt.pageX;
- var y = evt.pageY;
+ var x = evt.pageX - container.offsetLeft;
+ var y = evt.pageY - container.offsetTop;
switch (current_mode) {
case "select":
started = true;
@@ -258,12 +258,11 @@ function SvgCanvas(doc)
}
}
- this.mouseMove = function(evt)
+ var mouseMove = function(evt)
{
if (!started) return;
-
- var x = evt.pageX;
- var y = evt.pageY;
+ var x = evt.pageX - container.offsetLeft;
+ var y = evt.pageY - container.offsetTop;
var shape = svgdoc.getElementById(getId());
switch (current_mode)
{
@@ -311,7 +310,7 @@ function SvgCanvas(doc)
}
}
- this.mouseUp = function(evt)
+ var mouseUp = function()
{
if (!started) return;
@@ -496,13 +495,9 @@ function SvgCanvas(doc)
events[event] = f;
}
- this.setup = function(evt) {
- assignAttributes(svgroot, {
- "onmouseup": "svgcanvas.mouseUp(evt)",
- "onmousedown": "svgcanvas.mouseDown(evt)",
- "onmousemove": "svgcanvas.mouseMove(evt)"
- });
- }
+ $(container).mouseup(mouseUp);
+ $(container).mousedown(mouseDown);
+ $(container).mousemove(mouseMove);
this.saveHandler = function(svg) {
alert(svg);