zcy
/
svgedit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
Jeff Schiller 2009-07-14 12:52:39 +00:00
parent 35092be25d
commit 9c841384bd
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/svg-editor.css
View File

@ -191,6 +191,10 @@ div.color_block {
padding: 2px; padding: 2px;
} }
#svg_editor #paint_picker {
display: none;
}
#svg_editor #color_picker { #svg_editor #color_picker {
position: absolute; position: absolute;
display: none; display: none;

7
editor/svg-editor.html
View File

@ -3,15 +3,16 @@
<head> <head>
<link rel="stylesheet" href="jpicker/jpicker.css" type="text/css"/> <link rel="stylesheet" href="jpicker/jpicker.css" type="text/css"/>
<link rel="stylesheet" href="svg-editor.css" type="text/css"/> <link rel="stylesheet" href="svg-editor.css" type="text/css"/>
<!--link rel="stylesheet" href="svg-editor.min.css" type="text/css"/-->
<link rel="stylesheet" href="spinbtn/JQuerySpinBtn.css" type="text/css"/> <link rel="stylesheet" href="spinbtn/JQuerySpinBtn.css" type="text/css"/>
<!--link rel="stylesheet" href="spinbtn/JQuerySpinBtn.min.css" type="text/css"/--> <link rel="stylesheet" href="jgraduate/jgraduate.css" type="text/css"/>
<script type="text/javascript" src="jquery.js"></script> <script type="text/javascript" src="jquery.js"></script>
<!--script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3/jquery.min.js"></script--> <!--script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3/jquery.min.js"></script-->
<script type="text/javascript" src="js-hotkeys/jquery.hotkeys.min.js"></script> <script type="text/javascript" src="js-hotkeys/jquery.hotkeys.min.js"></script>
<script type="text/javascript" src="jpicker/jpicker.js"></script> <script type="text/javascript" src="jpicker/jpicker.js"></script>
<script type="text/javascript" src="spinbtn/JQuerySpinBtn.js"></script> <script type="text/javascript" src="spinbtn/JQuerySpinBtn.js"></script>
<!--script type="text/javascript" src="spinbtn/JQuerySpinBtn.min.js"></script--> <!--script type="text/javascript" src="spinbtn/JQuerySpinBtn.min.js"></script-->
<script type="text/javascript" src="jgraduate/jquery.jgraduate.js"></script>
<!--script type="text/javascript" src="jgraduate/jquery.jgraduate.min.js"></script-->
<script type="text/javascript" src="svgcanvas.js"></script> <script type="text/javascript" src="svgcanvas.js"></script>
<!--script type="text/javascript" src="svgcanvas.min.js"></script--> <!--script type="text/javascript" src="svgcanvas.min.js"></script-->
<script type="text/javascript" src="svg-editor.js"></script> <script type="text/javascript" src="svg-editor.js"></script>
@ -205,6 +206,8 @@
</div> </div>
<!-- hidden divs --> <!-- hidden divs -->
<div id="paint_picker">
</div>
<div id="color_picker"></div> <div id="color_picker"></div>

1
editor/svgcanvas.js
View File

@ -8,6 +8,7 @@ if(!window.console) {
// this defines which elements and attributes that we support // this defines which elements and attributes that we support
var svgWhiteList = { var svgWhiteList = {
"circle": ["cx", "cy", "fill", "fill-opacity", "id", "stroke", "r", "stroke-opacity", "stroke-width", "stroke-dasharray"], "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"], "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"], "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"], "path": ["d", "fill", "fill-opacity", "id", "stroke", "stroke-opacity", "stroke-width", "stroke-dasharray"],