diff options
| author | Misko Hevery | 2011-01-19 12:16:21 -0800 |
|---|---|---|
| committer | Misko Hevery | 2011-01-24 14:23:51 -0800 |
| commit | d8acfe738906c2cb9755f7a872ea7ff22f8cdd51 (patch) | |
| tree | 3484afac8e7969b3fe506f8baf919720bb5ec89d /docs | |
| parent | b036c0bc58e186e4180df48be923e3c9b96af57d (diff) | |
| download | angular.js-d8acfe738906c2cb9755f7a872ea7ff22f8cdd51.tar.bz2 | |
add @this and @exampleDescription tags
(also removed markdownNoP, now done through CSS)
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/spec/domSpec.js | 15 | ||||
| -rw-r--r-- | docs/spec/ngdocSpec.js | 7 | ||||
| -rw-r--r-- | docs/src/dom.js | 4 |
3 files changed, 22 insertions, 4 deletions
diff --git a/docs/spec/domSpec.js b/docs/spec/domSpec.js index af1a8faa..58063789 100644 --- a/docs/spec/domSpec.js +++ b/docs/spec/domSpec.js @@ -5,13 +5,24 @@ describe('dom', function(){ it('should render code, live, test', function(){ var dom = new DOM(); dom.example('desc', 'src', 'scenario'); - expect(dom.toString()).toEqual('<h1>Example</h1>\ndesc<doc:example><doc:source>src</doc:source>\n<doc:scenario>scenario</doc:scenario>\n</doc:example>\n'); + expect(dom.toString()).toEqual( + '<h1>Example</h1>\n' + + '<div class="example">' + + 'desc<doc:example><doc:source>src</doc:source>\n' + + '<doc:scenario>scenario</doc:scenario>\n'+ + '</doc:example>\n' + + '</div>\n'); }); it('should render non-live, test with description', function(){ var dom = new DOM(); dom.example('desc', 'src', false); - expect(dom.toString()).toEqual('<h1>Example</h1>\ndesc<div ng:non-bindable=""><pre class="brush: js; html-script: true;">src</pre>\n</div>\n'); + expect(dom.toString()).toEqual('<h1>Example</h1>\n' + + '<div class="example">' + + 'desc<div ng:non-bindable="">' + + '<pre class="brush: js; html-script: true;">src</pre>\n' + + '</div>\n' + + '</div>\n'); }); it('should render non-live, test', function(){ diff --git a/docs/spec/ngdocSpec.js b/docs/spec/ngdocSpec.js index 2bea6e9a..8f57e329 100644 --- a/docs/spec/ngdocSpec.js +++ b/docs/spec/ngdocSpec.js @@ -304,7 +304,12 @@ describe('ngdoc', function(){ var doc = new Doc('@this I am self.'); doc.ngdoc = 'filter'; doc.parse(); - expect(doc.html()).toContain('<h3>Method\'s <code>this</code></h3>\n<p>I am self.</p>'); + expect(doc.html()).toContain('<h3>Method\'s <code>this</code></h3>\n' + + '<div>' + + '<p>I am self.</p>' + + '</div>\n'); + expect(doc.html()).toContain('<h3>Method\'s <code>this</code></h3>\n' + + '<div><p>I am self.</p></div>'); }); }); }); diff --git a/docs/src/dom.js b/docs/src/dom.js index d7c2a157..fedd4e19 100644 --- a/docs/src/dom.js +++ b/docs/src/dom.js @@ -82,7 +82,9 @@ DOM.prototype = { if (content==undefined || content && content.legth == 0) return; this.tag('h' + this.headingDepth, heading); this.headingDepth++; - var className = {'class': heading.toLowerCase()}; + var className = typeof heading == 'string' + ? {'class': heading.toLowerCase().replace(/[^\d\w_]/, '-')} + : null; if (content instanceof Array) { this.ul(content, className, fn); } else if (fn) { |
