Skip to content
Permalink
Browse files

Merge branch 'master' into selectmenu

  • Loading branch information
fnagel committed Jun 24, 2013
2 parents ab72fd1 + fe9f6ca commit 9992d4626eca1182c9688190ff5642168f2490ec
Showing with 389 additions and 387 deletions.
  1. +5 −0 .travis.yml
  2. +5 −0 AUTHORS.txt
  3. +8 −0 build/effect.json
  4. +0 −14 demos/addClass/index.html
  5. +0 −14 demos/animate/index.html
  6. 0 demos/{addClass/default.html → effect/addClass.html}
  7. 0 demos/{animate/default.html → effect/animate.html}
  8. +2 −0 demos/effect/default.html
  9. 0 demos/{hide/default.html → effect/hide.html}
  10. +8 −0 demos/effect/index.html
  11. 0 demos/{removeClass/default.html → effect/removeClass.html}
  12. 0 demos/{show/default.html → effect/show.html}
  13. 0 demos/{switchClass/default.html → effect/switchClass.html}
  14. 0 demos/{toggle/default.html → effect/toggle.html}
  15. 0 demos/{toggleClass/default.html → effect/toggleClass.html}
  16. +0 −14 demos/hide/index.html
  17. +0 −14 demos/removeClass/index.html
  18. +0 −14 demos/show/index.html
  19. +0 −14 demos/switchClass/index.html
  20. +0 −14 demos/toggle/index.html
  21. +0 −14 demos/toggleClass/index.html
  22. +4 −1 package.json
  23. +1 −11 tests/unit/datepicker/datepicker_test_helpers.js
  24. +30 −0 tests/unit/draggable/draggable_core.js
  25. +2 −0 tests/unit/effects/effects.html
  26. +1 −4 tests/unit/effects/effects_core.js
  27. +13 −0 tests/unit/menu/menu_methods.js
  28. +12 −0 tests/unit/testsuite.js
  29. +1 −1 themes/base/jquery.ui.accordion.css
  30. +1 −1 themes/base/jquery.ui.all.css
  31. +1 −1 themes/base/jquery.ui.autocomplete.css
  32. +1 −1 themes/base/jquery.ui.base.css
  33. +1 −1 themes/base/jquery.ui.button.css
  34. +1 −1 themes/base/jquery.ui.core.css
  35. +1 −1 themes/base/jquery.ui.datepicker.css
  36. +1 −1 themes/base/jquery.ui.dialog.css
  37. +1 −1 themes/base/jquery.ui.menu.css
  38. +1 −1 themes/base/jquery.ui.progressbar.css
  39. +0 −2 themes/base/jquery.ui.resizable.css
  40. +0 −2 themes/base/jquery.ui.selectable.css
  41. +1 −1 themes/base/jquery.ui.slider.css
  42. +1 −1 themes/base/jquery.ui.spinner.css
  43. +1 −1 themes/base/jquery.ui.tabs.css
  44. +1 −1 themes/base/jquery.ui.theme.css
  45. +2 −0 themes/base/jquery.ui.tooltip.css
  46. +5 −0 ui/jquery.ui.draggable.js
  47. +50 −0 ui/jquery.ui.effect-puff.js
  48. +1 −240 ui/jquery.ui.effect-scale.js
  49. +223 −0 ui/jquery.ui.effect-size.js
  50. +3 −1 ui/jquery.ui.menu.js
@@ -0,0 +1,5 @@
language: node_js
node_js:
- "0.8"
before_script:
- npm install -g grunt-cli
@@ -243,3 +243,8 @@ Zaven Muradyan <megalivoithos@gmail.com>
Woody Gilk <shadowhand@deviantart.com>
Zbigniew Motyka <zbigniew.motyka@gmail.com>
Suhail Alkowaileet <xsoh.k7@gmail.com>
Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
David Hansen <hansede@gmail.com>
Brian Grinstead <briangrinstead@gmail.com>
Christian Klammer <christian314159@gmail.com>
Steven Luscher <jquerycla@steveluscher.com>
@@ -23,15 +23,23 @@
"highlight": {
"description": "Highlights the background of an element in a defined color for a custom duration."
},
"puff": {
"dependencies": [ "effect-scale" ],
"description": "Creates a puff effect by scaling the element up and hiding it at the same time."
},
"pulsate": {
"description": "Pulsates an element n times by changing the opacity to zero and back."
},
"scale": {
"dependencies": [ "effect-size" ],
"description": "Grows or shrinks an element and its content. Restores an elemnt to its original size."
},
"shake": {
"description": "Shakes an element horizontally or vertically n times."
},
"size": {
"description": "Resize an element to a specified width and height."
},
"slide": {
"description": "Slides an element in and out of the viewport."
}

This file was deleted.

This file was deleted.

File renamed without changes.
File renamed without changes.
@@ -14,9 +14,11 @@
<script src="../../ui/jquery.ui.effect-fade.js"></script>
<script src="../../ui/jquery.ui.effect-fold.js"></script>
<script src="../../ui/jquery.ui.effect-highlight.js"></script>
<script src="../../ui/jquery.ui.effect-puff.js"></script>
<script src="../../ui/jquery.ui.effect-pulsate.js"></script>
<script src="../../ui/jquery.ui.effect-scale.js"></script>
<script src="../../ui/jquery.ui.effect-shake.js"></script>
<script src="../../ui/jquery.ui.effect-size.js"></script>
<script src="../../ui/jquery.ui.effect-slide.js"></script>
<script src="../../ui/jquery.ui.effect-transfer.js"></script>
<link rel="stylesheet" href="../demos.css">
File renamed without changes.
@@ -9,6 +9,14 @@
<ul>
<li><a href="default.html">Effect showcase</a></li>
<li><a href="easing.html">Easing showcase</a></li>
<li><a href="addClass.html">.addClass()</a></li>
<li><a href="animate.html">.animate()</a></li>
<li><a href="hide.html">.hide()</a></li>
<li><a href="removeClass.html">.removeClass()</a></li>
<li><a href="show.html">.show()</a></li>
<li><a href="switchClass.html">.switchClass()</a></li>
<li><a href="toggle.html">.toggle()</a></li>
<li><a href="toggleClass.html">.toggleClass()</a></li>
</ul>

</body>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -51,10 +51,13 @@
"url": "https://github.com/jquery/jquery-ui/blob/master/MIT-LICENSE.txt"
}
],
"scripts": {
"test": "grunt"
},
"dependencies": {},
"devDependencies": {
"grunt": "0.4.1",
"grunt-contrib-jshint": "0.4.1",
"grunt-contrib-jshint": "0.6.0",
"grunt-contrib-uglify": "0.1.1",
"grunt-contrib-concat": "0.1.3",
"grunt-contrib-qunit": "0.2.0",
@@ -22,16 +22,6 @@ TestHelpers.datepicker = {
var id = $( "<input>" ).appendTo( "#qunit-fixture" );
return TestHelpers.datepicker.init( id, options );
},
onFocus: function( element, onFocus ) {
var fn = function( event ){
if( !event.originalEvent ) {
return;
}
element.unbind( "focus", fn );
onFocus();
};

element.bind( "focus", fn )[ 0 ].focus();
},
onFocus: TestHelpers.onFocus,
PROP_NAME: "datepicker"
};
@@ -185,4 +185,34 @@ test( "#5727: draggable from iframe" , function() {
TestHelpers.draggable.shouldMove( draggable1 );
});

test( "#8399: A draggable should become the active element after you are finished interacting with it, but not before.", function() {
expect( 2 );

var element = $( "<a href='#'>link</a>" ).appendTo( "#qunit-fixture" ).draggable();

$( document ).one( "mousemove", function() {
notStrictEqual( document.activeElement, element.get( 0 ), "moving a draggable anchor did not make it the active element" );
});

TestHelpers.draggable.move( element, 50, 50 );

strictEqual( document.activeElement, element.get( 0 ), "finishing moving a draggable anchor made it the active element" );
});

asyncTest( "#4261: active element should blur when mousing down on a draggable", function() {
expect( 2 );

var textInput = $( "<input>" ).appendTo( "#qunit-fixture" ),
element = $( "#draggable1" ).draggable();

TestHelpers.onFocus( textInput, function() {
strictEqual( document.activeElement, textInput.get( 0 ), "ensure that a focussed text input is the active element before mousing down on a draggable" );

TestHelpers.draggable.move( element, 50, 50 );

notStrictEqual( document.activeElement, textInput.get( 0 ), "ensure the text input is no longer the active element after mousing down on a draggable" );
start();
});
});

})( jQuery );
@@ -21,9 +21,11 @@
"ui/jquery.ui.effect-fade.js",
"ui/jquery.ui.effect-fold.js",
"ui/jquery.ui.effect-highlight.js",
"ui/jquery.ui.effect-puff.js",
"ui/jquery.ui.effect-pulsate.js",
"ui/jquery.ui.effect-scale.js",
"ui/jquery.ui.effect-shake.js",
"ui/jquery.ui.effect-size.js",
"ui/jquery.ui.effect-slide.js",
"ui/jquery.ui.effect-transfer.js"
]
@@ -217,10 +217,7 @@ asyncTest( "animateClass: css and class changes during animation are not lost (#
$.each( $.effects.effect, function( effect ) {
module( "effects." + effect );

// puff and size are defined inside scale
if ( effect !== "puff" && effect !== "size" ) {
TestHelpers.testJshint( "effect-" + effect );
}
TestHelpers.testJshint( "effect-" + effect );

if ( effect === "transfer" ) {
return;
@@ -69,6 +69,19 @@ test( "refresh submenu", function() {
equal( element.find( "ul:first .ui-menu-item" ).length, 4 );
});

test( "refresh icons (see #9377)", function() {
expect( 3 );
var element = $( "#menu1" ).menu();
ok( !element.hasClass( "ui-menu-icons") );
element.find( "li:first a" ).html( "<span class='ui-icon ui-icon-disk'></span>Save</a>" );
element.menu( "refresh" );

ok( element.hasClass( "ui-menu-icons" ) );
element.find( "li:first a" ).html( "Save" );
element.menu( "refresh" );
ok( !element.hasClass( "ui-menu-icons") );
});

test( "widget", function() {
expect( 2 );
var element = $( "#menu1" ).menu(),
@@ -175,6 +175,18 @@ TestHelpers.commonWidgetTests = function( widget, settings ) {
});
};

TestHelpers.onFocus= function( element, onFocus ) {
var fn = function( event ){
if( !event.originalEvent ) {
return;
}
element.unbind( "focus", fn );
onFocus();
};

element.bind( "focus", fn )[ 0 ].focus();
};

/*
* Taken from https://github.com/jquery/qunit/tree/master/addons/close-enough
*/
@@ -6,7 +6,7 @@
* Released under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Accordion#theming
* http://api.jqueryui.com/accordion/#theming
*/
.ui-accordion .ui-accordion-header {
display: block;
@@ -6,7 +6,7 @@
* Released under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Theming
* http://api.jqueryui.com/category/theming/
*/
@import "jquery.ui.base.css";
@import "jquery.ui.theme.css";
@@ -6,7 +6,7 @@
* Released under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Autocomplete#theming
* http://api.jqueryui.com/autocomplete/#theming
*/
.ui-autocomplete {
position: absolute;
@@ -6,7 +6,7 @@
* Released under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Theming
* http://api.jqueryui.com/category/theming/
*/
@import url("jquery.ui.core.css");

@@ -6,7 +6,7 @@
* Released under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Button#theming
* http://api.jqueryui.com/button/#theming
*/
.ui-button {
display: inline-block;
@@ -6,7 +6,7 @@
* Released under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Theming/API
* http://api.jqueryui.com/category/theming/
*/

/* Layout helpers
@@ -6,7 +6,7 @@
* Released under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Datepicker#theming
* http://api.jqueryui.com/datepicker/#theming
*/
.ui-datepicker {
width: 17em;
@@ -6,7 +6,7 @@
* Released under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Dialog#theming
* http://api.jqueryui.com/dialog/#theming
*/
.ui-dialog {
position: absolute;
@@ -6,7 +6,7 @@
* Released under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Menu#theming
* http://api.jqueryui.com/menu/#theming
*/
.ui-menu {
list-style: none;

0 comments on commit 9992d46

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