From 9c841384bdf68b414cc3f1ad2d49ca6d3ffba46a Mon Sep 17 00:00:00 2001 From: Jeff Schiller Date: Tue, 14 Jul 2009 12:52:39 +0000 Subject: [PATCH] Add empty paint_picker div. Also add defs to the whitelist git-svn-id: http://svg-edit.googlecode.com/svn/trunk@325 eee81c28-f429-11dd-99c0-75d572ba1ddd --- editor/svg-editor.css | 4 ++++ editor/svg-editor.html | 7 +++++-- editor/svgcanvas.js | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/editor/svg-editor.css b/editor/svg-editor.css index 64bff8e5..412854a7 100644 --- a/editor/svg-editor.css +++ b/editor/svg-editor.css @@ -191,6 +191,10 @@ div.color_block { padding: 2px; } +#svg_editor #paint_picker { + display: none; +} + #svg_editor #color_picker { position: absolute; display: none; diff --git a/editor/svg-editor.html b/editor/svg-editor.html index 83687046..58f0f221 100644 --- a/editor/svg-editor.html +++ b/editor/svg-editor.html @@ -3,15 +3,16 @@ - - + + + @@ -205,6 +206,8 @@ +
+
diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js index 010d7104..bf234c81 100644 --- a/editor/svgcanvas.js +++ b/editor/svgcanvas.js @@ -8,6 +8,7 @@ if(!window.console) { // this defines which elements and attributes that we support var svgWhiteList = { "circle": ["cx", "cy", "fill", "fill-opacity", "id", "stroke", "r", "stroke-opacity", "stroke-width", "stroke-dasharray"], + "defs": [], "ellipse": ["cx", "cy", "fill", "fill-opacity", "id", "stroke", "rx", "ry", "stroke-opacity", "stroke-width", "stroke-dasharray"], "line": ["fill", "fill-opacity", "id", "stroke", "stroke-opacity", "stroke-width", "stroke-dasharray", "x1", "x2", "y1", "y2"], "path": ["d", "fill", "fill-opacity", "id", "stroke", "stroke-opacity", "stroke-width", "stroke-dasharray"],