Fix #5660 - roojs docs - linking and other tidy ups

diff --git a/Roo/bootstrap/htmleditor/ToolbarStandard.js b/Roo/bootstrap/htmleditor/ToolbarStandard.js
index e6d1e01..0932cbf 100644 (file)
--- a/Roo/bootstrap/htmleditor/ToolbarStandard.js
+++ b/Roo/bootstrap/htmleditor/ToolbarStandard.js
@@ -4,6 +4,7 @@ Roo.namespace('Roo.bootstrap.htmleditor');
  * @class Roo.bootstrap.HtmlEditorToolbar1
  * Basic Toolbar
  * 
+ * @example
  * Usage:
  *
  new Roo.bootstrap.HtmlEditor({

diff --git a/docs/Roo.docs.init.js b/docs/Roo.docs.init.js
index 20d4641..0c69bb4 100644 (file)
--- a/docs/Roo.docs.init.js
+++ b/docs/Roo.docs.init.js
@@ -293,11 +293,8 @@ Roo.docs.init = {
               {
         */
         document.body.scrollTop  = 0;
-        for (var k in d) {
-            if (typeof(Roo.docs['doc_' + k])  !=  'undefined') {
-                Roo.docs['doc_' + k].el.dom.innerHTML = Roo.docs.template.resolveLinks(d[k]);;
-            }
-        }
+        Roo.docs.doc_name.el.dom.innerHTML = Roo.docs.template.resolveLinks(d.name);
+        Roo.docs.doc_desc.el.dom.innerHTML = Roo.docs.template.summary(d);
         Roo.docs.doc_extends.hide();
         Roo.docs.doc_extends_sep.hide();
         if (d.augments.length) {

diff --git a/docs/Roo.docs.template.js b/docs/Roo.docs.template.js
index 2acba43..02b2bd1 100644 (file)
--- a/docs/Roo.docs.template.js
+++ b/docs/Roo.docs.template.js
@@ -2,6 +2,18 @@
 
 Roo.docs.template  = {
 
+    summary : function (data)
+    {
+       
+       output = this.resolveLinks(data.desc) ;
+       if (data.example.length) {
+           output += '<pre class="code">'+data.example+'</pre>';
+       }
+       return output;
+    },
+
+    
+    
     augments : function(data)
     {
        if (!data.augments.length) {
@@ -173,7 +185,7 @@ Roo.docs.template  = {
         if (!member.isConstructor) {
             output+= this.resolveLinks(member.desc) ;
             if (member.example.length) {
-                output +'<pre class="code">'+member.example+'</pre>';
+                output += '<pre class="code">'+member.example+'</pre>';
             }
         } else {
             //ctor
@@ -271,7 +283,7 @@ Roo.docs.template  = {
         output += '<div class="long">' + this.resolveLinks(member.desc);
     
     if (member.example.length) {
-        output +'<pre class="code">'+member.example+'</pre>';
+        output +='<pre class="code">'+member.example+'</pre>';
     }
     if (member.params.length) {
         

diff --git a/docs/src/Roo_bootstrap_Navbar.js.html b/docs/src/Roo_bootstrap_Navbar.js.html
index 9c2c71d..bc9306a 100644 (file)
--- a/docs/src/Roo_bootstrap_Navbar.js.html
+++ b/docs/src/Roo_bootstrap_Navbar.js.html
@@ -108,7 +108,12 @@
      */
     </span><span class="jsdoc-var">expand </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function </span><span class="jsdoc-syntax">()
     {
+
         </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">ce </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this.el.select</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'.navbar-collapse'</span><span class="jsdoc-syntax">,</span><span class="jsdoc-keyword">true</span><span class="jsdoc-syntax">)</span><span class="jsdoc-var">.first</span><span class="jsdoc-syntax">();
+        </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">ce.hasClass</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'collapsing'</span><span class="jsdoc-syntax">)) {
+            </span><span class="jsdoc-keyword">return</span><span class="jsdoc-syntax">;
+        }
+        </span><span class="jsdoc-var">ce.dom.style.height </span><span class="jsdoc-syntax">= </span><span class="jsdoc-string">''</span><span class="jsdoc-syntax">;
                </span><span class="jsdoc-comment">// show it...
         </span><span class="jsdoc-var">ce.addClass</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'in'</span><span class="jsdoc-syntax">); </span><span class="jsdoc-comment">// old...
         </span><span class="jsdoc-var">ce.removeClass</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'collapse'</span><span class="jsdoc-syntax">);
@@ -129,13 +134,19 @@
             </span><span class="jsdoc-var">ce.dom.style.height </span><span class="jsdoc-syntax">= </span><span class="jsdoc-string">''</span><span class="jsdoc-syntax">;
         }, </span><span class="jsdoc-var">this</span><span class="jsdoc-syntax">, { </span><span class="jsdoc-var">single</span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">true</span><span class="jsdoc-syntax">} );
         </span><span class="jsdoc-var">ce.setHeight</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">h</span><span class="jsdoc-syntax">);
+        </span><span class="jsdoc-var">ce.dom.scrollTop </span><span class="jsdoc-syntax">= 0;
     },
     </span><span class="jsdoc-comment">/**
      * Collapse the navbar pulldown 
      */
     </span><span class="jsdoc-var">collapse </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">()
     {
-        </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">ce </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this.el.select</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'.navbar-collapse'</span><span class="jsdoc-syntax">,</span><span class="jsdoc-keyword">true</span><span class="jsdoc-syntax">)</span><span class="jsdoc-var">.first</span><span class="jsdoc-syntax">();
+         </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">ce </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this.el.select</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'.navbar-collapse'</span><span class="jsdoc-syntax">,</span><span class="jsdoc-keyword">true</span><span class="jsdoc-syntax">)</span><span class="jsdoc-var">.first</span><span class="jsdoc-syntax">();
+
+        </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">ce.hasClass</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'collapsing'</span><span class="jsdoc-syntax">) || </span><span class="jsdoc-var">ce.hasClass</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'collapse'</span><span class="jsdoc-syntax">) ) {
+            </span><span class="jsdoc-comment">// it's collapsed or collapsing..
+            </span><span class="jsdoc-keyword">return</span><span class="jsdoc-syntax">;
+        }
         </span><span class="jsdoc-var">ce.removeClass</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'in'</span><span class="jsdoc-syntax">); </span><span class="jsdoc-comment">// old...
         </span><span class="jsdoc-var">ce.setHeight</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">ce.getHeight</span><span class="jsdoc-syntax">());
         </span><span class="jsdoc-var">ce.removeClass</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'show'</span><span class="jsdoc-syntax">);

diff --git a/docs/src/Roo_bootstrap_htmleditor_ToolbarStandard.js.html b/docs/src/Roo_bootstrap_htmleditor_ToolbarStandard.js.html
index 092ceb3..79803b0 100644 (file)
--- a/docs/src/Roo_bootstrap_htmleditor_ToolbarStandard.js.html
+++ b/docs/src/Roo_bootstrap_htmleditor_ToolbarStandard.js.html
@@ -4,6 +4,7 @@
  * @class Roo.bootstrap.HtmlEditorToolbar1
  * Basic Toolbar
  * 
+ * @example
  * Usage:
  *
  new Roo.bootstrap.HtmlEditor({

diff --git a/docs/symbols/Roo.bootstrap.htmleditor.ToolbarStandard.json b/docs/symbols/Roo.bootstrap.htmleditor.ToolbarStandard.json
index 4da715a..620337e 100644 (file)
--- a/docs/symbols/Roo.bootstrap.htmleditor.ToolbarStandard.json
+++ b/docs/symbols/Roo.bootstrap.htmleditor.ToolbarStandard.json
@@ -2,12 +2,12 @@
   "name" : "Roo.bootstrap.htmleditor.ToolbarStandard",
   "augments" : [
   ],
-  "desc" : "Basic Toolbar\n\nUsage:\n\n new Roo.bootstrap.HtmlEditor({\n    ....\n    toolbars : [\n        new Roo.bootstrap.HtmlEditorToolbar1({\n            disable : { fonts: 1 , format: 1, ..., ... , ...],\n            btns : [ .... ]\n        })\n    }",
+  "desc" : "Basic Toolbar",
   "isSingleton" : false,
   "isStatic" : false,
   "isBuiltin" : false,
   "memberOf" : "ToolbarStandard",
-  "example" : "",
+  "example" : "Usage:\n\n new Roo.bootstrap.HtmlEditor({\n    ....\n    toolbars : [\n        new Roo.bootstrap.HtmlEditorToolbar1({\n            disable : { fonts: 1 , format: 1, ..., ... , ...],\n            btns : [ .... ]\n        })\n    }",
   "deprecated" : "",
   "since" : "",
   "see" : "",