Upgrade to ExtJS 3.3.0 - Released 10/06/2010

[extjs.git] / docs / source / GroupingView.html
diff --git a/docs/source/GroupingView.html b/docs/source/GroupingView.html

index 0c31ed4..3c5f93d 100644 (file)
--- a/docs/source/GroupingView.html
+++ b/docs/source/GroupingView.html
@@ -7,7 +7,7 @@
  </head>
  <body  onload="prettyPrint();">
      <pre class="prettyprint lang-js">/*!
- * Ext JS Library 3.2.0
+ * Ext JS Library 3.3.0
   * Copyright(c) 2006-2010 Ext JS, Inc.
   * licensing@extjs.com
   * http://www.extjs.com/license
@@ -158,6 +158,11 @@ var grid = new Ext.grid.GridPanel({
       * @cfg {Function} groupRenderer This property must be configured in the {@link Ext.grid.Column} for
       * each column.
       */
+    
+    <div id="cfg-Ext.grid.GroupingView-cancelEditOnToggle"></div>/**
+     * @cfg {Boolean} cancelEditOnToggle True to cancel any editing when the group header is toggled. Defaults to <tt>true</tt>.
+     */
+    cancelEditOnToggle: true,
  
      // private
      initTemplates : function(){
@@ -234,14 +239,13 @@ var grid = new Ext.grid.GridPanel({
          }
          if((item = items.get('showGroups'))){
              item.setDisabled(disabled);
-            item.setChecked(this.enableGrouping, true);
+            item.setChecked(this.canGroup(), true);
          }
      },
  
      // private
      renderUI : function(){
-        Ext.grid.GroupingView.superclass.renderUI.call(this);
-        this.mainBody.on('mousedown', this.interceptMouse, this);
+        var markup = Ext.grid.GroupingView.superclass.renderUI.call(this);
  
          if(this.enableGroupingMenu && this.hmenu){
              this.hmenu.add('-',{
@@ -262,6 +266,7 @@ var grid = new Ext.grid.GridPanel({
              }
              this.hmenu.on('beforeshow', this.beforeMenuShow, this);
          }
+        return markup;
      },
  
      processEvent: function(name, e){
@@ -271,13 +276,19 @@ var grid = new Ext.grid.GridPanel({
              // group value is at the end of the string
              var field = this.getGroupField(),
                  prefix = this.getPrefix(field),
-                groupValue = hd.id.substring(prefix.length);
+                groupValue = hd.id.substring(prefix.length),
+                emptyRe = new RegExp('gp-' + Ext.escapeRe(field) + '--hd');
  
              // remove trailing '-hd'
              groupValue = groupValue.substr(0, groupValue.length - 3);
-            if(groupValue){
+            
+            // also need to check for empty groups
+            if(groupValue || emptyRe.test(hd.id)){
                  this.grid.fireEvent('group' + name, this.grid, field, groupValue, e);
              }
+            if(name == 'mousedown' && e.button == 0){
+                this.toggleGroup(hd.parentNode);
+            }
          }
  
      },
@@ -326,7 +337,9 @@ var grid = new Ext.grid.GridPanel({
          var gel = Ext.get(group);
          expanded = Ext.isDefined(expanded) ? expanded : gel.hasClass('x-grid-group-collapsed');
          if(this.state[gel.id] !== expanded){
-            this.grid.stopEditing(true);
+            if (this.cancelEditOnToggle !== false) {
+                this.grid.stopEditing(true);
+            }
              this.state[gel.id] = expanded;
              gel[expanded ? 'removeClass' : 'addClass']('x-grid-group-collapsed');
          }
@@ -357,20 +370,12 @@ var grid = new Ext.grid.GridPanel({
          this.toggleAllGroups(false);
      },
  
-    // private
-    interceptMouse : function(e){
-        var hd = e.getTarget('.x-grid-group-hd', this.mainBody);
-        if(hd){
-            e.stopEvent();
-            this.toggleGroup(hd.parentNode);
-        }
-    },
-
      // private
      getGroup : function(v, r, groupRenderer, rowIndex, colIndex, ds){
-        var g = groupRenderer ? groupRenderer(v, {}, r, rowIndex, colIndex, ds) : String(v);
+        var column = this.cm.config[colIndex],
+            g = groupRenderer ? groupRenderer.call(column.scope, v, {}, r, rowIndex, colIndex, ds) : String(v);
          if(g === '' || g === '&#160;'){
-            g = this.cm.config[colIndex].emptyGroupText || this.emptyGroupText;
+            g = column.emptyGroupText || this.emptyGroupText;
          }
          return g;
      },
@@ -390,6 +395,32 @@ var grid = new Ext.grid.GridPanel({
              this.updateGroupWidths();
          }
      },
+    
+    afterRenderUI: function () {
+        Ext.grid.GroupingView.superclass.afterRenderUI.call(this);
+
+        if (this.enableGroupingMenu && this.hmenu) {
+            this.hmenu.add('-',{
+                itemId:'groupBy',
+                text: this.groupByText,
+                handler: this.onGroupByClick,
+                scope: this,
+                iconCls:'x-group-by-icon'
+            });
+            
+            if (this.enableNoGroups) {
+                this.hmenu.add({
+                    itemId:'showGroups',
+                    text: this.showGroupsText,
+                    checked: true,
+                    checkHandler: this.onShowGroupsClick,
+                    scope: this
+                });
+            }
+            
+            this.hmenu.on('beforeshow', this.beforeMenuShow, this);
+        }
+    },
  
      // private
      renderRows : function(){