test

"), props = {}; props[ prop ] = value; @@ -1813,7 +1813,7 @@ steal('jquery', 'jquery/dom/animate', 'funcunit/qunit', 'qunit.css', function ($ }); test( "Animations with 0 duration don't ease (#12273)", 1, function() { - jQuery.easing.test = function() { + $.easing.test = function() { ok( false, "Called easing" ); }; @@ -1827,8 +1827,8 @@ steal('jquery', 'jquery/dom/animate', 'funcunit/qunit', 'qunit.css', function ($ } }); - delete jQuery.easing.test; + delete $.easing.test; }); - } // if ( jQuery.fx ) + } // if ( $.fx ) }); \ No newline at end of file diff --git a/dom/closest/closest.js b/dom/closest/closest.js index 4460647b..237fd0bc 100644 --- a/dom/closest/closest.js +++ b/dom/closest/closest.js @@ -11,8 +11,8 @@ steal('jquery', function($) { * * ">li click" : function( el, ev ) { ... } */ - var oldClosest = jQuery.fn.closest; - jQuery.fn.closest = function(selectors, context){ + var oldClosest = $.fn.closest; + $.fn.closest = function(selectors, context){ var rooted = {}, res, result, thing, i, j, selector, rootedIsEmpty = true, selector, selectorsArr = selectors; if(typeof selectors == "string") selectorsArr = [selectors]; diff --git a/dom/compare/compare.js b/dom/compare/compare.js index ee81f442..21539523 100644 --- a/dom/compare/compare.js +++ b/dom/compare/compare.js @@ -24,7 +24,7 @@ steal('jquery', function($) { */ // See http://ejohn.org/blog/comparing-document-position/ -jQuery.fn.compare = function(element){ //usually +$.fn.compare = function(element){ //usually try{ // Firefox 3 throws an error with XUL - we can't use compare then element = element.jquery ? element[0] : element; diff --git a/dom/cookie/cookie.js b/dom/cookie/cookie.js index c4b0035b..9416d120 100644 --- a/dom/cookie/cookie.js +++ b/dom/cookie/cookie.js @@ -49,7 +49,7 @@ steal('jquery', 'jquery/lang/json', function($) { * * @return {String} the value of the cookie or {undefined} when setting the cookie. */ - jQuery.cookie = function(name, value, options) { + $.cookie = function(name, value, options) { if (typeof value != 'undefined') { // name and value given, set cookie options = options || @@ -59,8 +59,8 @@ steal('jquery', 'jquery/lang/json', function($) { options.expires = -1; } // convert value to JSON string - if (typeof value == 'object' && jQuery.toJSON) { - value = jQuery.toJSON(value); + if (typeof value == 'object' && $.toJSON) { + value = $.toJSON(value); } var expires = ''; // Set expiry @@ -89,7 +89,7 @@ steal('jquery', 'jquery/lang/json', function($) { if (document.cookie && document.cookie != '') { var cookies = document.cookie.split(';'); for (var i = 0; i < cookies.length; i++) { - var cookie = jQuery.trim(cookies[i]); + var cookie = $.trim(cookies[i]); // Does this cookie string begin with the name we want? if (cookie.substring(0, name.length + 1) == (name + '=')) { // Get the cookie value @@ -99,9 +99,9 @@ steal('jquery', 'jquery/lang/json', function($) { } } // Parse JSON from the cookie into an object - if (jQuery.evalJSON && cookieValue && cookieValue.match(/^\s*\{/)) { + if ($.evalJSON && cookieValue && cookieValue.match(/^\s*\{/)) { try { - cookieValue = jQuery.evalJSON(cookieValue); + cookieValue = $.evalJSON(cookieValue); } catch (e) { } diff --git a/dom/styles/styles.js b/dom/styles/styles.js index babfe151..1de61dde 100644 --- a/dom/styles/styles.js +++ b/dom/styles/styles.js @@ -38,7 +38,7 @@ steal('jquery', function( $ ) { oldName = name.replace(rdashAlpha, fcamelCase); if ( rfloat.test(name) ) { - name = jQuery.support.cssFloat ? "float" : "styleFloat"; + name = $.support.cssFloat ? "float" : "styleFloat"; oldName = "cssFloat"; } diff --git a/dom/within/within.js b/dom/within/within.js index 22e39a11..a3555e1c 100644 --- a/dom/within/within.js +++ b/dom/within/within.js @@ -33,7 +33,7 @@ $.fn.within= function(left, top, useOffsetCache) { // uses either the cached offset or .offset() var offset = useOffsetCache ? - jQuery.data(this,"offsetCache") || jQuery.data(this,"offsetCache", q.offset()) : + $.data(this,"offsetCache") || $.data(this,"offsetCache", q.offset()) : q.offset(); // Check if the given coordinates are within the area of the current element @@ -46,7 +46,7 @@ $.fn.within= function(left, top, useOffsetCache) { } }); - return this.pushStack( jQuery.unique( ret ), "within", left+","+top ); + return this.pushStack( $.unique( ret ), "within", left+","+top ); } @@ -75,8 +75,8 @@ $.fn.withinBox = function(left, top, width, height, useOffsetCache){ // use cached offset or .offset() var offset = useOffsetCache ? - jQuery.data(this,"offset") || - jQuery.data(this,"offset", q.offset()) : + $.data(this,"offset") || + $.data(this,"offset", q.offset()) : q.offset(); @@ -87,7 +87,7 @@ $.fn.withinBox = function(left, top, width, height, useOffsetCache){ if(res) ret.push(this); }); - return this.pushStack( jQuery.unique( ret ), "withinBox", jQuery.makeArray(arguments).join(",") ); + return this.pushStack( $.unique( ret ), "withinBox", $.makeArray(arguments).join(",") ); } return $; diff --git a/event/default/default.js b/event/default/default.js index f3d26ae2..6c3f39d6 100644 --- a/event/default/default.js +++ b/event/default/default.js @@ -82,11 +82,11 @@ $event.trigger = function defaultTriggerer( event, data, elem, onlyHandlers){ // Caller can pass in an Event, Object, or just an event type string event = typeof event === "object" ? // jQuery.Event object - event[ jQuery.expando ] ? event : + event[ $.expando ] ? event : // Object literal - new jQuery.Event( type, event ) : + new $.Event( type, event ) : // Just the event type (string) - new jQuery.Event( type), + new $.Event( type), res=oldTrigger.call($.event,event, data, elem, onlyHandlers), paused=event.isPaused && event.isPaused(); diff --git a/event/destroyed/destroyed.js b/event/destroyed/destroyed.js index cb00616d..d98bdfc5 100644 --- a/event/destroyed/destroyed.js +++ b/event/destroyed/destroyed.js @@ -6,7 +6,7 @@ steal('jquery', function( $ ) { */ // Store the old jQuery.cleanData - var oldClean = jQuery.cleanData; + var oldClean = $.cleanData; // Overwrites cleanData which is called by jQuery on manipulation methods $.cleanData = function( elems ) { diff --git a/event/drop/drop.js b/event/drop/drop.js index eaa0d9b7..3e689e37 100644 --- a/event/drop/drop.js +++ b/event/drop/drop.js @@ -110,7 +110,7 @@ steal('jquery', 'jquery/event/drag', 'jquery/dom/within', 'jquery/dom/compare', * }); */ $.Drop = function(callbacks, element){ - jQuery.extend(this,callbacks); + $.extend(this,callbacks); this.element = $(element); } // add the elements ... diff --git a/event/fastfix/fastfix.js b/event/fastfix/fastfix.js index 3707b497..fde6ed06 100644 --- a/event/fastfix/fastfix.js +++ b/event/fastfix/fastfix.js @@ -61,10 +61,10 @@ steal('jquery', function ($) { }; // Get all properties that should be mapped - jQuery.each(jQuery.event.keyHooks.props.concat(jQuery.event.mouseHooks.props).concat(jQuery.event.props), function (i, prop) { + $.each($.event.keyHooks.props.concat($.event.mouseHooks.props).concat($.event.props), function (i, prop) { if (prop !== "target") { (function () { - Object.defineProperty(jQuery.Event.prototype, prop, { + Object.defineProperty($.Event.prototype, prop, { get : function () { // get the original value, undefined when there is no original event var originalValue = this.originalEvent && this.originalEvent[prop]; @@ -86,13 +86,13 @@ steal('jquery', function ($) { } }); - jQuery.event.fix = function (event) { - if (event[ jQuery.expando ]) { + $.event.fix = function (event) { + if (event[ $.expando ]) { return event; } // Create a jQuery event with at minimum a target and type set var originalEvent = event, - event = jQuery.Event(originalEvent); + event = $.Event(originalEvent); event.target = originalEvent.target; // Fix target property, if necessary (#1925, IE 6/7/8 & Safari2) if (!event.target) { diff --git a/event/fastfix/fastfix_test.js b/event/fastfix/fastfix_test.js index 540ec581..df6dd42a 100644 --- a/event/fastfix/fastfix_test.js +++ b/event/fastfix/fastfix_test.js @@ -73,7 +73,7 @@ steal("jquery/event/fastfix", }; jQuery("#firstp").bind("click", {"foo" : "bar"}, handler).click().unbind("click", handler); - ok(!jQuery._data(jQuery("#firstp")[0], "events"), "Event handler unbound when using data."); + ok(!$._data(jQuery("#firstp")[0], "events"), "Event handler unbound when using data."); var test = function () { }; @@ -91,7 +91,7 @@ steal("jquery/event/fastfix", }; jQuery("#firstp").click({"foo" : "bar"}, handler).click().unbind("click", handler); - ok(!jQuery._data(jQuery("#firstp")[0], "events"), "Event handler unbound when using data."); + ok(!$._data(jQuery("#firstp")[0], "events"), "Event handler unbound when using data."); }); test("bind(), with data, trigger with data", function () { @@ -193,7 +193,7 @@ steal("jquery/event/fastfix", var i = 0; - jQuery.event.special["test"] = { + $.event.special["test"] = { _default : function (e, data) { equal(this, document, "Make sure we're at the top of the chain."); equal(e.type, "test", "And that we're still dealing with a test event."); @@ -246,7 +246,7 @@ steal("jquery/event/fastfix", // Should trigger 2 div.appendTo("#qunit-fixture").remove(); - delete jQuery.event.special["test"]; + delete $.event.special["test"]; }); test("bind(), no data", function () { @@ -586,7 +586,7 @@ steal("jquery/event/fastfix", var elem = jQuery("#firstp"), log = [], check = []; - jQuery.each(new Array(100), function (i) { + $.each(new Array(100), function (i) { elem.bind("click", function () { log.push(i); }); @@ -615,10 +615,10 @@ steal("jquery/event/fastfix", }; jQuery("#firstp") - .bind("click", jQuery.proxy(handler1, thisObject)).click().unbind("click", handler1) - .bind("click", data, jQuery.proxy(handler2, thisObject)).click().unbind("click", handler2); + .bind("click", $.proxy(handler1, thisObject)).click().unbind("click", handler1) + .bind("click", data, $.proxy(handler2, thisObject)).click().unbind("click", handler2); - ok(!jQuery._data(jQuery("#firstp")[0], "events"), "Event handler unbound when using different this object and data."); + ok(!$._data(jQuery("#firstp")[0], "events"), "Event handler unbound when using different this object and data."); }); test("bind(name, false), unbind(name, false)", function () { @@ -710,7 +710,7 @@ steal("jquery/event/fastfix", } }); - var events = jQuery._data(obj, "events"); + var events = $._data(obj, "events"); ok(events, "Object has events bound."); equal(obj["events"], undefined, "Events object on plain objects is not events"); equal(obj["test"], undefined, "Make sure that test event is not on the plain object."); @@ -729,9 +729,9 @@ steal("jquery/event/fastfix", // Make sure it doesn't complain when no events are found jQuery(obj).unbind("test"); - equal(obj && obj[ jQuery.expando ] && - obj[ jQuery.expando ][ jQuery.expando ] && - obj[ jQuery.expando ][ jQuery.expando ]["events"], undefined, "Make sure events object is removed"); + equal(obj && obj[ $.expando ] && + obj[ $.expando ][ $.expando ] && + obj[ $.expando ][ $.expando ]["events"], undefined, "Make sure events object is removed"); }); test("unbind(type)", function () { @@ -880,7 +880,7 @@ steal("jquery/event/fastfix", elem.remove(); }); - test("withinElement implemented with jQuery.contains()", function () { + test("withinElement implemented with $.contains()", function () { expect(1); @@ -1194,8 +1194,8 @@ steal("jquery/event/fastfix", $parent.get(0).style.display = "none"; - var event = jQuery.Event("noNew"); - ok(event != window, "Instantiate jQuery.Event without the 'new' keyword"); + var event = $.Event("noNew"); + ok(event != window, "Instantiate $.Event without the 'new' keyword"); equal(event.type, "noNew", "Verify its type"); equal(event.isDefaultPrevented(), false, "Verify isDefaultPrevented"); @@ -1223,7 +1223,7 @@ steal("jquery/event/fastfix", }); // test with an event object - event = new jQuery.Event("foo"); + event = new $.Event("foo"); event.secret = "boo!"; $child.trigger(event); @@ -1258,7 +1258,7 @@ steal("jquery/event/fastfix", // in which event handlers are iterated. //$child.bind("foo", error ); - event = new jQuery.Event("foo"); + event = new $.Event("foo"); $child.trigger(event, [1, 2, 3]).unbind(); equal(event.result, "result", "Check event.result attribute"); @@ -1269,7 +1269,7 @@ steal("jquery/event/fastfix", $parent.unbind().remove(); // Ensure triggerHandler doesn't molest its event object (#xxx) - event = jQuery.Event("zowie"); + event = $.Event("zowie"); jQuery(document).triggerHandler(event); equal(event.type, "zowie", "Verify its type"); equal(event.isPropagationStopped(), false, "propagation not stopped"); @@ -1455,21 +1455,21 @@ steal("jquery/event/fastfix", equal(window.onbeforeunload, null, "window property has been unset to null/undefined"); }); - test("jQuery.Event( type, props )", function () { + test("$.Event( type, props )", function () { expect(5); - var event = jQuery.Event("keydown", { keyCode : 64 }), + var event = $.Event("keydown", { keyCode : 64 }), handler = function (event) { ok("keyCode" in event, "Special property 'keyCode' exists"); equal(event.keyCode, 64, "event.keyCode has explicit value '64'"); }; - // Supports jQuery.Event implementation + // Supports $.Event implementation equal(event.type, "keydown", "Verify type"); // ensure "type" in props won't clobber the one set by constructor - equal(jQuery.inArray("type", jQuery.event.props), -1, "'type' property not in props (#10375)"); + equal($.inArray("type", $.event.props), -1, "'type' property not in props (#10375)"); ok("keyCode" in event, "Special 'keyCode' property exists"); @@ -1479,7 +1479,7 @@ steal("jquery/event/fastfix", }); - test("jQuery.Event.currentTarget", function () { + test("$.Event.currentTarget", function () { expect(2); jQuery("") @@ -1555,7 +1555,7 @@ steal("jquery/event/fastfix", equal(turn, 2, "Trying toggle with 3 functions, attempt 5 yields 2"); $div.unbind("click", fns[0]); - var data = jQuery._data($div[0], "events"); + var data = $._data($div[0], "events"); ok(!data, "Unbinding one function from toggle unbinds them all"); // manually clean up detached elements @@ -1702,7 +1702,7 @@ steal("jquery/event/fastfix", div = 0; livea = 0; liveb = 0; - var event = jQuery.Event("click"); + var event = $.Event("click"); event.button = 1; jQuery("div#nothiddendiv").trigger(event); @@ -1742,13 +1742,13 @@ steal("jquery/event/fastfix", jQuery("#foo").trigger("click", true).die("click"); // Test binding with different this object - jQuery("#foo").live("click", jQuery.proxy(function (e) { + jQuery("#foo").live("click", $.proxy(function (e) { equal(this.foo, "bar", "live with event scope"); }, { foo : "bar" })); jQuery("#foo").trigger("click").die("click"); // Test binding with different this object, event data, and trigger data - jQuery("#foo").live("click", true, jQuery.proxy(function (e, data) { + jQuery("#foo").live("click", true, $.proxy(function (e, data) { equal(e.data, true, "live with with different this object, event data, and trigger data"); equal(this["foo"], "bar", "live with with different this object, event data, and trigger data"); equal(data, true, "live with with different this object, event data, and trigger data"); @@ -2156,7 +2156,7 @@ steal("jquery/event/fastfix", test("live with special events", function () { expect(13); - jQuery.event.special["foo"] = { + $.event.special["foo"] = { setup : function (data, namespaces, handler) { ok(true, "Setup run."); }, @@ -2199,7 +2199,7 @@ steal("jquery/event/fastfix", // Run: remove, teardown jQuery("#liveSpan1").die("foo"); - delete jQuery.event.special["foo"]; + delete $.event.special["foo"]; }); test(".delegate()/.undelegate()", function () { @@ -2315,7 +2315,7 @@ steal("jquery/event/fastfix", div = 0; livea = 0; liveb = 0; - var event = jQuery.Event("click"); + var event = $.Event("click"); event.button = 1; jQuery("div#nothiddendiv").trigger(event); @@ -2357,14 +2357,14 @@ steal("jquery/event/fastfix", jQuery("#body").undelegate("#foo", "click"); // Test binding with different this object - jQuery("#body").delegate("#foo", "click", jQuery.proxy(function (e) { + jQuery("#body").delegate("#foo", "click", $.proxy(function (e) { equal(this["foo"], "bar", "delegate with event scope"); }, { "foo" : "bar" })); jQuery("#foo").trigger("click"); jQuery("#body").undelegate("#foo", "click"); // Test binding with different this object, event data, and trigger data - jQuery("#body").delegate("#foo", "click", true, jQuery.proxy(function (e, data) { + jQuery("#body").delegate("#foo", "click", true, $.proxy(function (e, data) { equal(e.data, true, "delegate with with different this object, event data, and trigger data"); equal(this.foo, "bar", "delegate with with different this object, event data, and trigger data"); equal(data, true, "delegate with with different this object, event data, and trigger data"); @@ -2548,7 +2548,7 @@ steal("jquery/event/fastfix", jQuery("#body").undelegate("#nothiddendiv div", "click"); }); - test("jQuery.off using dispatched jQuery.Event", function () { + test("$.off using dispatched $.Event", function () { expect(1); var markup = jQuery('

target

'), @@ -2811,7 +2811,7 @@ steal("jquery/event/fastfix", ok(true, "Resize event fired."); }).resize().unbind("resize"); - ok(!jQuery._data(window, "__events__"), "Make sure all the events are gone."); + ok(!$._data(window, "__events__"), "Make sure all the events are gone."); }); test("focusin bubbles", function () { @@ -2956,7 +2956,7 @@ steal("jquery/event/fastfix", .off("click cluck"); // We should have removed all the event handlers ... kinda hacky way to check this - var data = jQuery.data[ jQuery("#onandoff")[0].expando ] || {}; + var data = $.data[ jQuery("#onandoff")[0].expando ] || {}; equal(data["events"], undefined, "no events left"); $onandoff.remove(); @@ -2965,7 +2965,7 @@ steal("jquery/event/fastfix", test("special bind/delegate name mapping", function () { expect(7); - jQuery.event.special["slap"] = { + $.event.special["slap"] = { bindType : "click", delegateType : "swing", handle : function (event) { @@ -2978,10 +2978,10 @@ steal("jquery/event/fastfix", }; jQuery("") - .on("slap", "button", jQuery.noop) + .on("slap", "button", $.noop) .on("swing", "button", comeback) .find("button") - .on("slap", jQuery.noop) + .on("slap", $.noop) .on("click", comeback) .trigger("click")// bindType-slap and click .off("slap") @@ -2996,9 +2996,9 @@ steal("jquery/event/fastfix", .trigger("swing") .end() .remove(); - delete jQuery.event.special["slap"]; + delete $.event.special["slap"]; - jQuery.event.special["gutfeeling"] = { + $.event.special["gutfeeling"] = { bindType : "click", delegateType : "click", handle : function (event) { @@ -3010,27 +3010,27 @@ steal("jquery/event/fastfix", // Ensure a special event isn't removed by its mapped type jQuery('

Gut Feeling

') - .on("click", jQuery.noop) - .on("gutfeeling", jQuery.noop) + .on("click", $.noop) + .on("gutfeeling", $.noop) .off("click") .trigger("gutfeeling") .remove(); // Ensure special events are removed when only a namespace is provided jQuery('

Gut Feeling

') - .on("gutfeeling.Devo", jQuery.noop) + .on("gutfeeling.Devo", $.noop) .off(".Devo") .trigger("gutfeeling") .remove(); // Ensure .one() events are removed after their maiden voyage jQuery('

Gut Feeling

') - .one("gutfeeling", jQuery.noop) + .one("gutfeeling", $.noop) .trigger("gutfeeling")// This one should .trigger("gutfeeling")// This one should not .remove(); - delete jQuery.event.special["gutfeeling"]; + delete $.event.special["gutfeeling"]; }); test(".on and .off, selective mixed removal (#10705)", function () { @@ -3101,13 +3101,13 @@ steal("jquery/event/fastfix", order = [], args = {}; - notYetReady = !jQuery.isReady; + notYetReady = !$.isReady; - test("jQuery.isReady", function () { + test("$.isReady", function () { expect(2); - equal(notYetReady, true, "jQuery.isReady should not be true before DOM ready"); - equal(jQuery.isReady, true, "jQuery.isReady should be true once DOM is ready"); + equal(notYetReady, true, "$.isReady should not be true before DOM ready"); + equal($.isReady, true, "$.isReady should be true once DOM is ready"); }); // Create an event handler. @@ -3145,7 +3145,7 @@ steal("jquery/event/fastfix", // Ensure handler argument is correct. equal(args["a"], jQuery, "Argument passed to fn in jQuery( fn ) should be jQuery"); equal(args["b"], jQuery, "Argument passed to fn in jQuery(document).ready( fn ) should be jQuery"); - ok(args["c"] instanceof jQuery.Event, "Argument passed to fn in jQuery(document).bind( 'ready', fn ) should be an event object"); + ok(args["c"] instanceof $.Event, "Argument passed to fn in jQuery(document).bind( 'ready', fn ) should be an event object"); order = []; @@ -3173,7 +3173,7 @@ steal("jquery/event/fastfix", var $fixture = jQuery("").appendTo("body"); - var originRemoveEvent = jQuery.removeEvent; + var originRemoveEvent = $.removeEvent; var wrapperRemoveEvent = function (elem, type, handle) { equal("change", type, "Event handler for 'change' event should be removed"); @@ -3181,7 +3181,7 @@ steal("jquery/event/fastfix", originRemoveEvent(elem, type, handle); }; - jQuery.removeEvent = wrapperRemoveEvent; + $.removeEvent = wrapperRemoveEvent; $fixture.bind("change", function (event) { }); @@ -3189,7 +3189,7 @@ steal("jquery/event/fastfix", $fixture.remove(); - jQuery.removeEvent = originRemoveEvent; + $.removeEvent = originRemoveEvent; }); asyncTest("trigger click on checkbox, fires change event", function () { diff --git a/event/handle/handle.js b/event/handle/handle.js index 42961301..4fb8fdc7 100644 --- a/event/handle/handle.js +++ b/event/handle/handle.js @@ -27,19 +27,19 @@ $.event.trigger = function(event, data, elem, onlyHandlers){ namespaces.sort(); } - if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) { + if ( (!elem || $.event.customEvent[ type ]) && !$.event.global[ type ] ) { // No jQuery handlers for this event type, and it can't have inline handlers return; } // Caller can pass in an Event, Object, or just an event type string event = typeof event === "object" ? - // jQuery.Event object - event[ jQuery.expando ] ? event : + // $.Event object + event[ $.expando ] ? event : // Object literal - new jQuery.Event( type, event ) : + new $.Event( type, event ) : // Just the event type (string) - new jQuery.Event( type ); + new $.Event( type ); event.type = type; event.exclusive = exclusive; @@ -55,14 +55,14 @@ $.event.trigger = function(event, data, elem, onlyHandlers){ // Handle a global trigger if ( !elem ) { // TODO: Stop taunting the data cache; remove global events and always attach to document - jQuery.each( jQuery.cache, function() { + $.each( $.cache, function() { // internalKey variable is just used to make it easier to find // and potentially change this stuff later; currently it just - // points to jQuery.expando - var internalKey = jQuery.expando, + // points to $.expando + var internalKey = $.expando, internalCache = this[ internalKey ]; if ( internalCache && internalCache.events && internalCache.events[ type ] ) { - jQuery.event.trigger( event, data, internalCache.handle.elem ); + $.event.trigger( event, data, internalCache.handle.elem ); } }); return; @@ -78,7 +78,7 @@ $.event.trigger = function(event, data, elem, onlyHandlers){ event.target = elem; // Clone any incoming data and prepend the event, creating the handler arg list - data = data ? jQuery.makeArray( data ) : []; + data = data ? $.makeArray( data ) : []; data.unshift( event ); var cur = elem, @@ -87,7 +87,7 @@ $.event.trigger = function(event, data, elem, onlyHandlers){ // Fire event on the current element, then bubble up the DOM tree do { - var handle = jQuery._data( cur, "handle" ); + var handle = $._data( cur, "handle" ); event.currentTarget = cur; if ( handle ) { @@ -95,7 +95,7 @@ $.event.trigger = function(event, data, elem, onlyHandlers){ } // Trigger an inline bound script - if ( ontype && jQuery.acceptData( cur ) && cur[ ontype ] && cur[ ontype ].apply( cur, data ) === false ) { + if ( ontype && $.acceptData( cur ) && cur[ ontype ] && cur[ ontype ].apply( cur, data ) === false ) { event.result = false; event.preventDefault(); } @@ -107,10 +107,10 @@ $.event.trigger = function(event, data, elem, onlyHandlers){ // If nobody prevented the default action, do it now if ( !event.isDefaultPrevented() ) { var old, - special = jQuery.event.special[ type ] || {}; + special = $.event.special[ type ] || {}; if ( (!special._default || special._default.call( elem.ownerDocument, event ) === false) && - !(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) { + !(type === "click" && $.nodeName( elem, "a" )) && $.acceptData( elem ) ) { // Call a native DOM method on the target with the same name name as the event. // Can't use an .isFunction)() check here because IE6/7 fails that test. @@ -124,7 +124,7 @@ $.event.trigger = function(event, data, elem, onlyHandlers){ elem[ ontype ] = null; } - jQuery.event.triggered = type; + $.event.triggered = type; elem[ type ](); } } catch ( ieError ) {} @@ -133,7 +133,7 @@ $.event.trigger = function(event, data, elem, onlyHandlers){ elem[ ontype ] = old; } - jQuery.event.triggered = undefined; + $.event.triggered = undefined; } } @@ -142,9 +142,9 @@ $.event.trigger = function(event, data, elem, onlyHandlers){ // a copy of $'s handle function that goes until it finds $.event.handle = function( event ) { - event = jQuery.event.fix( event || window.event ); + event = $.event.fix( event || window.event ); // Snapshot the handlers list since a called handler may add/remove events. - var handlers = ((jQuery._data( this, "events" ) || {})[ event.type ] || []).slice(0), + var handlers = (($._data( this, "events" ) || {})[ event.type ] || []).slice(0), run_all = !event.exclusive && !event.namespace, args = Array.prototype.slice.call( arguments, 0 ); diff --git a/event/key/key.js b/event/key/key.js index 3f4d6db8..6a908f8d 100644 --- a/event/key/key.js +++ b/event/key/key.js @@ -128,7 +128,7 @@ steal('jquery', function($){ * * @return {String} The string representation of of the key pressed. */ - jQuery.Event.prototype.keyName = function(){ + $.Event.prototype.keyName = function(){ var event = this, test = /\w/, // It can be either keyCode or charCode. diff --git a/event/livehack/livehack.js b/event/livehack/livehack.js index d1397adc..9038c6de 100644 --- a/event/livehack/livehack.js +++ b/event/livehack/livehack.js @@ -1,6 +1,6 @@ steal('jquery', function($) { - var event = jQuery.event, + var event = $.event, //helper that finds handlers by type and calls back a function, this is basically handle // events - the events object diff --git a/event/pause/pause.js b/event/pause/pause.js index a8b87e7e..947c39e8 100644 --- a/event/pause/pause.js +++ b/event/pause/pause.js @@ -56,19 +56,19 @@ $.Event.prototype.resume = function(){ var handleObj = this.handleObj, currentTarget = this.currentTarget; // temporarily overwrite special handle - var origType = jQuery.event.special[ handleObj.origType ], + var origType = $.event.special[ handleObj.origType ], origHandle = origType && origType.handle; if(!origType){ - jQuery.event.special[ handleObj.origType ] = {}; + $.event.special[ handleObj.origType ] = {}; } - jQuery.event.special[ handleObj.origType ].handle = function(ev){ + $.event.special[ handleObj.origType ].handle = function(ev){ // remove this once we have passed the handleObj if(ev.handleObj === handleObj && ev.currentTarget === currentTarget){ if(!origType){ - delete jQuery.event.special[ handleObj.origType ]; + delete $.event.special[ handleObj.origType ]; } else { - jQuery.event.special[ handleObj.origType ].handle = origHandle; + $.event.special[ handleObj.origType ].handle = origHandle; } } } diff --git a/model/list/list_test.js b/model/list/list_test.js index 1318fc9e..04ec9bd9 100644 --- a/model/list/list_test.js +++ b/model/list/list_test.js @@ -173,7 +173,7 @@ test("events - add", 3, function(){ // events are hooked internally now // ok( $(person).data("events"), "person has events" ); - ok(jQuery._data(person, 'events'), "person has events" ); + ok($._data(person, 'events'), "person has events" ); list.pop()