Merge branch 'master' into widget-events

Conflicts:
	ui/jquery.ui.widget.js

diff --cc tests/unit/widget/widget_core.js
index d993194e2c8da07df7beaf1be112244185c11ddc,94cd664eb6ea62f2f0830a6cc86ccb2340801445..6f493062183bf680f9448a05c7798eb65356b0f2
--- 1/tests/unit/widget/widget_core.js
--- 2/tests/unit/widget/widget_core.js
+++ b/tests/unit/widget/widget_core.js
@@@ -401,168 -446,9 +446,168 @@@ test( ".widget() - overriden", function
                        return wrapper;
                }
        });
-       same( wrapper[0], $( "<div></div>" ).testWidget().testWidget( "widget" )[0] );
+       same( wrapper[0], $( "<div>" ).testWidget().testWidget( "widget" )[0] );
  });
  
 +test( "._bind() to element (default)", function() {
 +      expect( 12 );
 +      var self;
 +      $.widget( "ui.testWidget", {
 +              _create: function() {
 +                      self = this;
 +                      this._bind({
 +                              keyup: this.keyup,
 +                              keydown: "keydown"
 +                      });
 +              },
 +              keyup: function( event ) {
 +                      equals( self, this );
 +                      equals( self.element[0], event.currentTarget );
 +                      equals( "keyup", event.type );
 +              },
 +              keydown: function( event ) {
 +                      equals( self, this );
 +                      equals( self.element[0], event.currentTarget );
 +                      equals( "keydown", event.type );
 +              }
 +      });
 +      var widget = $( "<div></div>" )
 +              .testWidget()
 +              .trigger( "keyup" )
 +              .trigger( "keydown" );
 +      widget
 +              .testWidget( "disable" )
 +              .trigger( "keyup" )
 +              .trigger( "keydown" );
 +      widget
 +              .testWidget( "enable" )
 +              .trigger( "keyup" )
 +              .trigger( "keydown" );
 +      widget
 +              .testWidget( "destroy" )
 +              .trigger( "keyup" )
 +              .trigger( "keydown" );
 +});
 +
 +test( "._bind() to descendent", function() {
 +      expect( 12 );
 +      var self;
 +      $.widget( "ui.testWidget", {
 +              _create: function() {
 +                      self = this;
 +                      this._bind( this.element.find( "strong" ), {
 +                              keyup: this.keyup,
 +                              keydown: "keydown"
 +                      });
 +              },
 +              keyup: function( event ) {
 +                      equals( self, this );
 +                      equals( self.element.find( "strong" )[0], event.currentTarget );
 +                      equals( "keyup", event.type );
 +              },
 +              keydown: function(event) {
 +                      equals( self, this );
 +                      equals( self.element.find( "strong" )[0], event.currentTarget );
 +                      equals( "keydown", event.type );
 +              }
 +      });
 +      // trigger events on both widget and descendent to ensure that only descendent receives them
 +      var widget = $( "<div><p><strong>hello</strong> world</p></div>" )
 +              .testWidget()
 +              .trigger( "keyup" )
 +              .trigger( "keydown" );
 +      var descendent = widget.find( "strong" )
 +              .trigger( "keyup" )
 +              .trigger( "keydown" );
 +      widget
 +              .testWidget( "disable" )
 +              .trigger( "keyup" )
 +              .trigger( "keydown" );
 +      descendent
 +              .trigger( "keyup" )
 +              .trigger( "keydown" );
 +      widget
 +              .testWidget( "enable" )
 +              .trigger( "keyup" )
 +              .trigger( "keydown" );
 +      descendent
 +              .trigger( "keyup" )
 +              .trigger( "keydown" );
 +      descendent
 +              .addClass( "ui-state-disabled" )
 +              .trigger( "keyup" )
 +              .trigger( "keydown" );
 +      widget
 +              .testWidget( "destroy" )
 +              .trigger( "keyup" )
 +              .trigger( "keydown" );
 +      descendent
 +              .trigger( "keyup" )
 +              .trigger( "keydown" );
 +});
 +
 +test( "._hoverable()", function() {
 +      $.widget( "ui.testWidget", {
 +              _create: function() {
 +                      this._hoverable( this.element.children() );
 +              }
 +      });
 +
 +      var div = $( "#widget" ).testWidget().children();
 +      ok( !div.hasClass( "ui-state-hover" ), "not hovered on init" );
 +      div.trigger( "mouseenter" );
 +      ok( div.hasClass( "ui-state-hover" ), "hovered after mouseenter" );
 +      div.trigger( "mouseleave" );
 +      ok( !div.hasClass( "ui-state-hover" ), "not hovered after mouseleave" );
 +
 +      div.trigger( "mouseenter" );
 +      ok( div.hasClass( "ui-state-hover" ), "hovered after mouseenter" );
 +      $( "#widget" ).testWidget( "disable" );
 +      ok( !div.hasClass( "ui-state-hover" ), "not hovered while disabled" );
 +      div.trigger( "mouseenter" );
 +      ok( !div.hasClass( "ui-state-hover" ), "can't hover while disabled" );
 +      $( "#widget" ).testWidget( "enable" );
 +      ok( !div.hasClass( "ui-state-hover" ), "enabling doesn't reset hover" );
 +
 +      div.trigger( "mouseenter" );
 +      ok( div.hasClass( "ui-state-hover" ), "hovered after mouseenter" );
 +      $( "#widget" ).testWidget( "destroy" );
 +      ok( !div.hasClass( "ui-state-hover" ), "not hovered after destroy" );
 +      div.trigger( "mouseenter" );
 +      ok( !div.hasClass( "ui-state-hover" ), "event handler removed on destroy" );
 +});
 +
 +test( "._focusable()", function() {
 +      $.widget( "ui.testWidget", {
 +              _create: function() {
 +              this._focusable( this.element.children() );
 +      }
 +      });
 +      
 +      var div = $( "#widget" ).testWidget().children();
 +      ok( !div.hasClass( "ui-state-focus" ), "not focused on init" );
 +      div.trigger( "focusin" );
 +      ok( div.hasClass( "ui-state-focus" ), "focused after explicit focus" );
 +      div.trigger( "focusout" );
 +      ok( !div.hasClass( "ui-state-focus" ), "not focused after blur" );
 +      
 +      div.trigger( "focusin" );
 +      ok( div.hasClass( "ui-state-focus" ), "focused after explicit focus" );
 +      $( "#widget" ).testWidget( "disable" );
 +      ok( !div.hasClass( "ui-state-focus" ), "not focused while disabled" );
 +      div.trigger( "focusin" );
 +      ok( !div.hasClass( "ui-state-focus" ), "can't focus while disabled" );
 +      $( "#widget" ).testWidget( "enable" );
 +      ok( !div.hasClass( "ui-state-focus" ), "enabling doesn't reset focus" );
 +      
 +      div.trigger( "focusin" );
 +      ok( div.hasClass( "ui-state-focus" ), "focused after explicit focus" );
 +      $( "#widget" ).testWidget( "destroy" );
 +      ok( !div.hasClass( "ui-state-focus" ), "not focused after destroy" );
 +      div.trigger( "focusin" );
 +      ok( !div.hasClass( "ui-state-focus" ), "event handler removed on destroy" );
 +});
 +
  test( "._trigger() - no event, no ui", function() {
        expect( 7 );
        var handlers = [];

diff --cc ui/jquery.ui.accordion.js
index 954ee91bda7d9ce6e2211e2254bd3519283a301a,9d74557de699512e00bc8322af93b7416d077122..6c257c8c0b56fa7595ecb6d46b65af29154cd716
--- 1/ui/jquery.ui.accordion.js
--- 2/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@@ -35,19 -33,35 +33,14 @@@ $.widget( "ui.accordion", 
  
                self.running = 0;
  
-               self.element
-                       .addClass( "ui-accordion ui-widget ui-helper-reset" )
-                       // in lack of child-selectors in CSS
-                       // we need to mark top-LIs in a UL-accordion for some IE-fix
-                       .children( "li" )
-                               .addClass( "ui-accordion-li-fix" );
+               self.element.addClass( "ui-accordion ui-widget ui-helper-reset" );
  
                self.headers = self.element.find( options.header )
 -                      .addClass( "ui-accordion-header ui-helper-reset ui-state-default ui-corner-all" )
 -                      .bind( "mouseenter.accordion", function() {
 -                              if ( options.disabled ) {
 -                                      return;
 -                              }
 -                              $( this ).addClass( "ui-state-hover" );
 -                      })
 -                      .bind( "mouseleave.accordion", function() {
 -                              if ( options.disabled ) {
 -                                      return;
 -                              }
 -                              $( this ).removeClass( "ui-state-hover" );
 -                      })
 -                      .bind( "focus.accordion", function() {
 -                              if ( options.disabled ) {
 -                                      return;
 -                              }
 -                              $( this ).addClass( "ui-state-focus" );
 -                      })
 -                      .bind( "blur.accordion", function() {
 -                              if ( options.disabled ) {
 -                                      return;
 -                              }
 -                              $( this ).removeClass( "ui-state-focus" );
 -                      });
 +                      .addClass( "ui-accordion-header ui-helper-reset ui-state-default ui-corner-all" );
  
 +              self._hoverable( self.headers );
 +              self._focusable( self.headers );
 +              
                self.headers.next()
                        .addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" );
                self.headers.find( ":first-child" ).addClass( "ui-accordion-heading" );

diff --cc ui/jquery.ui.widget.js
index 4f092f9d8764bbd861a2118740bd37cac4e0c403,ece6e9e16a34cc8e25ef1ba95c195b7fb3e7198e..c8e5348ac43e83932f7b2b65729606904f3ffdd7
--- 1/ui/jquery.ui.widget.js
--- 2/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@@ -128,12 -139,14 +139,16 @@@ $.Widget.prototype = 
                        this.options,
                        this._getCreateOptions(),
                        options );
 -              if (element !== this) {
 -                      $.data(element, this.widgetName, this);
 -                      
 -                      var self = this;
 -                      this.element.bind("remove." + this.widgetName, function(){
 -                              self.destroy();
 -                      });
 +
 +              this.bindings = $();
 +              this.hoverable = $();
 +              this.focusable = $();
-               this._bind({ remove: "destroy" });
++
++              if ( element !== this ) {
++                      $.data( element, this.widgetName, this );
++                      this._bind({ remove: "destroy" });
+               }
 +
                this._create();
                this._trigger( "create" );
                this._init();