Skip to content

Commit

Permalink
fixes #19028, Compare element to window object rather than checking f…
Browse files Browse the repository at this point in the history
…or scrollTo property
  • Loading branch information
maier49 authored and dylans committed Aug 10, 2017
1 parent 0006b77 commit 2bdc65a
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions fx/scroll.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
define(["dojo/_base/kernel","dojo/_base/lang", "dojo/_base/fx", "dojox/fx/_base","dojox/fx/_core","dojo/dom-geometry","dojo/_base/sniff"],
function (kernel, lang, baseFx, fxExt, Line, domGeom, has){
define(["dojo/_base/kernel","dojo/_base/lang", "dojo/_base/fx", "dojo/_base/window", "dojox/fx/_base","dojox/fx/_core","dojo/dom-geometry","dojo/_base/sniff"],
function (kernel, lang, baseFx, win, fxExt, Line, domGeom, has){
kernel.experimental("dojox.fx.scroll");
var fx = lang.getObject("dojox.fx",true);
fxExt.smoothScroll = function(/* Object */args){
Expand All @@ -15,9 +15,8 @@ define(["dojo/_base/kernel","dojo/_base/lang", "dojo/_base/fx", "dojox/fx/_base"

if(!args.target){ args.target = domGeom.position(args.node); }

var isWindow = lang[(has("ie") ? "isObject" : "isFunction")](args["win"].scrollTo),
delta = { x: args.target.x, y: args.target.y }
;
var isWindow = args["win"] === win.global,
delta = { x: args.target.x, y: args.target.y };
if(!isWindow){
var winPos = domGeom.position(args.win);
delta.x -= winPos.x;
Expand Down

0 comments on commit 2bdc65a

Please sign in to comment.