]> source.dussan.org Git - jquery-ui.git/commitdiff
Merge branch 'master' into core-1.6.1
authorScott González <scott.gonzalez@gmail.com>
Mon, 25 Jul 2011 15:53:14 +0000 (11:53 -0400)
committerScott González <scott.gonzalez@gmail.com>
Mon, 25 Jul 2011 15:53:14 +0000 (11:53 -0400)
Conflicts:
demos/menubar/default.html
tests/unit/autocomplete/autocomplete.html
tests/visual/effects/effects.all.html
ui/jquery.ui.menu.js
ui/jquery.ui.popup.js

19 files changed:
1  2 
demos/menubar/default.html
demos/popup/default.html
demos/position/default.html
demos/widget/default.html
tests/unit/accordion/accordion.html
tests/unit/accordion/accordion_deprecated.html
tests/unit/autocomplete/autocomplete.html
tests/unit/datepicker/datepicker_options.js
tests/unit/effects/effects.html
tests/unit/position/position.html
tests/visual/effects/effects.all.html
tests/visual/position/position.html
ui/jquery.ui.accordion.js
ui/jquery.ui.datepicker.js
ui/jquery.ui.dialog.js
ui/jquery.ui.menu.js
ui/jquery.ui.menubar.js
ui/jquery.ui.popup.js
ui/jquery.ui.spinner.js

index 121b12225ef783f97fa17dc238b346a392c99fbf,adee4afc90f3fb4deeb1bdfa2e3c0ffa58738ef7..34742bb52c8dee6c3a73fc0f064c8fe9e4c81d77
@@@ -3,8 -3,8 +3,8 @@@
  <head>
        <title>jQuery UI Menubar - Default demo</title>
        <link rel="stylesheet" href="../demos.css" type="text/css" />
-       <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css" type="text/css" title="ui-theme" />
+       <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css" />
 -      <script src="../../jquery-1.5.1.js"></script>
 +      <script src="../../jquery-1.6.2.js"></script>
        <script src="../../ui/jquery.ui.core.js"></script>
        <script src="../../ui/jquery.ui.widget.js"></script>
        <script src="../../ui/jquery.ui.position.js"></script>
Simple merge
Simple merge
index ff85bee43c682d32225604af7554d5a199106d38,b8b012f0e11324314592c2252024710cd9ba284e..4dad912c2c644acdd40503faa2c67cf35279d0c7
@@@ -4,10 -4,11 +4,11 @@@
        <meta charset="utf-8">
        <title>jQuery UI Widget - Default functionality</title>
        <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 -      <script src="../../jquery-1.5.1.js"></script>
 +      <script src="../../jquery-1.6.2.js"></script>
        <script src="../../ui/jquery.ui.core.js"></script>
-       <script src="../../ui/jquery.ui.widget.js"></script>
        <script src="../../ui/jquery.ui.position.js"></script>
+       <script src="../../ui/jquery.ui.widget.js"></script>
+       <script src="../../ui/jquery.ui.button.js"></script>
        <link rel="stylesheet" href="../demos.css">
        <style>
        .custom-colorize {
Simple merge
index ae259d05cb514176875f941647094755a43932da,a69562d3f0e94783d0f3df51464e6a6e54e5f5b7..466713efb2b497a56b7da8f8e0c9b40b7ce435d1
@@@ -1,32 -1,32 +1,32 @@@
- <!DOCTYPE html>
+ <!doctype html>
  <html lang="en">
  <head>
-       <meta charset="UTF-8" />
+       <meta charset="utf-8">
        <title>jQuery UI Autocomplete Test Suite</title>
  
-       <link type="text/css" href="../../../themes/base/jquery.ui.autocomplete.css" rel="stylesheet" />
-       <script type="text/javascript" src="../../../jquery-1.6.2.js"></script>
-       <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
-       <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
-       <script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script>
-       <script type="text/javascript" src="../../../ui/jquery.ui.menu.js"></script>
-       <script type="text/javascript" src="../../../ui/jquery.ui.autocomplete.js"></script>
-       <link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
-       <script type="text/javascript" src="../../../external/qunit.js"></script>
-       <script type="text/javascript" src="../../jquery.simulate.js"></script>
-       <script type="text/javascript" src="../testsuite.js"></script>
-       <script type="text/javascript" src="autocomplete_core.js"></script>
-       <script type="text/javascript" src="autocomplete_defaults.js"></script>
-       <script type="text/javascript" src="autocomplete_events.js"></script>
-       <script type="text/javascript" src="autocomplete_methods.js"></script>
-       <script type="text/javascript" src="autocomplete_options.js"></script>
-       
-       <script type="text/javascript" src="../swarminject.js"></script>
+       <link rel="stylesheet" href="../../../themes/base/jquery.ui.autocomplete.css">
 -      <script src="../../../jquery-1.5.1.js"></script>
++      <script src="../../../jquery-1.6.2.js"></script>
+       <script src="../../../ui/jquery.ui.core.js"></script>
+       <script src="../../../ui/jquery.ui.widget.js"></script>
+       <script src="../../../ui/jquery.ui.position.js"></script>
+       <script src="../../../ui/jquery.ui.menu.js"></script>
+       <script src="../../../ui/jquery.ui.autocomplete.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
+       <script src="autocomplete_defaults.js"></script>
+       <script src="autocomplete_core.js"></script>
+       <script src="autocomplete_events.js"></script>
+       <script src="autocomplete_methods.js"></script>
+       <script src="autocomplete_options.js"></script>
+       <script src="../swarminject.js"></script>
  </head>
- <body id="body">
+ <body>
  
  <h1 id="qunit-header">jQuery UI Autocomplete Test Suite</h1>
  <h2 id="qunit-banner"></h2>
Simple merge
Simple merge
index 0000000000000000000000000000000000000000,a2f8f62ef5d66e5dc18e89abe5f83338b6b7c189..f4ae7ddb503951f3ce29a9561d8a0823362ef017
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,217 +1,217 @@@
 -      <script src="../../../jquery-1.5.1.js"></script>
+ <!doctype html>
+ <html lang="en">
+ <head>
+       <meta charset="utf-8">
+       <title>jQuery UI Effects Test Suite</title>
+       <link rel="stylesheet" href="effects.all.css" type="text/css">
++      <script src="../../../jquery-1.6.2.js"></script>
+       <script src="../../../ui/jquery.effects.core.js"></script>
+       <script src="../../../ui/jquery.effects.blind.js"></script>
+       <script src="../../../ui/jquery.effects.bounce.js"></script>
+       <script src="../../../ui/jquery.effects.clip.js"></script>
+       <script src="../../../ui/jquery.effects.drop.js"></script>
+       <script src="../../../ui/jquery.effects.explode.js"></script>
+       <script src="../../../ui/jquery.effects.fade.js"></script>
+       <script src="../../../ui/jquery.effects.fold.js"></script>
+       <script src="../../../ui/jquery.effects.highlight.js"></script>
+       <script src="../../../ui/jquery.effects.pulsate.js"></script>
+       <script src="../../../ui/jquery.effects.scale.js"></script>
+       <script src="../../../ui/jquery.effects.shake.js"></script>
+       <script src="../../../ui/jquery.effects.slide.js"></script>
+       <script src="../../../ui/jquery.effects.transfer.js"></script>
+       <script src="effects.all.js"></script>
+ </head>
+ <body>
+ <ul class="effects">
+       <li>
+               <div class="effect" id="blindUp">
+                       <p>Blind up</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="blindDown">
+                       <p>Blind down</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="blindLeft">
+                       <p>Blind left</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="blindRight">
+                       <p>Blind right</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="bounce3times">
+               <p>Bounce 3 times</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="clipHorizontally">
+               <p>Clip horizontally</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="clipVertically">
+               <p>Clip vertically</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="dropDown">
+               <p>Drop down</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="dropUp">
+               <p>Drop up</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="dropLeft">
+               <p>Drop left</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="dropRight">
+               <p>Drop right</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="explode9">
+               <p>Explode in 9 pieces</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="explode36">
+               <p>Explode in 36 pieces</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="fade">
+               <p>Fade</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="fold">
+               <p>Fold</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="highlight">
+               <p>Highlight</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="pulsate">
+               <p>Pulsate 2 times</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="puff">
+               <p>Puff</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="scale">
+               <p>Scale</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="shake">
+               <p>Shake</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="size">
+               <p>Size Default Show/Hide</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="sizeToggle">
+               <p>Size Toggle</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="slideDown">
+               <p>Slide down</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="slideUp">
+               <p>Slide up</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="slideLeft">
+               <p>Slide left</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="slideRight">
+               <p>Slide right</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="transfer">
+               <p>Transfer to first element</p>
+               </div>
+       </li>
+       
+       <li>
+               <div class="effect" id="addClass">
+               <p>addClass</p>
+               </div>
+       </li>
+       
+       <li>
+               <div class="effect" id="removeClass">
+               <p>removeClass</p>
+               </div>
+       </li>
+       
+       <li>
+               <div class="effect" id="toggleClass">
+               <p>toggleClass</p>
+               </div>
+       </li>
+       <li>
+               <div class="effect" id="hide">
+               <p>hide/show (jQuery)</p>
+               </div>
+       </li>
+ </ul>
+ </body>
+ </html>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0f80f4fda991a797bba656376ddf57c65c998d25,fd6d92d6b2b60eee5c774f76b56b17c5d701e65b..9af3aa0806ea9d471981191a1c93a893edef077e
@@@ -180,12 -206,10 +208,12 @@@ $.widget( "ui.menubar", 
                if ( !this.active || !this.active.length )
                        return;
                this.active
-                       .menu( "closeAll" )
+                       .menu( "collapseAll" )
                        .hide()
 -                      .attr( "aria-hidden", "true" )
 -                      .attr( "aria-expanded", "false" );
 +                      .attr({
 +                              "aria-hidden": "true",
 +                              "aria-expanded": "false"
 +                      });
                this.active
                        .prev()
                        .removeClass( "ui-state-active" )
                // TODO refactor, almost the same as _close above, but don't remove tabIndex
                if ( this.active ) {
                        this.active
-                               .menu( "closeAll" )
+                               .menu( "collapseAll" )
                                .hide()
 -                              .attr( "aria-hidden", "true" )
 -                              .attr( "aria-expanded", "false" );
 +                              .attr({
 +                                      "aria-hidden": "true",
 +                                      "aria-expanded": "false"
 +                              });
                        this.active
                                .prev()
                                .removeClass( "ui-state-active" );
index b506a641fda261e15f21b1479cb0e340ff555dfb,d455346dcc2d34bbda9e6a9dcbf6c139e7cd94f6..508209a557b99bdc454ea49c9ac78ced701a538f
@@@ -33,19 -33,19 +33,19 @@@ $.widget( "ui.popup", 
                        this.element.attr( "id", "ui-popup-" + idIncrement++ );
                        this.generatedId = true;
                }
-               
                if ( !this.element.attr( "role" ) ) {
                        // TODO alternatives to tooltip are dialog and menu, all three aren't generic popups
-                       this.element.attr( "role", "tooltip" );
+                       this.element.attr( "role", "dialog" );
                        this.generatedRole = true;
                }
-               
                this.options.trigger
 -                      .attr( "aria-haspopup", true )
 +                      .attr( "aria-haspopup", "true" )
                        .attr( "aria-owns", this.element.attr( "id" ) );
-               
                this.element
-                       .addClass("ui-popup")
+                       .addClass( "ui-popup" )
                this.close();
  
                this._bind(this.options.trigger, {
  
                this.element
                        .show()
 -                      .attr( "aria-hidden", false )
 -                      .attr( "aria-expanded", true )
 +                      .attr( "aria-hidden", "false" )
 +                      .attr( "aria-expanded", "true" )
-                       .position( position )
-                       // TODO find a focussable child, otherwise put focus on element, add tabIndex=0 if not focussable
-                       .focus();
+                       .position( position );
  
-               if (this.element.is(":ui-menu")) {
-                       this.element.menu("focus", event, this.element.children( "li" ).first() );
+               if (this.element.is( ":ui-menu" )) { //popup is a menu
+                       this.element.menu( "focus", event, this.element.children( "li" ).first() );
+                       this.element.focus();
+               } else {
+                       // set focus to the first tabbable element in the popup container
+                       // if there are no tabbable elements, set focus on the popup itself
+                       var tabbables = this.element.find( ":tabbable" );
+                       this.removeTabIndex = false;
+                       if ( !tabbables.length ) {
+                               if ( !this.element.is(":tabbable") ) {
+                                       this.element.attr("tabindex", "0");
+                                       this.removeTabIndex = true;
+                               }
+                               tabbables = tabbables.add( this.element[ 0 ] );
+                       }
+                       tabbables.first().focus( 1 );
                }
  
                // take trigger out of tab order to allow shift-tab to skip trigger
        close: function( event ) {
                this.element
                        .hide()
 -                      .attr( "aria-hidden", true )
 -                      .attr( "aria-expanded", false );
 +                      .attr( "aria-hidden", "true" )
 +                      .attr( "aria-expanded", "false" );
  
-               this.options.trigger.attr("tabindex", 0);
+               this.options.trigger.attr( "tabindex" , 0 );
+               if ( this.removeTabIndex ) {
+                       this.element.removeAttr( "tabindex" );
+               }
                this.isOpen = false;
                this._trigger( "close", event );
        }
Simple merge