From 4b45e56ddad4d3330eecabb74c527dc3e946cc40 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Tue, 2 Jun 2009 11:09:49 +0000
Subject: [PATCH] rename canvas to svgcanvas to avoid confusion

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@15 eee81c28-f429-11dd-99c0-75d572ba1ddd
---
 svg-editor.html             |  4 ++--
 svg-editor.js               |  1 +
 canvas.js => svgcanvas.js   | 14 +++++++-------
 canvas.svg => svgcanvas.svg |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)
 rename canvas.js => svgcanvas.js (97%)
 rename canvas.svg => svgcanvas.svg (84%)

diff --git a/svg-editor.html b/svg-editor.html
index f9c858b3..01b5d9f6 100644
--- a/svg-editor.html
+++ b/svg-editor.html
@@ -58,8 +58,8 @@
 <div id="workarea">
 
 <div id="canvas">
-<object class="canvas" data="canvas.svg" type="image/svg+xml">
-<embed class="canvas" src="canvas.svg" type="image/svg+xml" />
+<object class="canvas" data="svgcanvas.svg" type="image/svg+xml">
+<embed class="canvas" src="svgcanvas.svg" type="image/svg+xml" />
 </object>
 </div>
 
diff --git a/svg-editor.js b/svg-editor.js
index c6e0ba04..dfd3980b 100644
--- a/svg-editor.js
+++ b/svg-editor.js
@@ -35,6 +35,7 @@ $(document).ready(function(){
 			$('#stroke_color').css('background', color);
 		}
 		SvgCanvas.setStrokeColor(color);
+		alert('boo');
 	});
 
 	$('#tool_select').click(function(){
diff --git a/canvas.js b/svgcanvas.js
similarity index 97%
rename from canvas.js
rename to svgcanvas.js
index 94266b97..185a2325 100644
--- a/canvas.js
+++ b/svgcanvas.js
@@ -1,9 +1,9 @@
-var canvas = null;
+var svgcanvas = null;
 
 function svgCanvasInit(event) {
-	canvas = new SvgCanvas(event.target.ownerDocument);
-	canvas.setup(event);
-	top.SvgCanvas = canvas;
+	svgcanvas = new SvgCanvas(event.target.ownerDocument);
+	svgcanvas.setup(event);
+	top.SvgCanvas = svgcanvas;
 }
 
 function SvgCanvas(doc)
@@ -449,9 +449,9 @@ function SvgCanvas(doc)
 
 	this.setup = function(evt) {
 		assignAttributes(svgroot, {
-			"onmouseup":   "canvas.mouseUp(evt)",
-			"onmousedown": "canvas.mouseDown(evt)",
-			"onmousemove": "canvas.mouseMove(evt)"
+			"onmouseup":   "svgcanvas.mouseUp(evt)",
+			"onmousedown": "svgcanvas.mouseDown(evt)",
+			"onmousemove": "svgcanvas.mouseMove(evt)"
 		});
 	}
 
diff --git a/canvas.svg b/svgcanvas.svg
similarity index 84%
rename from canvas.svg
rename to svgcanvas.svg
index 6aacb8df..b8b996b5 100644
--- a/canvas.svg
+++ b/svgcanvas.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xml:space="preserve" id="svg_image" onload="svgCanvasInit(evt)" width="100%" height="100%" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<script xlink:href="canvas.js" type="text/ecmascript"/>
+<script xlink:href="svgcanvas.js" type="text/ecmascript"/>
 </svg>