Skip to content

Commit 4f162c7

Browse files
committed
Merge pull request #500 from AlexHill/use_pageyoffset
Use pageYOffset over scrollY for IE9+ support
2 parents c4945b6 + 3813ab1 commit 4f162c7

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

test/unit/pjax.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ if ($.support.pjax) {
9292
var frame = this.frame
9393

9494
frame.window.scrollTo(0, 100)
95-
equal(frame.window.scrollY, 100)
95+
equal(frame.window.pageYOffset, 100)
9696

9797
frame.$('#main').on('pjax:success', function() {
98-
equal(frame.window.scrollY, 0)
98+
equal(frame.window.pageYOffset, 0)
9999
start()
100100
})
101101
frame.$.pjax({
@@ -108,10 +108,10 @@ if ($.support.pjax) {
108108
var frame = this.frame
109109

110110
frame.window.scrollTo(0, 100)
111-
equal(frame.window.scrollY, 100)
111+
equal(frame.window.pageYOffset, 100)
112112

113113
frame.$('#main').on('pjax:success', function() {
114-
equal(frame.window.scrollY, 100)
114+
equal(frame.window.pageYOffset, 100)
115115
start()
116116
})
117117
frame.$.pjax({
@@ -943,19 +943,19 @@ if ($.support.pjax) {
943943
equal(frame.location.pathname, "/home.html")
944944

945945
frame.window.scrollTo(0, 100)
946-
equal(frame.window.scrollY, 100)
946+
equal(frame.window.pageYOffset, 100)
947947

948948
frame.$("#main").on("pjax:complete", function() {
949949
equal(frame.location.pathname, "/long.html")
950-
equal(frame.window.scrollY, 0)
950+
equal(frame.window.pageYOffset, 0)
951951

952952
ok(frame.history.length > 1)
953953
goBack(frame, function() {
954954
equal(frame.location.pathname, "/home.html")
955955

956956
// PENDING: Popstate scroll position restore doesn't seem to
957957
// work inside an iframe.
958-
// equal(frame.window.scrollY, 100)
958+
// equal(frame.window.pageYOffset, 100)
959959

960960
start()
961961
})

test/unit/pjax_fallback.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ asyncTest("scrolls to top of the page"+s, function() {
107107
var frame = this.frame
108108

109109
frame.window.scrollTo(0, 100)
110-
equal(frame.window.scrollY, 100)
110+
equal(frame.window.pageYOffset, 100)
111111

112112
this.loaded = function(frame) {
113-
equal(frame.window.scrollY, 0)
113+
equal(frame.window.pageYOffset, 0)
114114
start()
115115
}
116116

@@ -123,13 +123,13 @@ asyncTest("scrolls to top of the page"+s, function() {
123123
asyncTest("scrolls to anchor at top page"+s, function() {
124124
var frame = this.frame
125125

126-
equal(frame.window.scrollY, 0)
126+
equal(frame.window.pageYOffset, 0)
127127

128128
this.loaded = function(frame) {
129129
setTimeout(function() {
130130
equal(frame.location.pathname, "/anchor.html")
131131
equal(frame.location.hash, "#top")
132-
equal(frame.window.scrollY, 8)
132+
equal(frame.window.pageYOffset, 8)
133133
start()
134134
}, 100)
135135
}
@@ -151,11 +151,11 @@ asyncTest("scrolls to anchor at top page"+s, function() {
151151
asyncTest("empty anchor doesn't scroll page"+s, function() {
152152
var frame = this.frame
153153

154-
equal(frame.window.scrollY, 0)
154+
equal(frame.window.pageYOffset, 0)
155155

156156
this.loaded = function(frame) {
157157
setTimeout(function() {
158-
equal(frame.window.scrollY, 0)
158+
equal(frame.window.pageYOffset, 0)
159159
start()
160160
}, 10)
161161
}
@@ -169,11 +169,11 @@ asyncTest("empty anchor doesn't scroll page"+s, function() {
169169
asyncTest("scrolls to anchor at bottom page"+s, function() {
170170
var frame = this.frame
171171

172-
equal(frame.window.scrollY, 0)
172+
equal(frame.window.pageYOffset, 0)
173173

174174
this.loaded = function(frame) {
175175
setTimeout(function() {
176-
equal(frame.window.scrollY, 10008)
176+
equal(frame.window.pageYOffset, 10008)
177177
start()
178178
}, 10)
179179
}
@@ -187,11 +187,11 @@ asyncTest("scrolls to anchor at bottom page"+s, function() {
187187
asyncTest("scrolls to named encoded anchor"+s, function() {
188188
var frame = this.frame
189189

190-
equal(frame.window.scrollY, 0)
190+
equal(frame.window.pageYOffset, 0)
191191

192192
this.loaded = function(frame) {
193193
setTimeout(function() {
194-
equal(frame.window.scrollY, 10008)
194+
equal(frame.window.pageYOffset, 10008)
195195
start()
196196
}, 10)
197197
}

0 commit comments

Comments
 (0)