chore(ngdocs): replace showdown.js with marked.js

1 files changed, 39 insertions, 40 deletions

diff --git a/docs/spec/ngdocSpec.js b/docs/spec/ngdocSpec.js
index 128e0106..607745d8 100644
--- a/docs/spec/ngdocSpec.js
+++ b/docs/spec/ngdocSpec.js
@@ -59,10 +59,10 @@ describe('ngdoc', function() {
             '@param {function(number, string=)} d fn with optional arguments');
         doc.parse();
         expect(doc.param).toEqual([
-           {name:'a', description:'<div class="a-page"><p>short</p></div>', type:'*', optional:false, 'default':undefined},
-           {name:'b', description:'<div class="a-page"><p>med</p></div>', type:'Type', optional:false, 'default':undefined},
-           {name:'c', description:'<div class="a-page"><p>long\nline</p></div>', type:'Class', optional:true, 'default':'2'},
-           {name:'d', description:'<div class="a-page"><p>fn with optional arguments</p></div>',
+           {name:'a', description:'<div class="a-page"><p>short</p>\n</div>', type:'*', optional:false, 'default':undefined},
+           {name:'b', description:'<div class="a-page"><p>med</p>\n</div>', type:'Type', optional:false, 'default':undefined},
+           {name:'c', description:'<div class="a-page"><p>long\nline</p>\n</div>', type:'Class', optional:true, 'default':'2'},
+           {name:'d', description:'<div class="a-page"><p>fn with optional arguments</p>\n</div>',
              type: 'function(number, string=)', optional: false, 'default':undefined}
          ]);
       });
@@ -72,7 +72,7 @@ describe('ngdoc', function() {
         doc.parse();
         expect(doc.returns).toEqual({
           type: 'Type',
-          description: '<div class="a-page"><p>text <em>bold</em>.</p></div>'
+          description: '<div class="a-page"><p>text <em>bold</em>.</p>\n</div>'
         });
       });
 
@@ -142,26 +142,26 @@ describe('ngdoc', function() {
             '<pre class="prettyprint linenums">\n' +
             '&lt;b&gt;angular&lt;/b&gt;.k\n' +
             '</pre>\n' +
-            ' asdf x</p></div>');
+            ' asdf x</p>\n</div>');
     });
 
     it('should wrap everything inside a container tag', function() {
       var doc = new Doc('@name superman').parse();
       var content = doc.markdown('hello');
 
-      expect(content).toMatch('<div class="superman-page"><p>hello</p></div>');
+      expect(content).toMatch('<div class="superman-page"><p>hello</p>\n</div>');
     });
 
     it('should use the content before a colon as the name prefix for the className of the tag container', function() {
       var doc = new Doc('@name super: man').parse();
       var content = doc.markdown('hello');
 
-      expect(content).toMatch('<div class="super-page super-man-page"><p>hello</p></div>');
+      expect(content).toMatch('<div class="super-page super-man-page"><p>hello</p>\n</div>');
     });
 
     it('should replace text between two <pre></pre> tags', function() {
       expect(new Doc().markdown('<pre>x</pre>\n# One\n<pre>b</pre>')).
-        toMatch('</pre>\n\n<h1 id="one">One</h1>\n\n<pre');
+        toMatch('</pre>\n<h1>One</h1>\n<pre');
     });
 
     it('should replace inline variable type hints', function() {
@@ -171,16 +171,16 @@ describe('ngdoc', function() {
 
     it('should ignore nested doc widgets', function() {
       expect(new Doc().markdown(
-        'before<div class="tabbable">\n' +
+        'before\n<div class="tabbable">\n' +
           '<div class="tab-pane well" id="git-mac" ng:model="Git on Mac/Linux">' +
-          '\ngit bla bla\n</doc:tutorial-instruction>\n' +
-        '</doc:tutorial-instructions>')).toEqual(
+          '\ngit bla bla\n</div>\n' +
+        '</div>')).toEqual(
 
-        '<div class="docs-page"><p>before<div class="tabbable">\n' +
+        '<div class="docs-page"><p>before</p>\n<div class="tabbable">\n' +
           '<div class="tab-pane well" id="git-mac" ng:model="Git on Mac/Linux">\n' +
           'git bla bla\n' +
-          '</doc:tutorial-instruction>\n' +
-        '</doc:tutorial-instructions></p></div>');
+          '</div>\n' +
+        '</div></div>');
       });
 
     it('should unindent text before processing based on the second line', function() {
@@ -190,10 +190,10 @@ describe('ngdoc', function() {
                                 '        fourth line\n\n' +
                                 '   fifth line')).
         toMatch('<p>first line\n' +
-                'second line</p>\n\n' +
+                'second line</p>\n' +
                 '<pre><code>third line\n' +
-                ' fourth line\n</code></pre>\n\n' +
-                '<p>fifth line</p>');
+                ' fourth line</code></pre>\n' +
+                '<p>fifth line</p>\n');
     });
 
     it('should unindent text before processing based on the first line', function() {
@@ -202,11 +202,11 @@ describe('ngdoc', function() {
                                 '       third line\n' +
                                 '        fourth line\n\n' +
                                 '   fifth line')).
-        toMatch('<p>first line</p>\n\n' +
+        toMatch('<div class="docs-page"><p>first line</p>\n' +
                 '<pre><code>second line\n' +
                 'third line\n' +
-                ' fourth line\n</code></pre>\n\n' +
-                '<p>fifth line</p>');
+                ' fourth line</code></pre>\n' +
+                '<p>fifth line</p>\n</div>');
     });
 
 
@@ -304,7 +304,7 @@ describe('ngdoc', function() {
           name : 'number',
           optional: false,
           'default' : undefined,
-          description : '<div class="a-page"><p>Number \nto format.</p></div>' }]);
+          description : '<div class="a-page"><p>Number \nto format.</p>\n</div>' }]);
       });
 
       it('should parse with default and optional', function() {
@@ -315,7 +315,7 @@ describe('ngdoc', function() {
           name : 'fractionSize',
           optional: true,
           'default' : '2',
-          description : '<div class="a-page"><p>desc</p></div>' }]);
+          description : '<div class="a-page"><p>desc</p>\n</div>' }]);
       });
     });
 
@@ -325,8 +325,8 @@ describe('ngdoc', function() {
         doc.ngdoc = 'service';
         doc.parse();
         expect(doc.requires).toEqual([
-          {name:'$service', text:'<div class="a-page"><p>for \n<code>A</code></p></div>'},
-          {name:'$another', text:'<div class="a-page"><p>for <code>B</code></p></div>'}]);
+          {name:'$service', text:'<div class="a-page"><p>for \n<code>A</code></p>\n</div>'},
+          {name:'$another', text:'<div class="a-page"><p>for <code>B</code></p>\n</div>'}]);
         expect(doc.html()).toContain('<a href="api/ng.$service">$service</a>');
         expect(doc.html()).toContain('<a href="api/ng.$another">$another</a>');
         expect(doc.html()).toContain('<p>for \n<code>A</code></p>');
@@ -378,7 +378,7 @@ describe('ngdoc', function() {
         var doc = new Doc("@name a\n@property {string} name desc rip tion");
         doc.parse();
         expect(doc.properties[0].name).toEqual('name');
-        expect(doc.properties[0].description).toEqual('<div class="a-page"><p>desc rip tion</p></div>');
+        expect(doc.properties[0].description).toEqual('<div class="a-page"><p>desc rip tion</p>\n</div>');
       });
 
       it('should parse @property with type and description both', function() {
@@ -386,7 +386,7 @@ describe('ngdoc', function() {
         doc.parse();
         expect(doc.properties[0].name).toEqual('name');
         expect(doc.properties[0].type).toEqual('bool');
-        expect(doc.properties[0].description).toEqual('<div class="a-page"><p>desc rip tion</p></div>');
+        expect(doc.properties[0].description).toEqual('<div class="a-page"><p>desc rip tion</p>\n</div>');
       });
 
     });
@@ -409,26 +409,26 @@ describe('ngdoc', function() {
       it('should parse @returns with type and description', function() {
         var doc = new Doc("@name a\n@returns {string} descrip tion");
         doc.parse();
-        expect(doc.returns).toEqual({type: 'string', description: '<div class="a-page"><p>descrip tion</p></div>'});
+        expect(doc.returns).toEqual({type: 'string', description: '<div class="a-page"><p>descrip tion</p>\n</div>'});
       });
 
       it('should parse @returns with complex type and description', function() {
         var doc = new Doc("@name a\n@returns {function(string, number=)} description");
         doc.parse();
-        expect(doc.returns).toEqual({type: 'function(string, number=)', description: '<div class="a-page"><p>description</p></div>'});
+        expect(doc.returns).toEqual({type: 'function(string, number=)', description: '<div class="a-page"><p>description</p>\n</div>'});
       });
 
       it('should transform description of @returns with markdown', function() {
         var doc = new Doc("@name a\n@returns {string} descrip *tion*");
         doc.parse();
-        expect(doc.returns).toEqual({type: 'string', description: '<div class="a-page"><p>descrip <em>tion</em></p></div>'});
+        expect(doc.returns).toEqual({type: 'string', description: '<div class="a-page"><p>descrip <em>tion</em></p>\n</div>'});
       });
 
       it('should support multiline content', function() {
         var doc = new Doc("@name a\n@returns {string} description\n new line\n another line");
         doc.parse();
         expect(doc.returns).
-          toEqual({type: 'string', description: '<div class="a-page"><p>description\nnew line\nanother line</p></div>'});
+          toEqual({type: 'string', description: '<div class="a-page"><p>description\nnew line\nanother line</p>\n</div>'});
       });
     });
 
@@ -437,7 +437,7 @@ describe('ngdoc', function() {
         var doc = new Doc("@name a\n@description <pre><b>abc</b></pre>");
         doc.parse();
         expect(doc.description).
-          toBe('<div class="a-page"><pre class="prettyprint linenums">&lt;b&gt;abc&lt;/b&gt;</pre></div>');
+          toBe('<div class="a-page"><pre class="prettyprint linenums">&lt;b&gt;abc&lt;/b&gt;</pre>\n</div>');
       });
 
       it('should support multiple pre blocks', function() {
@@ -445,11 +445,10 @@ describe('ngdoc', function() {
         doc.parse();
         expect(doc.description).
           toBe('<div class="a-page"><p>foo \n' +
-               '<pre class="prettyprint linenums">abc</pre>\n\n' +
-               '<h1 id="bah">bah</h1>\n\n' +
+               '<pre class="prettyprint linenums">abc</pre>\n' +
+               '<h1>bah</h1>\n' +
                '<p>foo \n' +
-               '<pre class="prettyprint linenums">cba</pre></div>');
-
+               '<pre class="prettyprint linenums">cba</pre>\n</div>');
       });
 
       it('should support nested @link annotations with or without description', function() {
@@ -491,7 +490,7 @@ describe('ngdoc', function() {
       it('should not remove {{}}', function() {
         var doc = new Doc('@name a\n@example text {{ abc }}');
         doc.parse();
-        expect(doc.example).toEqual('<div class="a-page"><p>text {{ abc }}</p></div>');
+        expect(doc.example).toEqual('<div class="a-page"><p>text {{ abc }}</p>\n</div>');
       });
     });
 
@@ -511,11 +510,11 @@ describe('ngdoc', function() {
         expect(doc.html()).toContain('<h3>Method\'s <code>this</code></h3>\n' +
             '<div>' +
             '<div class="a-page">' +
-            '<p>I am self.</p>' +
+            '<p>I am self.</p>\n' +
             '</div>' +
             '</div>\n');
         expect(doc.html()).toContain('<h3>Method\'s <code>this</code></h3>\n' +
-            '<div><div class="a-page"><p>I am self.</p></div></div>');
+            '<div><div class="a-page"><p>I am self.</p>\n</div></div>');
       });
     });
 
@@ -542,7 +541,7 @@ describe('ngdoc', function() {
         var doc = new Doc('@ngdoc overview\n@name angular\n@description\n#heading\ntext');
         doc.parse();
         expect(doc.html()).toContain('text');
-        expect(doc.html()).toContain('<h2 id="heading">heading</h2>');
+        expect(doc.html()).toContain('<h2>heading</h2>');
         expect(doc.html()).not.toContain('Description');
       });
     });