deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2010-05-23 23:23:50 -05:00
parent f7b2a40cf6 6677b46cb4
commit 3745e4d669
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/sanitizer.rb
View file

@ -12,7 +12,7 @@ module Sanitizer
acceptable_elements = Set.new %w[a abbr acronym address area article aside acceptable_elements = Set.new %w[a abbr acronym address area article aside
audio b big blockquote br button canvas caption center cite code audio b big blockquote br button canvas caption center cite code
col colgroup command dd del details dfn dialog dir div dl dt col colgroup command datalist dd del details dfn dialog dir div dl dt
em fieldset figcaption figure font footer form h1 h2 h3 h4 h5 h6 header em fieldset figcaption figure font footer form h1 h2 h3 h4 h5 h6 header
hgroup hr i img input ins kbd label legend li map mark menu meter nav hgroup hr i img input ins kbd label legend li map mark menu meter nav
ol optgroup option p pre progress q rp rt ruby s samp section select small ol optgroup option p pre progress q rp rt ruby s samp section select small
@ -30,13 +30,14 @@ module Sanitizer
line marker mask metadata missing-glyph mpath path pattern polygon line marker mask metadata missing-glyph mpath path pattern polygon
polyline radialGradient rect set stop svg switch text textPath title tspan use] polyline radialGradient rect set stop svg switch text textPath title tspan use]
acceptable_attributes = Set.new %w[accept accept-charset accesskey action acceptable_attributes = Set.new %w[abbr accept accept-charset accesskey action
align alt autocomplete axis border cellpadding cellspacing char charoff align alt autocomplete axis bgcolor border cellpadding cellspacing char charoff
checked cite class clear cols colspan color compact contenteditable contextmenu checked cite class clear cols colspan color compact contenteditable contextmenu
controls coords datetime dir disabled draggable enctype for formaction frame controls coords datetime dir disabled draggable enctype face for formaction frame
headers height href hreflang hspace icon id ismap label lang longdesc loop low headers height high href hreflang hspace icon id ismap label list lang longdesc
max maxlength media method min multiple name nohref open optimum pattern placeholder loop low max maxlength media method min multiple name nohref noshade nowrap open
poster preload pubdate readonly rel required reversed rows rowspan spellcheck scope optimumpattern placeholder poster preload pubdate radiogroup readonly rel
required rev reversed rows rowspan rules spellcheck scope
selected shape size span src start step style summary tabindex target title selected shape size span src start step style summary tabindex target title
type usemap valign value vspace width wrap xml:lang] type usemap valign value vspace width wrap xml:lang]

5
public/svg-edit/editor/svgcanvas.js
View file

@ -1,4 +1,4 @@
/* /*
* svgcanvas.js * svgcanvas.js
* *
* Licensed under the Apache License, Version 2 * Licensed under the Apache License, Version 2
@ -1202,7 +1202,8 @@ function BatchCommand(text) {
(function() { (function() {
// TODO: make this string optional and set by the client // TODO: make this string optional and set by the client
var comment = svgdoc.createComment(" Created with SVG-edit - http://svg-edit.googlecode.com/ "); var comment = svgdoc.createComment(" Created with SVG-edit - http://svg-edit.googlecode.com/ ");
svgcontent.appendChild(comment); // Lead to invalid content with Instiki's Sanitizer
// svgcontent.appendChild(comment);
// TODO For Issue 208: this is a start on a thumbnail // TODO For Issue 208: this is a start on a thumbnail
// var svgthumb = svgdoc.createElementNS(svgns, "use"); // var svgthumb = svgdoc.createElementNS(svgns, "use");