diff --git a/demos/index.html b/demos/index.html
index 69767febf8..76ddcd3daa 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -20,8 +20,6 @@
-
-
@@ -111,7 +109,7 @@
@@ -285,8 +283,6 @@
Datepicker Dialog Menu Menubar Popup Progressbar Slider Spinner Widget About jQuery UI
Getting Started Upgrade Guide Upgrade Guide Changelog Roadmap Subversion Access
These demos showcase some common uses of each jQuery UI plugin. Simply copy and paste code from the demos to get started. Have fun playing with them.
-
+
diff --git a/demos/menu/contextmenu.html b/demos/menu/contextmenu.html
deleted file mode 100644
index 33e07f7ecd..0000000000
--- a/demos/menu/contextmenu.html
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
- jQuery UI Menu - Contextmenu demo
-
-
-
Select a city
-
-
-
-
-
-
-
A simple contextmenu: Click the button, or tab to it and hit space to open the menu. Use the mouse or cursor keys to select an item, click it or hit enter to select it.
-
-
The keyboard handling is part of the menu. Using the input option to menu is configured to add the key event handlers to the button, as that button gets focused when clicked.
-
-
jQuery UI Menubar - Default demo
- jQuery UI Menubar Demos
- jQuery UI Popup - Animation demo
-
-
-
A link to a login form that opens as a popup. Open and close animations have been used.
-
-
jQuery UI Popup - Default demo
-
-
-
A link to a login form that opens as a popup.
-
-
jQuery UI Popup Demos
- jQuery UI Popup - Menu as Popup in table demo
-
-
-
Poup menu in a table. Works okay standalone, not so much in the scrolling demo view. For that to work better, position() would have to take the closest scrolled parent into account for collision detection.
-
-
jQuery UI Popup - Popup Menu
-
-
-
Show context menu 1
-
-
-
-
-
-
Run last action
-
Select an action
-
-
-
-
-
-
-
-
Make the popup a menu (or the menu a popup) and you get context menus.
-
-
jQuery UI Popup - Tooltip style demo
-
-
-
-
This is some more info and there is even more info on
this page .
-
-
-
-
A "more info" popup that works on mouseover (tooltip).
-
-
Share
Flag as inappropiate
diff --git a/tests/unit/spinner/spinner_options.js b/tests/unit/spinner/spinner_options.js
index 81f434fc6e..0be59bd077 100644
--- a/tests/unit/spinner/spinner_options.js
+++ b/tests/unit/spinner/spinner_options.js
@@ -144,24 +144,56 @@ test( "max", function() {
equals( element.val(), 1000, "value not constrained on init" );
element.spinner( "value", 1000 );
- equals( element.val(), 100, "max constrained if value method is greater" );
+ equals( element.val(), 100, "max constrained in value method" );
element.val( 1000 ).blur();
equals( element.val(), 1000, "max not constrained if manual entry" );
});
+test( "max, string", function() {
+ expect( 3 );
+ var element = $( "#spin" )
+ .val( 1000 )
+ .spinner({
+ max: "$100.00",
+ numberFormat: "C",
+ culture: "en"
+ });
+ equals( element.val(), "$1,000.00", "value not constrained on init" );
+ equals( element.spinner( "option", "max" ), 100, "option converted to number" );
+
+ element.spinner( "value", 1000 );
+ equals( element.val(), "$100.00", "max constrained in value method" );
+});
+
test( "min", function() {
expect( 3 );
var element = $( "#spin" ).val( -1000 ).spinner({ min: -100 });
equals( element.val(), -1000, "value not constrained on init" );
element.spinner( "value", -1000 );
- equals( element.val(), -100, "min constrained if value method is greater" );
+ equals( element.val(), -100, "min constrained in value method" );
element.val( -1000 ).blur();
equals( element.val(), -1000, "min not constrained if manual entry" );
});
+test( "min, string", function() {
+ expect( 3 );
+ var element = $( "#spin" )
+ .val( -1000 )
+ .spinner({
+ min: "-$100.00",
+ numberFormat: "C",
+ culture: "en"
+ });
+ equals( element.val(), "($1,000.00)", "value not constrained on init" );
+ equals( element.spinner( "option", "min" ), -100, "option converted to number" );
+
+ element.spinner( "value", -1000 );
+ equals( element.val(), "($100.00)", "min constrained in value method")
+});
+
test( "step, 2", function() {
expect( 3 );
var element = $( "#spin" ).val( 0 ).spinner({ step: 2 });
@@ -187,4 +219,18 @@ test( "step, 0.7", function() {
equals( element.val(), "0.7", "stepUp" );
});
+test( "step, string", function() {
+ expect( 2 );
+ var element = $("#spin").val( 0 ).spinner({
+ step: "$0.70",
+ numberFormat: "C",
+ culture: "en"
+ });
+
+ equals( element.spinner( "option", "step" ), 0.7, "option converted to number" );
+
+ element.spinner( "stepUp" );
+ equals( element.val(), "$0.70", "stepUp" );
+});
+
})( jQuery );
diff --git a/themes/base/jquery.ui.base.css b/themes/base/jquery.ui.base.css
index 6973ff0f03..accac0e126 100644
--- a/themes/base/jquery.ui.base.css
+++ b/themes/base/jquery.ui.base.css
@@ -15,7 +15,6 @@
@import url("jquery.ui.datepicker.css");
@import url("jquery.ui.dialog.css");
@import url("jquery.ui.menu.css");
-@import url("jquery.ui.menubar.css");
@import url("jquery.ui.progressbar.css");
@import url("jquery.ui.resizable.css");
@import url("jquery.ui.selectable.css");
diff --git a/themes/base/jquery.ui.menubar.css b/themes/base/jquery.ui.menubar.css
deleted file mode 100644
index 8b175f28a1..0000000000
--- a/themes/base/jquery.ui.menubar.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * jQuery UI Menubar @VERSION
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- */
-.ui-menubar { list-style: none; margin: 0; padding-left: 0; }
-
-.ui-menubar-item { float: left; }
-
-.ui-menubar .ui-button { float: left; font-weight: normal; border-top-width: 0 !important; border-bottom-width: 0 !important; margin: 0; outline: none; }
-.ui-menubar .ui-menubar-link { border-right: 1px dashed transparent; border-left: 1px dashed transparent; }
-
-.ui-menubar .ui-menu { width: 200px; position: absolute; z-index: 9999; font-weight: normal; }
diff --git a/ui/jquery.effects.blind.js b/ui/jquery.effects.blind.js
index 5f86bed7b2..0380b262ad 100644
--- a/ui/jquery.effects.blind.js
+++ b/ui/jquery.effects.blind.js
@@ -27,7 +27,7 @@ $.effects.effect.blind = function( o, done ) {
motion = rpositivemotion.test( direction ),
animation = {},
show = mode === "show",
- wrapper, distance;
+ wrapper, distance, margin;
// if already wrapped, the wrapper's properties are my property. #6245
if ( el.parent().is( ".ui-effects-wrapper" ) ) {
@@ -41,21 +41,23 @@ $.effects.effect.blind = function( o, done ) {
});
distance = wrapper[ ref ]();
+ margin = parseFloat( wrapper.css( ref2 ) );
animation[ ref ] = show ? distance : 0;
if ( !motion ) {
el
.css( vertical ? "bottom" : "right", 0 )
- .css( vertical ? "top" : "left", "" )
+ .css( vertical ? "top" : "left", "auto" )
.css({ position: "absolute" });
- animation[ ref2 ] = show ? 0 : distance;
+
+ animation[ ref2 ] = show ? margin : distance + margin;
}
// start at 0 if we are showing
if ( show ) {
wrapper.css( ref, 0 );
if ( ! motion ) {
- wrapper.css( ref2, distance );
+ wrapper.css( ref2, margin + distance );
}
}
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index 4fac02d2a6..83ea3c3c07 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -24,8 +24,7 @@ $.widget( "ui.menu", {
position: {
my: "left top",
at: "right top"
- },
- trigger: null
+ }
},
_create: function() {
this.activeMenu = this.element;
@@ -214,24 +213,10 @@ $.widget( "ui.menu", {
}
}
});
-
- if ( this.options.trigger ) {
- this.element.popup({
- trigger: this.options.trigger,
- managed: true,
- focusPopup: $.proxy( function( event, ui ) {
- this.focus( event, this.element.children( ".ui-menu-item" ).first() );
- this.element.focus( 1 );
- }, this)
- });
- }
},
_destroy: function() {
//destroy (sub)menus
- if ( this.options.trigger ) {
- this.element.popup( "destroy" );
- }
this.element
.removeAttr( "aria-activedescendant" )
.find( ".ui-menu" )
@@ -533,10 +518,6 @@ $.widget( "ui.menu", {
item: this.active
};
this.collapseAll( event, true );
- if ( this.options.trigger ) {
- $( this.options.trigger ).focus( 1 );
- this.element.popup( "close" );
- }
this._trigger( "select", event, ui );
}
});
diff --git a/ui/jquery.ui.menubar.js b/ui/jquery.ui.menubar.js
deleted file mode 100644
index 6bc03ba4da..0000000000
--- a/ui/jquery.ui.menubar.js
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * jQuery UI Menubar @VERSION
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Menubar
- *
- * Depends:
- * jquery.ui.core.js
- * jquery.ui.widget.js
- * jquery.ui.position.js
- * jquery.ui.menu.js
- */
-(function( $ ) {
-
-// TODO when mixing clicking menus and keyboard navigation, focus handling is broken
-// there has to be just one item that has tabindex
-$.widget( "ui.menubar", {
- version: "@VERSION",
- options: {
- autoExpand: false,
- buttons: false,
- items: "li",
- menuElement: "ul",
- menuIcon: false,
- position: {
- my: "left top",
- at: "left bottom"
- }
- },
- _create: function() {
- var that = this;
- this.menuItems = this.element.children( this.options.items );
- this.items = this.menuItems.children( "button, a" );
-
- this.menuItems
- .addClass( "ui-menubar-item" )
- .attr( "role", "presentation" );
- // let only the first item receive focus
- this.items.slice(1).attr( "tabIndex", -1 );
-
- this.element
- .addClass( "ui-menubar ui-widget-header ui-helper-clearfix" )
- .attr( "role", "menubar" );
- this._focusable( this.items );
- this._hoverable( this.items );
- this.items.siblings( this.options.menuElement )
- .menu({
- position: {
- within: this.options.position.within
- },
- select: function( event, ui ) {
- ui.item.parents( "ul.ui-menu:last" ).hide();
- that._close();
- // TODO what is this targetting? there's probably a better way to access it
- $(event.target).prev().focus();
- that._trigger( "select", event, ui );
- },
- menus: that.options.menuElement
- })
- .hide()
- .attr({
- "aria-hidden": "true",
- "aria-expanded": "false"
- })
- .bind( "keydown.menubar", function( event ) {
- var menu = $( this );
- if ( menu.is( ":hidden" ) )
- return;
- switch ( event.keyCode ) {
- case $.ui.keyCode.LEFT:
- that.previous( event );
- event.preventDefault();
- break;
- case $.ui.keyCode.RIGHT:
- that.next( event );
- event.preventDefault();
- break;
- };
- });
- this.items.each(function() {
- var input = $(this),
- // TODO menu var is only used on two places, doesn't quite justify the .each
- menu = input.next( that.options.menuElement );
-
- input.bind( "click.menubar focus.menubar mouseenter.menubar", function( event ) {
- // ignore triggered focus event
- if ( event.type == "focus" && !event.originalEvent ) {
- return;
- }
- event.preventDefault();
- // TODO can we simplify or extractthis check? especially the last two expressions
- // there's a similar active[0] == menu[0] check in _open
- if ( event.type == "click" && menu.is( ":visible" ) && that.active && that.active[0] == menu[0] ) {
- that._close();
- return;
- }
- if ( ( that.open && event.type == "mouseenter" ) || event.type == "click" || that.options.autoExpand ) {
- if( that.options.autoExpand ) {
- clearTimeout( that.closeTimer );
- }
-
- that._open( event, menu );
- }
- })
- .bind( "keydown", function( event ) {
- switch ( event.keyCode ) {
- case $.ui.keyCode.SPACE:
- case $.ui.keyCode.UP:
- case $.ui.keyCode.DOWN:
- that._open( event, $( this ).next() );
- event.preventDefault();
- break;
- case $.ui.keyCode.LEFT:
- that.previous( event );
- event.preventDefault();
- break;
- case $.ui.keyCode.RIGHT:
- that.next( event );
- event.preventDefault();
- break;
- }
- })
- .addClass( "ui-button ui-widget ui-button-text-only ui-menubar-link" )
- .attr( "role", "menuitem" )
- .attr( "aria-haspopup", "true" )
- .wrapInner( "