From d5ec300b6b5c4d6aec4cffd17de43077b91f11ce Mon Sep 17 00:00:00 2001
From: Jeff Schiller <codedread@gmail.com>
Date: Sat, 6 Feb 2010 17:42:54 +0000
Subject: [PATCH] Add foreignObject to whitelist. Fix some HTML5 validation
 errors

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1352 eee81c28-f429-11dd-99c0-75d572ba1ddd
---
 editor/svg-editor.html | 8 ++++----
 editor/svgcanvas.js    | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/editor/svg-editor.html b/editor/svg-editor.html
index c2fa6738..71f14dd7 100644
--- a/editor/svg-editor.html
+++ b/editor/svg-editor.html
@@ -231,7 +231,7 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
 
 	<div id="image_panel">
 	<div class="toolset">
-		<label id="iwidthLabel"><span id="iwidthLabel">width:</span>
+		<label><span id="iwidthLabel">width:</span>
 		<input id="image_width" class="attr_changer" title="Change image width" size="3" data-attr="width"/>
 		</label>
 		<label><span id="iheightLabel">height:</span>
@@ -242,7 +242,7 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
 		<label id="tool_image_url">url:
 			<input id="image_url" type="text" title="Change URL" size="35"/>
 			<button id="change_image_url" style="display:none;">Change Image</button>
-			<div id="url_notice" title="NOTE: This image cannot be embedded. It will depend on this path to be displayed"></div>
+			<span id="url_notice" title="NOTE: This image cannot be embedded. It will depend on this path to be displayed"></span>
 		</label>
 	</div>
   </div>
@@ -335,7 +335,7 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
 		<label id="tool_node_x">x:
 			<input id="path_node_x" class="attr_changer" title="Change node's x coordinate" size="3" data-attr="x"/>
 		</label>
-		<label id="tool_node_y">y:</label>
+		<label id="tool_node_y">y:
 			<input id="path_node_y" class="attr_changer" title="Change node's y coordinate" size="3" data-attr="y"/>
 		</label>
 		<select id="seg_type" title="Change Segment type">
@@ -525,7 +525,7 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
 					<option id="lang_hi" value="hi">&#2361;&#2367;&#2344;&#2381;&#2342;&#2368;, &#2361;&#2367;&#2306;&#2342;&#2368;</option>
 					<option id="lang_nl" value="nl">Nederlands</option>
 					<option id="lang_ro" value="ro">Româneşte</option>
-					<option id="lang_ro" value="ru">Русский</option>
+					<option id="lang_ru" value="ru">Русский</option>
 					<option id="lang_sk" value="sk">Slovenčina</option>
 					<option id="lang_zh-TW" value="zh-TW">繁體中文</option>
 				</select>
diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js
index 01160b3d..d2135dfe 100644
--- a/editor/svgcanvas.js
+++ b/editor/svgcanvas.js
@@ -36,6 +36,7 @@ var isOpera = !!window.opera,
 	"ellipse": ["class", "clip-path", "clip-rule", "cx", "cy", "fill", "fill-opacity", "fill-rule", "filter", "id", "mask", "opacity", "requiredFeatures", "rx", "ry", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform"],
 	"feGaussianBlur": ["class", "id", "requiredFeatures", "stdDeviation"],
 	"filter": ["class", "filterRes", "filterUnits", "height", "id", "primitiveUnits", "requiredFeatures", "width", "x", "xlink:href", "y"],
+	"foreignObject": ["class", "height", "id", "requiredFeatures", "style", "width", "x", "y"],
 	"g": ["class", "clip-path", "clip-rule", "id", "display", "fill", "fill-opacity", "fill-rule", "filter", "mask", "opacity", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform"],
 	"image": ["class", "clip-path", "clip-rule", "filter", "height", "id", "mask", "opacity", "requiredFeatures", "style", "systemLanguage", "transform", "width", "x", "xlink:href", "xlink:title", "y"],
 	"line": ["class", "clip-path", "clip-rule", "fill", "fill-opacity", "fill-rule", "filter", "id", "marker-end", "marker-mid", "marker-start", "mask", "opacity", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform", "x1", "x2", "y1", "y2"],