mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-11-21 11:04:24 +00:00
effects.*: More Style Guidance
This commit is contained in:
parent
61cf834081
commit
bcb8f7ed9a
4
ui/jquery.effects.blind.js
vendored
4
ui/jquery.effects.blind.js
vendored
@ -16,11 +16,11 @@ $.effects.blind = function(o) {
|
|||||||
|
|
||||||
return this.queue(function() {
|
return this.queue(function() {
|
||||||
// Create element
|
// Create element
|
||||||
var el = $(this),
|
var el = $( this ),
|
||||||
props = ['position','top','bottom','left','right'],
|
props = ['position','top','bottom','left','right'],
|
||||||
mode = $.effects.setMode( el, o.mode || 'hide' ),
|
mode = $.effects.setMode( el, o.mode || 'hide' ),
|
||||||
direction = o.direction || 'vertical',
|
direction = o.direction || 'vertical',
|
||||||
ref = (direction == 'vertical') ? 'height' : 'width',
|
ref = ( direction == 'vertical' ) ? 'height' : 'width',
|
||||||
animation = {},
|
animation = {},
|
||||||
wrapper, distance;
|
wrapper, distance;
|
||||||
|
|
||||||
|
39
ui/jquery.effects.explode.js
vendored
39
ui/jquery.effects.explode.js
vendored
@ -12,26 +12,24 @@
|
|||||||
*/
|
*/
|
||||||
(function( $, undefined ) {
|
(function( $, undefined ) {
|
||||||
|
|
||||||
$.effects.explode = function(o) {
|
$.effects.explode = function( o ) {
|
||||||
|
|
||||||
return this.queue(function() {
|
return this.queue( function() {
|
||||||
|
|
||||||
var rows = o.pieces ? Math.round(Math.sqrt(o.pieces)) : 3;
|
var rows = o.pieces ? Math.round(Math.sqrt(o.pieces)) : 3,
|
||||||
var cells = o.pieces ? Math.round(Math.sqrt(o.pieces)) : 3;
|
cells = rows,
|
||||||
|
el = $( this ).show().css( 'visibility', 'hidden' ),
|
||||||
o.mode = o.mode == 'toggle' ? ($(this).is(':visible') ? 'hide' : 'show') : o.mode;
|
mode = $.effects.setMode( el, o.mode || 'hide' ),
|
||||||
var el = $(this).show().css('visibility', 'hidden');
|
offset = el.offset(),
|
||||||
var offset = el.offset();
|
width = el.outerWidth( true ),
|
||||||
|
height = el.outerHeight( true );
|
||||||
|
|
||||||
//Substract the margins - not fixing the problem yet.
|
//Substract the margins - not fixing the problem yet.
|
||||||
offset.top -= parseInt(el.css("marginTop"),10) || 0;
|
offset.top -= parseInt( el.css( "marginTop" ), 10 ) || 0;
|
||||||
offset.left -= parseInt(el.css("marginLeft"),10) || 0;
|
offset.left -= parseInt( el.css( "marginLeft" ), 10 ) || 0;
|
||||||
|
|
||||||
var width = el.outerWidth(true);
|
for( var i = 0; i < rows ; i++ ) { // =
|
||||||
var height = el.outerHeight(true);
|
for( var j = 0; j < cells ; j++ ) { // ||
|
||||||
|
|
||||||
for(var i=0;i<rows;i++) { // =
|
|
||||||
for(var j=0;j<cells;j++) { // ||
|
|
||||||
el
|
el
|
||||||
.clone()
|
.clone()
|
||||||
.appendTo('body')
|
.appendTo('body')
|
||||||
@ -51,11 +49,11 @@ $.effects.explode = function(o) {
|
|||||||
height: height/rows,
|
height: height/rows,
|
||||||
left: offset.left + j*(width/cells) + (o.mode == 'show' ? (j-Math.floor(cells/2))*(width/cells) : 0),
|
left: offset.left + j*(width/cells) + (o.mode == 'show' ? (j-Math.floor(cells/2))*(width/cells) : 0),
|
||||||
top: offset.top + i*(height/rows) + (o.mode == 'show' ? (i-Math.floor(rows/2))*(height/rows) : 0),
|
top: offset.top + i*(height/rows) + (o.mode == 'show' ? (i-Math.floor(rows/2))*(height/rows) : 0),
|
||||||
opacity: o.mode == 'show' ? 0 : 1
|
opacity: mode == 'show' ? 0 : 1
|
||||||
}).animate({
|
}).animate({
|
||||||
left: offset.left + j*(width/cells) + (o.mode == 'show' ? 0 : (j-Math.floor(cells/2))*(width/cells)),
|
left: offset.left + j*(width/cells) + (o.mode == 'show' ? 0 : (j-Math.floor(cells/2))*(width/cells)),
|
||||||
top: offset.top + i*(height/rows) + (o.mode == 'show' ? 0 : (i-Math.floor(rows/2))*(height/rows)),
|
top: offset.top + i*(height/rows) + (o.mode == 'show' ? 0 : (i-Math.floor(rows/2))*(height/rows)),
|
||||||
opacity: o.mode == 'show' ? 1 : 0
|
opacity: mode == 'show' ? 1 : 0
|
||||||
}, o.duration || 500);
|
}, o.duration || 500);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -63,12 +61,13 @@ $.effects.explode = function(o) {
|
|||||||
// Set a timeout, to call the callback approx. when the other animations have finished
|
// Set a timeout, to call the callback approx. when the other animations have finished
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
|
|
||||||
o.mode == 'show' ? el.css({ visibility: 'visible' }) : el.css({ visibility: 'visible' }).hide();
|
el.css({ visibility: 'visible' });
|
||||||
if(o.complete) o.complete.apply(el[0]); // Callback
|
mode != 'show' && el.hide();
|
||||||
|
$.isFunction( o.complete ) && o.complete.apply( el[ 0 ] );
|
||||||
el.dequeue();
|
el.dequeue();
|
||||||
|
|
||||||
|
// Note: This is removing all exploding peices from the dom, rather than the ones for this animation only... Ticket# 6022
|
||||||
$('div.ui-effects-explode').remove();
|
$('div.ui-effects-explode').remove();
|
||||||
|
|
||||||
}, o.duration || 500);
|
}, o.duration || 500);
|
||||||
|
|
||||||
|
|
||||||
|
18
ui/jquery.effects.fade.js
vendored
18
ui/jquery.effects.fade.js
vendored
@ -12,18 +12,20 @@
|
|||||||
*/
|
*/
|
||||||
(function( $, undefined ) {
|
(function( $, undefined ) {
|
||||||
|
|
||||||
$.effects.fade = function(o) {
|
$.effects.fade = function( o ) {
|
||||||
return this.queue(function() {
|
return this.queue( function() {
|
||||||
var elem = $(this),
|
var el = $( this ),
|
||||||
mode = $.effects.setMode(elem, o.options.mode || 'hide');
|
mode = $.effects.setMode( el, o.mode || 'hide' );
|
||||||
|
|
||||||
elem.animate({ opacity: mode }, {
|
el.animate({
|
||||||
|
opacity: mode
|
||||||
|
}, {
|
||||||
queue: false,
|
queue: false,
|
||||||
duration: o.duration,
|
duration: o.duration,
|
||||||
easing: o.options.easing,
|
easing: o.easing,
|
||||||
complete: function() {
|
complete: function() {
|
||||||
(o.callback && o.callback.apply(this, arguments));
|
jQuery.isFunction( o.complete ) && o.complete.apply( this, arguments );
|
||||||
elem.dequeue();
|
el.dequeue();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user