Fix #5654 - roojspacker - get it working as a doc tool...

[roojs1] / docs / Roo.docs.template.js

diff --git a/docs2/Roo.docs.template.js b/docs/Roo.docs.template.js
similarity index 95%
rename from docs2/Roo.docs.template.js
rename to docs/Roo.docs.template.js
index 88a1a83..3b32339 100644 (file)
--- a/docs2/Roo.docs.template.js
+++ b/docs/Roo.docs.template.js
@@ -41,7 +41,8 @@ Roo.docs.template  = {
                    dtag.values.map(function(v) {
                        return v.length ? v : "<B>Empty</B>";
                    }).join(", ")) : ''
-               ) + '</div>';
+               ) + '</div></div>';
+       Roo.log(JSON.stringify(output));
        return output;
     },
     
@@ -57,6 +58,7 @@ Roo.docs.template  = {
            !data.isStatic
            ) {
            data.isInherited = false;
+           data.isConstructor = true;
            ownMethods.push(data);   // should push ctor???
        }
        
@@ -92,7 +94,7 @@ Roo.docs.template  = {
            }
            
                
-           if ($.isNamespace || (($.memberOf != data.name) && $.isStatic)){
+           if (($.memberOf != data.name) && $.isStatic){
                return true;
            }
            if ($.isStatic) {
@@ -115,7 +117,7 @@ Roo.docs.template  = {
                if (data.isSingleton) {
                    return true;
                }
-               if ($.isNamespace || (($.memberOf != data.name) && $.isStatic)){
+               if (($.memberOf != data.name) && $.isStatic){
                    return true;
                }
                if (!$.isStatic) {
@@ -125,19 +127,20 @@ Roo.docs.template  = {
                
                return true;
            }
-    );
-    return msorted;
-    
+       );
+       
+       return ownMethods;
+       
     },
 
     
     method : function(member) {
       
         var output = '<a name="' + member.memberOf +'.' + member.name + '"></a>' +
-        '<div class="fixedFont"> <span class="attributes">';
+            '<div class="fixedFont"> <span class="attributes">';
 
         if (member.isConstructor) {
-                output += "new <B>" + member.memberOf + (member.memberOf.length ? "." : "") +"</B>";
+                output += "new ";
         } else {
                 
         if (member.isPrivate) output += "&lt;private&gt; ";
@@ -415,7 +418,10 @@ Roo.docs.template  = {
             }
         );
         */
-        str = str.replace(/\n/gi, '<br/>');
+        //Roo.log(JSON.stringify(str));
+       str = str.replace(/[ \t]+\n/gi, '\n');
+        str = str.replace(/\n\n+/gi, '<br/><br/>');
+       //str = str.replace(/\n/gi, '<br/>');
         var linkSymbol = this.linkSymbol;
         str = str.replace(/\{@link ([^} ]+) ?\}/gi,
             function(match, symbolName) {
@@ -428,8 +434,9 @@ Roo.docs.template  = {
     summarize : function(desc)
     {
         if (typeof desc != "undefined") {
-        // finds the first fulls stop...
-            return desc.match(/([\w\W]+?\.)[^a-z0-9]/i)? RegExp.$1.replace("\n", " ") : desc.split("\n")[0];
+           // finds the first fulls stop... (and we remove '<' html...)
+            return desc.match(/([\w\W]+?[\.|:])[^a-z0-9]/i)?
+               RegExp.$1.split('<')[0].replace("\n", " ") : desc.split("\n")[0];
         }
         return '';
     },