diff options
| author | Di Peng | 2011-08-19 12:06:59 -0700 |
|---|---|---|
| committer | Igor Minar | 2011-08-19 15:27:21 -0700 |
| commit | 774db0aecb85f9ae79895046b62ea4c45bad8bff (patch) | |
| tree | 21f74df17b91a3b8998bec350f6d24b1ccd296b1 /docs/src | |
| parent | dc0b0c77c7ba3e419442ec639356ab5d3ba7efbe (diff) | |
| download | angular.js-774db0aecb85f9ae79895046b62ea4c45bad8bff.tar.bz2 | |
fix(sample): Fix for jsFiddle integration
Diffstat (limited to 'docs/src')
| -rw-r--r-- | docs/src/ngdoc.js | 8 | ||||
| -rw-r--r-- | docs/src/templates/doc_widgets.js | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/docs/src/ngdoc.js b/docs/src/ngdoc.js index 91c4662a..8fcf3cd5 100644 --- a/docs/src/ngdoc.js +++ b/docs/src/ngdoc.js @@ -111,9 +111,11 @@ Doc.prototype = { '</pre></div>'; }); } else if (isDocWidget('example')) { - text = text.replace(/(<doc:source>)([\s\S]*)(<\/doc:source>)/mi, - function(_, before, content, after){ - return '<pre class="doc-source">' + htmlEscape(content) + '</pre>'; + text = text.replace(/<doc:source(\s+jsfiddle="[^"]+")?>([\s\S]*)<\/doc:source>/mi, + function(_, jsfiddle, content){ + return '<pre class="doc-source"' + (jsfiddle || '') +'>' + + htmlEscape(content) + + '</pre>'; }); text = text.replace(/(<doc:scenario>)([\s\S]*)(<\/doc:scenario>)/mi, function(_, before, content, after){ diff --git a/docs/src/templates/doc_widgets.js b/docs/src/templates/doc_widgets.js index 31600ccc..a5579720 100644 --- a/docs/src/templates/doc_widgets.js +++ b/docs/src/templates/doc_widgets.js @@ -28,7 +28,7 @@ //jqlite instead. jqlite's find() method currently supports onlt getElementsByTagName! var example = element.find('pre').eq(0), //doc-source exampleSrc = example.text(), - jsfiddle = element.find('doc:source').attr('jsfiddle') || true, + jsfiddle = example.attr('jsfiddle') || true, scenario = element.find('pre').eq(1); //doc-scenario var code = indent(exampleSrc); |
