Mirrors
/
Vestride_Shuffle
mirror of https://github.com/Vestride/Shuffle.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Prefix remaining private methods which didn't have an underscore with an underscore. #16 #17

Browse Source
pull/56/head
Glen Cheney 10 years ago
parent af08bc2908
commit 60e156d274
5 changed files with 86 additions and 92 deletions
Show Stats Download Patch File Download Diff File

58
dist/jquery.shuffle.js vendored
Unescape Escape View File

@ -494,7 +494,7 @@ Shuffle.prototype = {
_layout: function( items, fn, isOnlyPosition, isHide ) {
var self = this;
fn = fn || self.filterEnd;
fn = fn || self._filterEnd;
self.layoutTransitionEnded = false;
$.each(items, function(index, item) {
@ -557,14 +557,14 @@ Shuffle.prototype = {
_reLayout : function( callback, isOnlyPosition ) {
var self = this;
callback = callback || self.filterEnd;
callback = callback || self._filterEnd;
self._resetCols();
// If we've already sorted the elements, keep them sorted
if ( self.keepSorted && self.lastSort ) {
self.sort( self.lastSort, true, isOnlyPosition );
} else {
self._layout( self.$items.filter('.filtered').get(), self.filterEnd, isOnlyPosition );
self._layout( self.$items.filter('.filtered').get(), self._filterEnd, isOnlyPosition );
}
},
@ -630,7 +630,7 @@ Shuffle.prototype = {
var self = this,
$concealed = $collection || self.$items.filter('.concealed'),
transitionObj = {},
callback = fn || self.shrinkEnd;
callback = fn || self._shrinkEnd;
// Abort if no items
if ( !$concealed.length ) {
@ -683,15 +683,12 @@ Shuffle.prototype = {
* @param {jQuery} opts.$this jQuery object representing the current item
* @param {number} opts.x translate's x
* @param {number} opts.y translate's y
* @param {string} opts.left left position (used when no transforms available)
* @param {string} opts.top top position (used when no transforms available)
* @param {number} opts.scale amount to scale the item
* @param {number} opts.opacity opacity of the item
* @param {string} opts.height the height of the item (used when no transforms available)
* @param {string} opts.width the width of the item (used when no transforms available)
* @param {Function} opts.callback complete function for the animation
* @private
*/
transition: function(opts) {
_transition: function(opts) {
var self = this,
transform,
// Only fire callback once per collection's transition
@ -753,10 +750,10 @@ Shuffle.prototype = {
if ( transitionObj.skipTransition ) {
self._skipTransition( transitionObj.$this[0], function() {
self.transition( transitionObj );
self._transition( transitionObj );
});
} else {
self.transition( transitionObj );
self._transition( transitionObj );
}
});
@ -764,15 +761,15 @@ Shuffle.prototype = {
self.styleQueue.length = 0;
},
shrinkEnd: function() {
_shrinkEnd: function() {
this._fire( Shuffle.EventType.SHRUNK );
},
filterEnd: function() {
_filterEnd: function() {
this._fire( Shuffle.EventType.FILTERED );
},
sortEnd: function() {
_sortEnd: function() {
this._fire( Shuffle.EventType.SORTED );
},
@ -781,25 +778,26 @@ Shuffle.prototype = {
* @param {Element} element DOM element that won't be transitioned
* @param {(string|Function)} property The new style property which will be set or a function which will be called
* @param {string} [value] The value that `property` should be.
* @private
*/
_skipTransition : function( element, property, value ) {
var reflow,
duration = element.style[ TRANSITION_DURATION ];
var reflow,
duration = element.style[ TRANSITION_DURATION ];
// Set the duration to zero so it happens immediately
element.style[ TRANSITION_DURATION ] = '0ms'; // ms needed for firefox!
// Set the duration to zero so it happens immediately
element.style[ TRANSITION_DURATION ] = '0ms'; // ms needed for firefox!
if ( $.isFunction( property ) ) {
property();
} else {
element.style[ property ] = value;
}
if ( $.isFunction( property ) ) {
property();
} else {
element.style[ property ] = value;
}
// Force reflow
reflow = element.offsetWidth;
// Force reflow
reflow = element.offsetWidth;
// Put the duration back
element.style[ TRANSITION_DURATION ] = duration;
// Put the duration back
element.style[ TRANSITION_DURATION ] = duration;
},
_addItems : function( $newItems, animateIn, isSequential ) {
@ -844,7 +842,7 @@ Shuffle.prototype = {
setTimeout(function() {
$newFilteredItems.each(function(i, el) {
self.transition({
self._transition({
from: 'reveal',
$this: $(el),
opacity: 1
@ -910,9 +908,9 @@ Shuffle.prototype = {
self._layout(items, function() {
if (fromFilter) {
self.filterEnd();
self._filterEnd();
}
self.sortEnd();
self._sortEnd();
}, isOnlyPosition);
self.lastSort = opts;

2
dist/jquery.shuffle.min.js vendored
View File

File diff suppressed because one or more lines are too long

58
dist/jquery.shuffle.modernizr.js vendored
Unescape Escape View File

@ -500,7 +500,7 @@ Shuffle.prototype = {
_layout: function( items, fn, isOnlyPosition, isHide ) {
var self = this;
fn = fn || self.filterEnd;
fn = fn || self._filterEnd;
self.layoutTransitionEnded = false;
$.each(items, function(index, item) {
@ -563,14 +563,14 @@ Shuffle.prototype = {
_reLayout : function( callback, isOnlyPosition ) {
var self = this;
callback = callback || self.filterEnd;
callback = callback || self._filterEnd;
self._resetCols();
// If we've already sorted the elements, keep them sorted
if ( self.keepSorted && self.lastSort ) {
self.sort( self.lastSort, true, isOnlyPosition );
} else {
self._layout( self.$items.filter('.filtered').get(), self.filterEnd, isOnlyPosition );
self._layout( self.$items.filter('.filtered').get(), self._filterEnd, isOnlyPosition );
}
},
@ -636,7 +636,7 @@ Shuffle.prototype = {
var self = this,
$concealed = $collection || self.$items.filter('.concealed'),
transitionObj = {},
callback = fn || self.shrinkEnd;
callback = fn || self._shrinkEnd;
// Abort if no items
if ( !$concealed.length ) {
@ -689,15 +689,12 @@ Shuffle.prototype = {
* @param {jQuery} opts.$this jQuery object representing the current item
* @param {number} opts.x translate's x
* @param {number} opts.y translate's y
* @param {string} opts.left left position (used when no transforms available)
* @param {string} opts.top top position (used when no transforms available)
* @param {number} opts.scale amount to scale the item
* @param {number} opts.opacity opacity of the item
* @param {string} opts.height the height of the item (used when no transforms available)
* @param {string} opts.width the width of the item (used when no transforms available)
* @param {Function} opts.callback complete function for the animation
* @private
*/
transition: function(opts) {
_transition: function(opts) {
var self = this,
transform,
// Only fire callback once per collection's transition
@ -759,10 +756,10 @@ Shuffle.prototype = {
if ( transitionObj.skipTransition ) {
self._skipTransition( transitionObj.$this[0], function() {
self.transition( transitionObj );
self._transition( transitionObj );
});
} else {
self.transition( transitionObj );
self._transition( transitionObj );
}
});
@ -770,15 +767,15 @@ Shuffle.prototype = {
self.styleQueue.length = 0;
},
shrinkEnd: function() {
_shrinkEnd: function() {
this._fire( Shuffle.EventType.SHRUNK );
},
filterEnd: function() {
_filterEnd: function() {
this._fire( Shuffle.EventType.FILTERED );
},
sortEnd: function() {
_sortEnd: function() {
this._fire( Shuffle.EventType.SORTED );
},
@ -787,25 +784,26 @@ Shuffle.prototype = {
* @param {Element} element DOM element that won't be transitioned
* @param {(string|Function)} property The new style property which will be set or a function which will be called
* @param {string} [value] The value that `property` should be.
* @private
*/
_skipTransition : function( element, property, value ) {
var reflow,
duration = element.style[ TRANSITION_DURATION ];
var reflow,
duration = element.style[ TRANSITION_DURATION ];
// Set the duration to zero so it happens immediately
element.style[ TRANSITION_DURATION ] = '0ms'; // ms needed for firefox!
// Set the duration to zero so it happens immediately
element.style[ TRANSITION_DURATION ] = '0ms'; // ms needed for firefox!
if ( $.isFunction( property ) ) {
property();
} else {
element.style[ property ] = value;
}
if ( $.isFunction( property ) ) {
property();
} else {
element.style[ property ] = value;
}
// Force reflow
reflow = element.offsetWidth;
// Force reflow
reflow = element.offsetWidth;
// Put the duration back
element.style[ TRANSITION_DURATION ] = duration;
// Put the duration back
element.style[ TRANSITION_DURATION ] = duration;
},
_addItems : function( $newItems, animateIn, isSequential ) {
@ -850,7 +848,7 @@ Shuffle.prototype = {
setTimeout(function() {
$newFilteredItems.each(function(i, el) {
self.transition({
self._transition({
from: 'reveal',
$this: $(el),
opacity: 1
@ -916,9 +914,9 @@ Shuffle.prototype = {
self._layout(items, function() {
if (fromFilter) {
self.filterEnd();
self._filterEnd();
}
self.sortEnd();
self._sortEnd();
}, isOnlyPosition);
self.lastSort = opts;

2
dist/jquery.shuffle.modernizr.min.js vendored
View File

File diff suppressed because one or more lines are too long

58
src/shuffle.js
Unescape Escape View File

@ -480,7 +480,7 @@ Shuffle.prototype = {
_layout: function( items, fn, isOnlyPosition, isHide ) {
var self = this;
fn = fn || self.filterEnd;
fn = fn || self._filterEnd;
self.layoutTransitionEnded = false;
$.each(items, function(index, item) {
@ -543,14 +543,14 @@ Shuffle.prototype = {
_reLayout : function( callback, isOnlyPosition ) {
var self = this;
callback = callback || self.filterEnd;
callback = callback || self._filterEnd;
self._resetCols();
// If we've already sorted the elements, keep them sorted
if ( self.keepSorted && self.lastSort ) {
self.sort( self.lastSort, true, isOnlyPosition );
} else {
self._layout( self.$items.filter('.filtered').get(), self.filterEnd, isOnlyPosition );
self._layout( self.$items.filter('.filtered').get(), self._filterEnd, isOnlyPosition );
}
},
@ -616,7 +616,7 @@ Shuffle.prototype = {
var self = this,
$concealed = $collection || self.$items.filter('.concealed'),
transitionObj = {},
callback = fn || self.shrinkEnd;
callback = fn || self._shrinkEnd;
// Abort if no items
if ( !$concealed.length ) {
@ -669,15 +669,12 @@ Shuffle.prototype = {
* @param {jQuery} opts.$this jQuery object representing the current item
* @param {number} opts.x translate's x
* @param {number} opts.y translate's y
* @param {string} opts.left left position (used when no transforms available)
* @param {string} opts.top top position (used when no transforms available)
* @param {number} opts.scale amount to scale the item
* @param {number} opts.opacity opacity of the item
* @param {string} opts.height the height of the item (used when no transforms available)
* @param {string} opts.width the width of the item (used when no transforms available)
* @param {Function} opts.callback complete function for the animation
* @private
*/
transition: function(opts) {
_transition: function(opts) {
var self = this,
transform,
// Only fire callback once per collection's transition
@ -739,10 +736,10 @@ Shuffle.prototype = {
if ( transitionObj.skipTransition ) {
self._skipTransition( transitionObj.$this[0], function() {
self.transition( transitionObj );
self._transition( transitionObj );
});
} else {
self.transition( transitionObj );
self._transition( transitionObj );
}
});
@ -750,15 +747,15 @@ Shuffle.prototype = {
self.styleQueue.length = 0;
},
shrinkEnd: function() {
_shrinkEnd: function() {
this._fire( Shuffle.EventType.SHRUNK );
},
filterEnd: function() {
_filterEnd: function() {
this._fire( Shuffle.EventType.FILTERED );
},
sortEnd: function() {
_sortEnd: function() {
this._fire( Shuffle.EventType.SORTED );
},
@ -767,25 +764,26 @@ Shuffle.prototype = {
* @param {Element} element DOM element that won't be transitioned
* @param {(string|Function)} property The new style property which will be set or a function which will be called
* @param {string} [value] The value that `property` should be.
* @private
*/
_skipTransition : function( element, property, value ) {
var reflow,
duration = element.style[ TRANSITION_DURATION ];
var reflow,
duration = element.style[ TRANSITION_DURATION ];
// Set the duration to zero so it happens immediately
element.style[ TRANSITION_DURATION ] = '0ms'; // ms needed for firefox!
// Set the duration to zero so it happens immediately
element.style[ TRANSITION_DURATION ] = '0ms'; // ms needed for firefox!
if ( $.isFunction( property ) ) {
property();
} else {
element.style[ property ] = value;
}
if ( $.isFunction( property ) ) {
property();
} else {
element.style[ property ] = value;
}
// Force reflow
reflow = element.offsetWidth;
// Force reflow
reflow = element.offsetWidth;
// Put the duration back
element.style[ TRANSITION_DURATION ] = duration;
// Put the duration back
element.style[ TRANSITION_DURATION ] = duration;
},
_addItems : function( $newItems, animateIn, isSequential ) {
@ -830,7 +828,7 @@ Shuffle.prototype = {
setTimeout(function() {
$newFilteredItems.each(function(i, el) {
self.transition({
self._transition({
from: 'reveal',
$this: $(el),
opacity: 1
@ -896,9 +894,9 @@ Shuffle.prototype = {
self._layout(items, function() {
if (fromFilter) {
self.filterEnd();
self._filterEnd();
}
self.sortEnd();
self._sortEnd();
}, isOnlyPosition);
self.lastSort = opts;

Write Preview
Loading…
Cancel
Save