sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

Ox.parseHTML -> Ox.sanitizeHTML, Ox.encodeHTML -> Ox.encodeHTMLEntities, Ox.decodeHTML -> Ox.decodeHTMLEntities

Browse source
This commit is contained in:
rolux 2012-05-27 12:40:02 +02:00
commit c41afd2f5d
9 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/Ox.UI/js/Code/Ox.DocPage.js
View file

@ -88,7 +88,7 @@ Ox.DocPage = function(options, self) {
'<code><b>' + (name || item.name) + '</b> '
+ '&lt;' + item.types.join('&gt;</code> or <code>&lt;') + '&gt; </code>'
+ (item['default'] ? '(default: <code>' + item['default'] + '</code>) ' : '')
+ Ox.parseHTML(item.summary)
+ Ox.sanitizeHTML(item.summary)
)
];
[
@ -105,7 +105,7 @@ Ox.DocPage = function(options, self) {
marginTop: (level ? 0 : 8) + 'px',
marginLeft: (level * 32) + 'px'
})
.html(Ox.parseHTML(item.description))
.html(Ox.sanitizeHTML(item.description))
);
} else {
$elements.push($('<div>')
@ -160,7 +160,7 @@ Ox.DocPage = function(options, self) {
.css({marginLeft: (level * 32 + 16) + 'px'})
.html(
'<code><b>&gt;&nbsp;'
+ Ox.encodeHTML(example.statement)
+ Ox.encodeHTMLEntities(example.statement)
.replace(/ /g, '&nbsp;')
.replace(/\n/g, '<br/>\n&nbsp;&nbsp;')
+ '</b></code>'
@ -170,7 +170,7 @@ Ox.DocPage = function(options, self) {
.addClass(className)
.css({marginLeft: (level * 32 + 16) + 'px'})
.html(
'<code>' + Ox.encodeHTML(example.result) + '</code>'
'<code>' + Ox.encodeHTMLEntities(example.result) + '</code>'
)
)
});

2
source/Ox.UI/js/Code/Ox.SyntaxHighlighter.js
View file

@ -71,7 +71,7 @@ Ox.SyntaxHighlighter = function(options, self) {
}
}
source += '<span class="' + classNames + '">' +
Ox.encodeHTML(token.value)
Ox.encodeHTMLEntities(token.value)
.replace(/ /g, whitespace)
.replace(/\t/g, tab)
.replace(/\n/g, linebreak) + '</span>';