aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Gołębiowski <m.goleb@gmail.com>2016-01-11 19:21:45 +0100
committerMichał Gołębiowski <m.goleb@gmail.com>2016-01-11 19:21:45 +0100
commitdf31b88135f94f903c8a887085d30d085a9c62f6 (patch)
treea60e194bf1ffc390c3a7dc84b72379152a8bb130
parent3c56eac50725c2548c3abc0159841c3354936ac4 (diff)
downloadjquery-df31b88135f94f903c8a887085d30d085a9c62f6.tar.gz
jquery-df31b88135f94f903c8a887085d30d085a9c62f6.zip
Event: compat -> 1.x in comments
Ref 3c56eac50725c2548c3abc0159841c3354936ac4
-rw-r--r--src/event/trigger.js2
-rw-r--r--test/unit/offset.js6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/event/trigger.js b/src/event/trigger.js
index 448f90878..a6fac70ea 100644
--- a/src/event/trigger.js
+++ b/src/event/trigger.js
@@ -164,7 +164,7 @@ jQuery.extend( jQuery.event, {
// But now, this "simulate" function is used only for events
// for which stopPropagation() is noop, so there is no need for that anymore.
//
- // For the compat branch though, guard for "click" and "submit"
+ // For the 1.x branch though, guard for "click" and "submit"
// events is still used, but was moved to jQuery.event.stopPropagation function
// because `originalEvent` should point to the original event for the constancy
// with other events and for more focused logic
diff --git a/test/unit/offset.js b/test/unit/offset.js
index 317f41053..5100dbf34 100644
--- a/test/unit/offset.js
+++ b/test/unit/offset.js
@@ -62,7 +62,7 @@ QUnit.test( "disconnected node", function( assert ) {
var result = jQuery( document.createElement( "div" ) ).offset();
- // These tests are solely for master/compat consistency
+ // These tests are solely for 2.x/1.x consistency
// Retrieving offset on disconnected/hidden elements is not officially
// valid input, but will return zeros for back-compat
assert.equal( result.top, 0, "Check top" );
@@ -77,7 +77,7 @@ QUnit.test( "hidden (display: none) element", function( assert ) {
node.remove();
- // These tests are solely for master/compat consistency
+ // These tests are solely for 2.x/1.x consistency
// Retrieving offset on disconnected/hidden elements is not officially
// valid input, but will return zeros for back-compat
assert.equal( result.top, 0, "Retrieving offset on hidden elements returns zeros (gh-2310)" );
@@ -423,7 +423,7 @@ testIframe( "offset/scroll", "scroll", function( $, win, doc, assert ) {
assert.equal( $( "#scroll-1-1" ).offset().top, 11, "jQuery('#scroll-1-1').offset().top" );
assert.equal( $( "#scroll-1-1" ).offset().left, 11, "jQuery('#scroll-1-1').offset().left" );
- // These tests are solely for master/compat consistency
+ // These tests are solely for 2.x/1.x consistency
// Retrieving offset on disconnected/hidden elements is not officially
// valid input, but will return zeros for back-compat
// assert.equal( $( "#hidden" ).offset().top, 0, "Hidden elements do not subtract scroll" );