From af261d3013390e6d922cba119457b32b436e2420 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Tue, 15 Jan 2019 11:59:56 +0800
Subject: [PATCH] Changed
 Roo/bootstrap/htmleditor/ToolbarStandard.jsdocs/src/Roo_bootstrap_Navbar.js.htmldocs/src/Roo_bootstrap_htmleditor_ToolbarStandard.js.htmldocs/symbols/Roo.bootstrap.htmleditor.ToolbarStandard.json

---
 Roo/bootstrap/htmleditor/ToolbarStandard.js         |  1 +
 docs/src/Roo_bootstrap_Navbar.js.html               | 13 ++++++++++++-
 ...Roo_bootstrap_htmleditor_ToolbarStandard.js.html |  1 +
 .../Roo.bootstrap.htmleditor.ToolbarStandard.json   |  4 ++--
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Roo/bootstrap/htmleditor/ToolbarStandard.js b/Roo/bootstrap/htmleditor/ToolbarStandard.js
index e6d1e017a0..0932cbf74f 100644
--- 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/src/Roo_bootstrap_Navbar.js.html b/docs/src/Roo_bootstrap_Navbar.js.html
index 9c2c71d23b..bc9306ae2f 100644
--- 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 092ceb386d..79803b08dd 100644
--- 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 4da715af2b..620337e3cd 100644
--- 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" : "",
-- 
2.39.2