Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 11 Jun 2013 16:23:14 +0000 (18:23 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 11 Jun 2013 16:23:14 +0000 (18:23 +0200)
Conflicts:
tine20/Calendar/js/AttendeeFilterGrid.js

1  2 
tine20/Calendar/js/AttendeeFilterGrid.js
tine20/Calendar/js/AttendeeGridPanel.js

@@@ -40,11 -37,13 +40,11 @@@ Tine.Calendar.AttendeeFilterGrid = Ext.
          
          Tine.Calendar.AttendeeFilterGrid.superclass.initComponent.call(this);
          
 -        // apply  initial state
 -        var explicitAttendee = Ext.state.Manager.get(this.stateId);
 -        this.applyState(explicitAttendee);
 -        
          this.store.on('add', this.onStoreAdd, this);
          this.store.on('remove', this.onStoreRemove, this);
-         this.store.on('update', this.onStoreUpdate, this, {buffer: 100});
+         this.store.on('update', this.onStoreUpdate, this);
 +        
 +        this.ddText = this.app.i18n._('Sort Attendee');
      },
      
      initColumns: function() {