fixed typo (easeout); added check if jQuery._$ even exists, added examples for usage of $.noConflict()
This commit is contained in:
parent
150262153b
commit
887b890fa6
|
@ -528,7 +528,7 @@ jQuery.extend({
|
||||||
return delta*(n/=duration)*n*n + firstNum;
|
return delta*(n/=duration)*n*n + firstNum;
|
||||||
},
|
},
|
||||||
|
|
||||||
easeou: function(p, n, firstNum, delta, duration) {
|
easeout: function(p, n, firstNum, delta, duration) {
|
||||||
return -delta * ((n=n/duration-1)*n*n*n - 1) + firstNum;
|
return -delta * ((n=n/duration-1)*n*n*n - 1) + firstNum;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
25
src/jquery/jquery.js
vendored
25
src/jquery/jquery.js
vendored
|
@ -1069,15 +1069,32 @@ jQuery.extend({
|
||||||
* of other libraries.
|
* of other libraries.
|
||||||
*
|
*
|
||||||
* By using this function, you will only be able to access jQuery
|
* By using this function, you will only be able to access jQuery
|
||||||
* using the 'jQuery' variable. For example, where you use to do
|
* using the 'jQuery' variable. For example, where you used to do
|
||||||
* $("div p"), you now must do jQuery("div p").
|
* $("div p"), you now must do jQuery("div p").
|
||||||
*
|
*
|
||||||
|
* @example $.noConflict();
|
||||||
|
* @desc Maps the original object that was referenced by $ back to $
|
||||||
|
*
|
||||||
|
* @example $.noConflict();
|
||||||
|
* (function($) {
|
||||||
|
* $(function() {
|
||||||
|
* // more code using $ as alias to jQuery
|
||||||
|
* });
|
||||||
|
* })(jQuery);
|
||||||
|
* // other code using $ as an alias to the original implementation (not jQuery)
|
||||||
|
* @desc Reverts the $ alias and then creates and executes a
|
||||||
|
* function to provide the $ as a jQuery alias inside the functions
|
||||||
|
* scope. Inside the function the original $ object is not available.
|
||||||
|
* This works well for most plugins that don't rely on any other library.
|
||||||
|
*
|
||||||
|
*
|
||||||
* @name noConflict
|
* @name noConflict
|
||||||
* @type undefined
|
* @type undefined
|
||||||
* @cat Core
|
* @cat Core
|
||||||
*/
|
*/
|
||||||
noConflict: function(){
|
noConflict: function() {
|
||||||
$ = jQuery._$;
|
if(jQuery._$)
|
||||||
|
$ = jQuery._$;
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1086,7 +1103,7 @@ jQuery.extend({
|
||||||
* @type undefined
|
* @type undefined
|
||||||
* @cat Core
|
* @cat Core
|
||||||
*/
|
*/
|
||||||
init: function(){
|
init: function() {
|
||||||
jQuery.initDone = true;
|
jQuery.initDone = true;
|
||||||
|
|
||||||
jQuery.each( jQuery.macros.axis, function(i,n){
|
jQuery.each( jQuery.macros.axis, function(i,n){
|
||||||
|
|
Loading…
Reference in a new issue