sync

diff --git a/docs/json/roodata.json b/docs/json/roodata.json
index 7e1375f..49146ce 100644 (file)
--- a/docs/json/roodata.json
+++ b/docs/json/roodata.json
@@ -7969,6 +7969,32 @@
         ],
         "returns" : []
       },
+      {
+        "name" : "setPressed",
+        "type" : "function",
+        "desc" : "Similar to toggle, but does not trigger event.",
+        "sig" : "(state)",
+        "static" : false,
+        "memberOf" : "",
+        "isStatic" : false,
+        "isConstructor" : false,
+        "isPrivate" : false,
+        "example" : "",
+        "deprecated" : "",
+        "since" : "",
+        "see" : "",
+        "exceptions" : "",
+        "requires" : "",
+        "params" : [
+          {
+            "name" : "state",
+            "type" : "Boolean",
+            "desc" : "[required] Force a particular state",
+            "isOptional" : false
+          }
+        ],
+        "returns" : []
+      },
       {
         "name" : "setText",
         "type" : "function",
@@ -42849,6 +42875,32 @@
         ],
         "returns" : []
       },
+      {
+        "name" : "setPressed",
+        "type" : "function",
+        "desc" : "Similar to toggle, but does not trigger event.",
+        "sig" : "(state)",
+        "static" : false,
+        "memberOf" : "Roo.Button",
+        "isStatic" : false,
+        "isConstructor" : false,
+        "isPrivate" : false,
+        "example" : "",
+        "deprecated" : "",
+        "since" : "",
+        "see" : "",
+        "exceptions" : "",
+        "requires" : "",
+        "params" : [
+          {
+            "name" : "state",
+            "type" : "Boolean",
+            "desc" : "[required] Force a particular state",
+            "isOptional" : false
+          }
+        ],
+        "returns" : []
+      },
       {
         "name" : "setText",
         "type" : "function",
@@ -47810,6 +47862,32 @@
         ],
         "returns" : []
       },
+      {
+        "name" : "setPressed",
+        "type" : "function",
+        "desc" : "Similar to toggle, but does not trigger event.",
+        "sig" : "(state)",
+        "static" : false,
+        "memberOf" : "Roo.Button",
+        "isStatic" : false,
+        "isConstructor" : false,
+        "isPrivate" : false,
+        "example" : "",
+        "deprecated" : "",
+        "since" : "",
+        "see" : "",
+        "exceptions" : "",
+        "requires" : "",
+        "params" : [
+          {
+            "name" : "state",
+            "type" : "Boolean",
+            "desc" : "[required] Force a particular state",
+            "isOptional" : false
+          }
+        ],
+        "returns" : []
+      },
       {
         "name" : "setText",
         "type" : "function",
@@ -49651,6 +49729,32 @@
         ],
         "returns" : []
       },
+      {
+        "name" : "setPressed",
+        "type" : "function",
+        "desc" : "Similar to toggle, but does not trigger event.",
+        "sig" : "(state)",
+        "static" : false,
+        "memberOf" : "Roo.Button",
+        "isStatic" : false,
+        "isConstructor" : false,
+        "isPrivate" : false,
+        "example" : "",
+        "deprecated" : "",
+        "since" : "",
+        "see" : "",
+        "exceptions" : "",
+        "requires" : "",
+        "params" : [
+          {
+            "name" : "state",
+            "type" : "Boolean",
+            "desc" : "[required] Force a particular state",
+            "isOptional" : false
+          }
+        ],
+        "returns" : []
+      },
       {
         "name" : "setText",
         "type" : "function",

diff --git a/docs/src/Roo_Button.js.html b/docs/src/Roo_Button.js.html
index cb40668..5b352c6 100644 (file)
--- a/docs/src/Roo_Button.js.html
+++ b/docs/src/Roo_Button.js.html
@@ -369,6 +369,22 @@
             </span><span class="jsdoc-var">this.hide</span><span class="jsdoc-syntax">();
         }
     },
+    </span><span class="jsdoc-comment">/**
+        * Similar to toggle, but does not trigger event.
+        * @param {Boolean} state [required] Force a particular state
+        */
+       </span><span class="jsdoc-var">setPressed </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">state</span><span class="jsdoc-syntax">)
+       {
+           </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">state </span><span class="jsdoc-syntax">!= </span><span class="jsdoc-var">this.pressed</span><span class="jsdoc-syntax">){
+            </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">state</span><span class="jsdoc-syntax">){
+                </span><span class="jsdoc-var">this.el.addClass</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">&quot;x-btn-pressed&quot;</span><span class="jsdoc-syntax">);
+                </span><span class="jsdoc-var">this.pressed </span><span class="jsdoc-syntax">= </span><span class="jsdoc-keyword">true</span><span class="jsdoc-syntax">;
+            }</span><span class="jsdoc-keyword">else</span><span class="jsdoc-syntax">{
+                </span><span class="jsdoc-var">this.el.removeClass</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">&quot;x-btn-pressed&quot;</span><span class="jsdoc-syntax">);
+                </span><span class="jsdoc-var">this.pressed </span><span class="jsdoc-syntax">= </span><span class="jsdoc-keyword">false</span><span class="jsdoc-syntax">;
+            }
+        }
+       },
 
     </span><span class="jsdoc-comment">/**
      * If a state it passed, it becomes the pressed state otherwise the current state is toggled.
@@ -392,6 +408,8 @@
         }
     },
 
+
+
     </span><span class="jsdoc-comment">/**
      * Focus the button
      */

diff --git a/docs/src/Roo_HtmlEditorCore.js.html b/docs/src/Roo_HtmlEditorCore.js.html
index d8f122d..16cfbc9 100644 (file)
--- a/docs/src/Roo_HtmlEditorCore.js.html
+++ b/docs/src/Roo_HtmlEditorCore.js.html
@@ -620,7 +620,7 @@
             </span><span class="jsdoc-keyword">new </span><span class="jsdoc-var">Roo.htmleditor.FilterStyleToTag</span><span class="jsdoc-syntax">({ </span><span class="jsdoc-var">node </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">d </span><span class="jsdoc-syntax">});
             </span><span class="jsdoc-keyword">new </span><span class="jsdoc-var">Roo.htmleditor.FilterAttributes</span><span class="jsdoc-syntax">({
                 </span><span class="jsdoc-var">node </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">d</span><span class="jsdoc-syntax">,
-                </span><span class="jsdoc-var">attrib_white </span><span class="jsdoc-syntax">: [</span><span class="jsdoc-string">'href'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'src'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'name'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'align'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'colspan'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'rowspan'</span><span class="jsdoc-syntax">],
+                </span><span class="jsdoc-var">attrib_white </span><span class="jsdoc-syntax">: [</span><span class="jsdoc-string">'href'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'src'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'name'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'align'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'colspan'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'rowspan'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'data-display'</span><span class="jsdoc-syntax">],
                 </span><span class="jsdoc-var">attrib_clean </span><span class="jsdoc-syntax">: [</span><span class="jsdoc-string">'href'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'src' </span><span class="jsdoc-syntax">]
             });
             </span><span class="jsdoc-keyword">new </span><span class="jsdoc-var">Roo.htmleditor.FilterBlack</span><span class="jsdoc-syntax">({ </span><span class="jsdoc-var">node </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">d</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">tag </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">this.black</span><span class="jsdoc-syntax">});

diff --git a/docs/src/Roo_htmleditor_BlockFigure.js.html b/docs/src/Roo_htmleditor_BlockFigure.js.html
index 1ae477c..25d4d24 100644 (file)
--- a/docs/src/Roo_htmleditor_BlockFigure.js.html
+++ b/docs/src/Roo_htmleditor_BlockFigure.js.html
@@ -234,7 +234,10 @@
                 </span><span class="jsdoc-var">pressed </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">false</span><span class="jsdoc-syntax">,
                 </span><span class="jsdoc-var">enableToggle </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">true</span><span class="jsdoc-syntax">,
                 </span><span class="jsdoc-var">setValue </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">v</span><span class="jsdoc-syntax">) {
-                    </span><span class="jsdoc-var">this.toggle</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">v </span><span class="jsdoc-syntax">== </span><span class="jsdoc-string">'block' </span><span class="jsdoc-syntax">? </span><span class="jsdoc-keyword">false </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">true</span><span class="jsdoc-syntax">);
+                    </span><span class="jsdoc-comment">// this trigger toggle.
+
+                    </span><span class="jsdoc-var">this.setText</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">v </span><span class="jsdoc-syntax">? </span><span class="jsdoc-string">&quot;Hide Caption&quot; </span><span class="jsdoc-syntax">: </span><span class="jsdoc-string">&quot;Show Caption&quot;</span><span class="jsdoc-syntax">);
+                    </span><span class="jsdoc-var">this.setPressed</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">v </span><span class="jsdoc-syntax">!= </span><span class="jsdoc-string">'block'</span><span class="jsdoc-syntax">);
                 },
                 </span><span class="jsdoc-var">listeners </span><span class="jsdoc-syntax">: {
                     </span><span class="jsdoc-var">toggle</span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">btn</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">state</span><span class="jsdoc-syntax">)
@@ -275,7 +278,6 @@
                 </span><span class="jsdoc-var">maxWidth </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">iw </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-string">' !important'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-comment">// this is not getting rendered?
                 </span><span class="jsdoc-var">margin </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">m
 
-
             </span><span class="jsdoc-syntax">}
         };
         </span><span class="jsdoc-comment">/*
@@ -315,7 +317,8 @@
         </span><span class="jsdoc-comment">// we remove caption totally if its hidden... - will delete data.. but otherwise we end up with fake caption
         </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">captionhtml </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this.caption_display </span><span class="jsdoc-syntax">== </span><span class="jsdoc-string">'none' </span><span class="jsdoc-syntax">? </span><span class="jsdoc-string">'' </span><span class="jsdoc-syntax">: (</span><span class="jsdoc-var">this.caption.length </span><span class="jsdoc-syntax">? </span><span class="jsdoc-var">this.caption </span><span class="jsdoc-syntax">: </span><span class="jsdoc-string">&quot;Caption&quot;</span><span class="jsdoc-syntax">);
 
-        </span><span class="jsdoc-keyword">return  </span><span class="jsdoc-syntax">{
+
+        </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">ret </span><span class="jsdoc-syntax">=   {
             </span><span class="jsdoc-var">tag</span><span class="jsdoc-syntax">: </span><span class="jsdoc-string">'figure'</span><span class="jsdoc-syntax">,
             </span><span class="jsdoc-string">'data-block' </span><span class="jsdoc-syntax">: </span><span class="jsdoc-string">'Figure'</span><span class="jsdoc-syntax">,
 
@@ -327,7 +330,7 @@
                 </span><span class="jsdoc-var">maxWidth </span><span class="jsdoc-syntax">:  </span><span class="jsdoc-var">this.align </span><span class="jsdoc-syntax">== </span><span class="jsdoc-string">'center' </span><span class="jsdoc-syntax">? </span><span class="jsdoc-string">'100% !important' </span><span class="jsdoc-syntax">: (</span><span class="jsdoc-var">this.width </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-string">' !important'</span><span class="jsdoc-syntax">),
                 </span><span class="jsdoc-var">width </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">this.align </span><span class="jsdoc-syntax">== </span><span class="jsdoc-string">'center' </span><span class="jsdoc-syntax">? </span><span class="jsdoc-string">'100%' </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">this.width</span><span class="jsdoc-syntax">,
                 </span><span class="jsdoc-var">margin</span><span class="jsdoc-syntax">:  </span><span class="jsdoc-string">'0px'</span><span class="jsdoc-syntax">,
-                </span><span class="jsdoc-var">padding</span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">this.align </span><span class="jsdoc-syntax">== </span><span class="jsdoc-string">'center' </span><span class="jsdoc-syntax">? </span><span class="jsdoc-string">'10px 0' </span><span class="jsdoc-syntax">: </span><span class="jsdoc-string">'0'</span><span class="jsdoc-syntax">,
+                </span><span class="jsdoc-var">padding</span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">this.align </span><span class="jsdoc-syntax">== </span><span class="jsdoc-string">'center' </span><span class="jsdoc-syntax">? </span><span class="jsdoc-string">'0' </span><span class="jsdoc-syntax">: </span><span class="jsdoc-string">'0 10px' </span><span class="jsdoc-syntax">,
                 </span><span class="jsdoc-var">textAlign </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">this.align   </span><span class="jsdoc-comment">// seems to work for email..
 
             </span><span class="jsdoc-syntax">},
@@ -376,6 +379,7 @@
                 }
             ]
         };
+        </span><span class="jsdoc-keyword">return </span><span class="jsdoc-var">ret</span><span class="jsdoc-syntax">;
 
     },
 

diff --git a/docs/symbols/Roo.Button.json b/docs/symbols/Roo.Button.json
index 889eb8b..60c72c5 100644 (file)
--- a/docs/symbols/Roo.Button.json
+++ b/docs/symbols/Roo.Button.json
@@ -390,6 +390,32 @@
       ],
       "returns" : []
     },
+    {
+      "name" : "setPressed",
+      "type" : "function",
+      "desc" : "Similar to toggle, but does not trigger event.",
+      "sig" : "(state)",
+      "static" : false,
+      "memberOf" : "",
+      "isStatic" : false,
+      "isConstructor" : false,
+      "isPrivate" : false,
+      "example" : "",
+      "deprecated" : "",
+      "since" : "",
+      "see" : "",
+      "exceptions" : "",
+      "requires" : "",
+      "params" : [
+        {
+          "name" : "state",
+          "type" : "Boolean",
+          "desc" : "[required] Force a particular state",
+          "isOptional" : false
+        }
+      ],
+      "returns" : []
+    },
     {
       "name" : "setVisible",
       "type" : "function",

diff --git a/docs/symbols/Roo.SplitButton.json b/docs/symbols/Roo.SplitButton.json
index 7a9ef3a..a8b0deb 100644 (file)
--- a/docs/symbols/Roo.SplitButton.json
+++ b/docs/symbols/Roo.SplitButton.json
@@ -441,6 +441,32 @@
       ],
       "returns" : []
     },
+    {
+      "name" : "setPressed",
+      "type" : "function",
+      "desc" : "Similar to toggle, but does not trigger event.",
+      "sig" : "(state)",
+      "static" : false,
+      "memberOf" : "Roo.Button",
+      "isStatic" : false,
+      "isConstructor" : false,
+      "isPrivate" : false,
+      "example" : "",
+      "deprecated" : "",
+      "since" : "",
+      "see" : "",
+      "exceptions" : "",
+      "requires" : "",
+      "params" : [
+        {
+          "name" : "state",
+          "type" : "Boolean",
+          "desc" : "[required] Force a particular state",
+          "isOptional" : false
+        }
+      ],
+      "returns" : []
+    },
     {
       "name" : "setVisible",
       "type" : "function",

diff --git a/docs/symbols/Roo.Toolbar.Button.json b/docs/symbols/Roo.Toolbar.Button.json
index 3e3c469..1b5b785 100644 (file)
--- a/docs/symbols/Roo.Toolbar.Button.json
+++ b/docs/symbols/Roo.Toolbar.Button.json
@@ -421,6 +421,32 @@
       ],
       "returns" : []
     },
+    {
+      "name" : "setPressed",
+      "type" : "function",
+      "desc" : "Similar to toggle, but does not trigger event.",
+      "sig" : "(state)",
+      "static" : false,
+      "memberOf" : "Roo.Button",
+      "isStatic" : false,
+      "isConstructor" : false,
+      "isPrivate" : false,
+      "example" : "",
+      "deprecated" : "",
+      "since" : "",
+      "see" : "",
+      "exceptions" : "",
+      "requires" : "",
+      "params" : [
+        {
+          "name" : "state",
+          "type" : "Boolean",
+          "desc" : "[required] Force a particular state",
+          "isOptional" : false
+        }
+      ],
+      "returns" : []
+    },
     {
       "name" : "setVisible",
       "type" : "function",

diff --git a/docs/symbols/Roo.Toolbar.SplitButton.json b/docs/symbols/Roo.Toolbar.SplitButton.json
index b7f8855..caf4eca 100644 (file)
--- a/docs/symbols/Roo.Toolbar.SplitButton.json
+++ b/docs/symbols/Roo.Toolbar.SplitButton.json
@@ -470,6 +470,32 @@
       ],
       "returns" : []
     },
+    {
+      "name" : "setPressed",
+      "type" : "function",
+      "desc" : "Similar to toggle, but does not trigger event.",
+      "sig" : "(state)",
+      "static" : false,
+      "memberOf" : "Roo.Button",
+      "isStatic" : false,
+      "isConstructor" : false,
+      "isPrivate" : false,
+      "example" : "",
+      "deprecated" : "",
+      "since" : "",
+      "see" : "",
+      "exceptions" : "",
+      "requires" : "",
+      "params" : [
+        {
+          "name" : "state",
+          "type" : "Boolean",
+          "desc" : "[required] Force a particular state",
+          "isOptional" : false
+        }
+      ],
+      "returns" : []
+    },
     {
       "name" : "setVisible",
       "type" : "function",