From 2bdc65ac4dcba96578c934b093b3d4cf299424b5 Mon Sep 17 00:00:00 2001 From: Bradley Maier Date: Thu, 10 Aug 2017 16:25:16 -0700 Subject: [PATCH] fixes #19028, Compare element to window object rather than checking for scrollTo property --- fx/scroll.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/fx/scroll.js b/fx/scroll.js index 24748633cc..7368bb909f 100644 --- a/fx/scroll.js +++ b/fx/scroll.js @@ -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){ @@ -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;