aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisko Hevery<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <script type="text/javascript" src="../lib/jquery/jquery-1.4.2.js"></script> <script type="text/javascript" src="../angular-minified.js"></script> <scrip
-rw-r--r--docs/spec/ngdocSpec.js8
-rw-r--r--docs/src/ngdoc.js7
2 files changed, 10 insertions, 5 deletions
diff --git a/docs/spec/ngdocSpec.js b/docs/spec/ngdocSpec.js
index 46b05aef..68d3700f 100644
--- a/docs/spec/ngdocSpec.js
+++ b/docs/spec/ngdocSpec.js
@@ -307,10 +307,10 @@ describe('ngdoc', function(){
describe('@description', function(){
it('should support pre blocks', function(){
- var doc = new Doc("@description <pre>abc</pre>");
+ var doc = new Doc("@description <pre><b>abc</b></pre>");
doc.parse();
expect(doc.description).
- toBe('<div ng:non-bindable><pre class="brush: js; html-script: true;">abc</pre></div>');
+ toBe('<div ng:non-bindable><pre class="brush: js; h
generated by cgit v1.2.3 (git 2.25.1) at 2026-11-11 05:10:52 +0000
ibe('ngdoc', function(){
doc.parse();
expect(doc.description).
toBe('<p>foo </p>' +
- '<div ng:non-bindable><pre class="brush: js; html-script: true;">abc</pre></div>' +
+ '<div ng:non-bindable><pre class="brush: js;">abc</pre></div>' +
'<h1>bah</h1>\n\n' +
'<p>foo </p>' +
- '<div ng:non-bindable><pre class="brush: js; html-script: true;">cba</pre></div>');
+ '<div ng:non-bindable><pre class="brush: js;">cba</pre></div>');
});
diff --git a/docs/src/ngdoc.js b/docs/src/ngdoc.js
index 875b24df..57202809 100644
--- a/docs/src/ngdoc.js
+++ b/docs/src/ngdoc.js
@@ -70,7 +70,12 @@ Doc.prototype = {
parts.forEach(function(text, i){
if (text.match(/^<pre>/)) {
text = text.replace(/^<pre>([\s\S]*)<\/pre>/mi, function(_, content){
- return '<div ng:non-bindable><pre class="brush: js; html-script: true;">' +
+ var clazz = 'brush: js;'
+ if (content.match(/\<\w/)) {
+ // we are HTML
+ clazz += ' html-script: true;';
+ }
+ return '<div ng:non-bindable><pre class="' + clazz +'">' +
content.replace(/</g, '&lt;').replace(/>/g, '&gt;') +
'</pre></div>';
});
generated by cgit v1.2.3 (git 2.25.1) at 2026-11-11 05:10:52 +0000