Upgrade to ExtJS 3.1.0 - Released 12/16/2009

[extjs.git] / src / widgets / SplitButton.js

diff --git a/src/widgets/SplitButton.js b/src/widgets/SplitButton.js
index b5a1ab3..b0cde67 100644 (file)
--- a/src/widgets/SplitButton.js
+++ b/src/widgets/SplitButton.js
@@ -1,5 +1,5 @@
 /*!
- * Ext JS Library 3.0.3
+ * Ext JS Library 3.1.0
  * Copyright(c) 2006-2009 Ext JS, LLC
  * licensing@extjs.com
  * http://www.extjs.com/license
@@ -81,9 +81,13 @@ Ext.SplitButton = Ext.extend(Ext.Button, {
     },\r
 \r
     isClickOnArrow : function(e){\r
-        return this.arrowAlign != 'bottom' ?\r
-               e.getPageX() > this.el.child(this.buttonSelector).getRegion().right :\r
-               e.getPageY() > this.el.child(this.buttonSelector).getRegion().bottom;\r
+       if (this.arrowAlign != 'bottom') {\r
+           var visBtn = this.el.child('em.x-btn-split');\r
+           var right = visBtn.getRegion().right - visBtn.getPadding('r');\r
+           return e.getPageX() > right;\r
+       } else {\r
+           return e.getPageY() > this.btnEl.getRegion().bottom;\r
+       }\r
     },\r
 \r
     // private\r
@@ -112,12 +116,12 @@ Ext.SplitButton = Ext.extend(Ext.Button, {
 \r
     // private\r
     isMenuTriggerOver : function(e){\r
-        return this.menu && e.target.tagName == 'em';\r
+        return this.menu && e.target.tagName == this.arrowSelector;\r
     },\r
 \r
     // private\r
     isMenuTriggerOut : function(e, internal){\r
-        return this.menu && e.target.tagName != 'em';\r
+        return this.menu && e.target.tagName != this.arrowSelector;\r
     }\r
 });\r
 \r