Skip to content
Permalink
Browse files

Merge branch 'master' into selectmenu

  • Loading branch information...
fnagel committed Nov 28, 2012
2 parents 4e68c52 + 37ea734 commit 36533a718da41d4dc82286d2b7ff52a34481dbbb
Showing with 937 additions and 590 deletions.
  1. +17 −1 AUTHORS.txt
  2. +4 −5 build/release/release.js
  3. +1 −0 build/tasks/testswarm.js
  4. +12 −16 demos/autocomplete/combobox.html
  5. +6 −1 demos/button/toolbar.html
  6. +1 −0 demos/dialog/animated.html
  7. +1 −0 demos/dialog/default.html
  8. +1 −0 demos/dialog/modal-confirmation.html
  9. +4 −3 demos/dialog/modal-form.html
  10. +1 −0 demos/dialog/modal-message.html
  11. +1 −0 demos/dialog/modal.html
  12. +1 −1 grunt.js
  13. +1 −0 tests/unit/all.html
  14. +15 −2 tests/unit/autocomplete/autocomplete_options.js
  15. +1 −0 tests/unit/button/button.html
  16. +16 −0 tests/unit/button/button_core.js
  17. +15 −0 tests/unit/dialog/dialog.html
  18. +12 −2 tests/unit/dialog/dialog_common.js
  19. +65 −14 tests/unit/dialog/dialog_core.js
  20. +62 −0 tests/unit/dialog/dialog_deprecated.html
  21. +53 −0 tests/unit/dialog/dialog_deprecated.js
  22. +61 −0 tests/unit/dialog/dialog_events.js
  23. +17 −40 tests/unit/dialog/dialog_methods.js
  24. +41 −76 tests/unit/dialog/dialog_options.js
  25. +30 −29 tests/unit/dialog/dialog_tickets.js
  26. +1 −1 tests/unit/resizable/resizable_common.js
  27. +9 −1 tests/unit/tabs/tabs_options.js
  28. +14 −0 tests/unit/tooltip/tooltip_options.js
  29. +1 −0 tests/visual/dialog/animated.html
  30. +31 −5 tests/visual/dialog/complex-dialogs.html
  31. +1 −0 tests/visual/dialog/form.html
  32. +1 −0 tests/visual/dialog/performance.html
  33. +1 −5 themes/base/jquery.ui.button.css
  34. +5 −12 themes/base/jquery.ui.datepicker.css
  35. +2 −10 themes/base/jquery.ui.dialog.css
  36. +1 −1 themes/base/jquery.ui.progressbar.css
  37. +2 −16 themes/base/jquery.ui.theme.css
  38. +9 −1 ui/jquery.ui.autocomplete.js
  39. +0 −2 ui/jquery.ui.button.js
  40. +2 −16 ui/jquery.ui.datepicker.js
  41. +352 −277 ui/jquery.ui.dialog.js
  42. +59 −51 ui/jquery.ui.effect.js
  43. +2 −1 ui/jquery.ui.resizable.js
  44. +2 −0 ui/jquery.ui.tabs.js
  45. +3 −1 ui/jquery.ui.tooltip.js
@@ -1,4 +1,4 @@
Authors ordered by first contribution
Authors ordered by first contribution
A list of current team members is available at http://jqueryui.com/about

Paul Bakaus <paul.bakaus@googlemail.com>
@@ -208,3 +208,19 @@ Sindre Sorhus <sindresorhus@gmail.com>
Bernhard Sirlinger <bernhard.sirlinger@tele2.de>
Jared A. Scheel <jared@jaredscheel.com>
Rafael Xavier de Souza <rxaviers@gmail.com>
John Chen <zhang.z.chen@intel.com>
Dale Kocian <dale.kocian@gmail.com>
Mike Sherov <mike.sherov@gmail.com>
Andrew Couch <andy@couchand.com>
Marc-Andre Lafortune <github@marc-andre.ca>
Nate Eagle <nate.eagle@teamaol.com>
David Souther <davidsouther@gmail.com>
Mathias Stenbom <mathias@stenbom.com>
Avinash R <nashpapa@gmail.com>
Sergey Kartashov <ebishkek@yandex.ru>
Ethan Romba <ethanromba@gmail.com>
Cory Gackenheimer <cory.gack@gmail.com>
Juan Pablo Kaniefsky <jpkaniefsky@gmail.com>
Roman Salnikov <bardt.dz@gmail.com>
Anika Henke <anika@selfthinker.org>
Samuel Bovée <samycookie2000@yahoo.fr>
@@ -262,8 +262,9 @@ function gatherContributors() {

function updateTrac() {
echo( newVersion.cyan + " was tagged at " + tagTime.cyan + "." );
echo( "Close the " + newVersion.cyan + " Milestone with the above date and time." );
echo( "Create the " + newVersion.cyan + " Version with the above date and time." );
echo( "Close the " + newVersion.cyan + " Milestone." );
echo( "Create the " + newVersion.cyan + " Version." );
echo( "When Trac asks for date and time, match the above. Should only change minutes and seconds." );
echo( "Create a Milestone for the next minor release." );
}

@@ -342,9 +343,7 @@ function bootstrap( fn ) {
fs.mkdirSync( baseDir );

console.log( "Installing dependencies..." );
require( "child_process" ).exec( "npm install shelljs colors", {
cwd: baseDir
}, function( error ) {
require( "child_process" ).exec( "npm install shelljs colors", function( error ) {
if ( error ) {
console.log( error );
return process.exit( 1 );
@@ -15,6 +15,7 @@ var versions = {
"Core": "core/core.html",
"Datepicker": "datepicker/datepicker.html",
"Dialog": "dialog/dialog.html",
"Dialog_deprecated": "dialog/dialog_deprecated.html",
"Draggable": "draggable/draggable.html",
"Droppable": "droppable/droppable.html",
"Effects": "effects/effects.html",
@@ -24,7 +24,7 @@
bottom: 0;
margin-left: -1px;
padding: 0;
/* adjust styles for IE 6/7 */
/* support: IE7 */
*height: 1.7em;
*top: 0.1em;
}
@@ -46,7 +46,7 @@
.addClass( "ui-combobox" )
.insertAfter( select );
function removeIfInvalid(element) {
function removeIfInvalid( element ) {
var value = $( element ).val(),
matcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( value ) + "$", "i" ),
valid = false;
@@ -56,6 +56,7 @@
return false;
}
});
if ( !valid ) {
// remove invalid value, as it didn't match anything
$( element )
@@ -66,8 +67,7 @@
setTimeout(function() {
input.tooltip( "close" ).attr( "title", "" );
}, 2500 );
input.data( "autocomplete" ).term = "";
return false;
input.data( "ui-autocomplete" ).term = "";
}
}
@@ -103,13 +103,14 @@
});
},
change: function( event, ui ) {
if ( !ui.item )
return removeIfInvalid( this );
if ( !ui.item ) {
removeIfInvalid( this );
}
}
})
.addClass( "ui-widget ui-widget-content ui-corner-left" );
input.data( "autocomplete" )._renderItem = function( ul, item ) {
input.data( "ui-autocomplete" )._renderItem = function( ul, item ) {
return $( "<li>" )
.append( "<a>" + item.label + "</a>" )
.appendTo( ul );
@@ -144,19 +145,14 @@
input.focus();
});
input
.tooltip({
position: {
of: this.button
},
tooltipClass: "ui-state-highlight"
});
input.tooltip({
tooltipClass: "ui-state-highlight"
});
},
destroy: function() {
_destroy: function() {
this.wrapper.remove();
this.element.show();
$.Widget.prototype.destroy.call( this );
}
});
})( jQuery );
@@ -11,7 +11,12 @@
<link rel="stylesheet" href="../demos.css">
<style>
#toolbar {
padding: 10px 4px;
padding: 11px 4px 9px 4px;
}
/* support: IE7 */
*:first-child+html #toolbar {
padding: 4px 0px 4px 5px;
}
</style>
<script>
@@ -11,6 +11,7 @@
<script src="../../ui/jquery.ui.draggable.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.resizable.js"></script>
<script src="../../ui/jquery.ui.button.js"></script>
<script src="../../ui/jquery.ui.dialog.js"></script>
<script src="../../ui/jquery.ui.effect.js"></script>
<script src="../../ui/jquery.ui.effect-blind.js"></script>
@@ -11,6 +11,7 @@
<script src="../../ui/jquery.ui.draggable.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.resizable.js"></script>
<script src="../../ui/jquery.ui.button.js"></script>
<script src="../../ui/jquery.ui.dialog.js"></script>
<link rel="stylesheet" href="../demos.css">
<script>
@@ -11,6 +11,7 @@
<script src="../../ui/jquery.ui.button.js"></script>
<script src="../../ui/jquery.ui.draggable.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.button.js"></script>
<script src="../../ui/jquery.ui.dialog.js"></script>
<link rel="stylesheet" href="../demos.css">
<script>
@@ -12,6 +12,7 @@
<script src="../../ui/jquery.ui.draggable.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.resizable.js"></script>
<script src="../../ui/jquery.ui.button.js"></script>
<script src="../../ui/jquery.ui.dialog.js"></script>
<script src="../../ui/jquery.ui.effect.js"></script>
<link rel="stylesheet" href="../demos.css">
@@ -86,10 +87,10 @@
if ( bValid ) {
$( "#users tbody" ).append( "<tr>" +
"<td>" + name.val() + "</td>" +
"<td>" + email.val() + "</td>" +
"<td>" + name.val() + "</td>" +
"<td>" + email.val() + "</td>" +
"<td>" + password.val() + "</td>" +
"</tr>" );
"</tr>" );
$( this ).dialog( "close" );
}
},
@@ -12,6 +12,7 @@
<script src="../../ui/jquery.ui.draggable.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.resizable.js"></script>
<script src="../../ui/jquery.ui.button.js"></script>
<script src="../../ui/jquery.ui.dialog.js"></script>
<link rel="stylesheet" href="../demos.css">
<script>
@@ -11,6 +11,7 @@
<script src="../../ui/jquery.ui.draggable.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.resizable.js"></script>
<script src="../../ui/jquery.ui.button.js"></script>
<script src="../../ui/jquery.ui.dialog.js"></script>
<link rel="stylesheet" href="../demos.css">
<script>
@@ -282,7 +282,7 @@ grunt.initConfig({
files: grunt.file.expandFiles( "tests/unit/**/*.html" ).filter(function( file ) {
// disabling everything that doesn't (quite) work with PhantomJS for now
// TODO except for all|index|test, try to include more as we go
return !( /(all|index|test|dialog|tabs|tooltip)\.html$/ ).test( file );
return !( /(all|index|test|dialog|dialog_deprecated|tabs|tooltip)\.html$/ ).test( file );
})
},
lint: {
@@ -22,6 +22,7 @@
"core/core.html",
"datepicker/datepicker.html",
"dialog/dialog.html",
"dialog/dialog_deprecated.html",
"draggable/draggable.html",
"droppable/droppable.html",
"effects/effects.html",
@@ -5,8 +5,9 @@ module( "autocomplete: options" );
var data = [ "c++", "java", "php", "coldfusion", "javascript", "asp", "ruby", "python", "c", "scala", "groovy", "haskell", "perl" ];

test( "appendTo", function() {
expect( 5 );
var element = $( "#autocomplete" ).autocomplete();
expect( 7 );
var detached = $( "<div>" ),
element = $( "#autocomplete" ).autocomplete();
equal( element.autocomplete( "widget" ).parent()[0], document.body, "defaults to body" );
element.autocomplete( "destroy" );

@@ -26,6 +27,18 @@ test( "appendTo", function() {
element.autocomplete().autocomplete( "option", "appendTo", "#ac-wrap1" );
equal( element.autocomplete( "widget" ).parent()[0], $( "#ac-wrap1" )[0], "modified after init" );
element.autocomplete( "destroy" );

element.autocomplete({
appendTo: detached
});
equal( element.autocomplete( "widget" ).parent()[0], detached[0], "detached jQuery object" );
element.autocomplete( "destroy" );

element.autocomplete({
appendTo: detached[0]
});
equal( element.autocomplete( "widget" ).parent()[0], detached[0], "detached DOM element" );
element.autocomplete( "destroy" );
});

function autoFocusTest( afValue, focusedLength ) {
@@ -68,6 +68,7 @@ <h2 id="qunit-userAgent"></h2>
</form>

<input type="checkbox" id="check"><label for="check">Toggle</label>
<input type="checkbox" id="check2"><label for="check2">Checkbox</label>

<div><input id="submit" type="submit" value="Label"></div>

@@ -88,4 +88,20 @@ test("buttonset (rtl)", function() {
ok( set.children("label:eq(2)").is(".ui-button.ui-corner-left:not(.ui-corner-all)") );
});

// TODO: simulated click events don't behave like real click events in IE
// remove this when simulate properly simulates this
// see http://yuilibrary.com/projects/yui2/ticket/2528826 fore more info
if ( !$.ui.ie || ( document.documentMode && document.documentMode > 8 ) ) {
test( "ensure checked and aria after single click on checkbox label button, see #5518", function() {
expect( 3 );

$("#check2").button().change( function() {
var lbl = $( this ).button("widget");
ok( this.checked, "checked ok" );
ok( lbl.attr("aria-pressed") === "true", "aria ok" );
ok( lbl.hasClass("ui-state-active"), "ui-state-active ok" );
}).button("widget").simulate("mousedown").simulate("click").simulate("mouseup");
});
}

})(jQuery);
@@ -5,6 +5,9 @@
<title>jQuery UI Dialog Test Suite</title>

<script src="../../jquery.js"></script>
<script>
$.uiBackCompat = false;
</script>
<link rel="stylesheet" href="../../../external/qunit.css">
<script src="../../../external/qunit.js"></script>
<script src="../../jquery.simulate.js"></script>
@@ -19,6 +22,7 @@
"ui/jquery.ui.mouse.js",
"ui/jquery.ui.draggable.js",
"ui/jquery.ui.resizable.js",
"ui/jquery.ui.button.js",
"ui/jquery.ui.dialog.js"
]
});
@@ -44,6 +48,17 @@ <h2 id="qunit-userAgent"></h2>
<div id="qunit-fixture">
<div id="dialog1"></div>
<div id="dialog2"></div>
<div id="form-dialog" title="Profile Information">
<fieldset>
<legend>Please share some personal information</legend>
<label for="favorite-animal">Your favorite animal</label><input id="favorite-animal">
<label for="favorite-color">Your favorite color</label><input id="favorite-color">
</fieldset>
<div role="group" aria-describedby="section2">
<p id="section2">Some more (optional) information</p>
<label for="favorite-food">Favorite food</label><input id="favorite-food">
</div>
</div>
</div>
</body>
</html>
@@ -23,10 +23,20 @@ TestHelpers.commonWidgetTests( "dialog", {
},
resizable: true,
show: null,
title: '',
title: null,
width: 300,

// callbacks
create: null
beforeClose: null,
close: null,
create: null,
drag: null,
dragStart: null,
dragStop: null,
focus: null,
open: null,
resize: null,
resizeStart: null,
resizeStop: null
}
});

0 comments on commit 36533a7

Please sign in to comment.
You can’t perform that action at this time.