From 6940dc24991ac606d1d30295f09c13cda0e404b2 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 25 Oct 2015 14:16:36 -0400 Subject: [PATCH] add ie delay --- dashboard-ui/devices/ie/ie.js | 2 ++ .../jquery.mobile.custom.js | 23 +++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dashboard-ui/devices/ie/ie.js b/dashboard-ui/devices/ie/ie.js index 5527208e81..7109eeaa89 100644 --- a/dashboard-ui/devices/ie/ie.js +++ b/dashboard-ui/devices/ie/ie.js @@ -24,6 +24,8 @@ }); appStorage.setItem("ieswitchtoedge", expectedValue); + } else { + } } diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js index 34dcf09d37..ba665cfb97 100644 --- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js +++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js @@ -3179,11 +3179,24 @@ $.widget( "mobile.page", { }, from ); } - // TODO deprecate prevPage in favor of previous - this._triggerWithDeprecated( prefix + "show", { - prevPage: from || $( "" ), - toPage: to - }, to ); + // TODO deprecate prevPage in favor of previous + if (!prefix && $.browser.msie) { + + // Add a delay for IE because it seems to be having issues with web components + var curr = this; + setTimeout(function() { + curr._triggerWithDeprecated(prefix + "show", { + prevPage: from || $(""), + toPage: to + }, to); + }, 50); + + } else { + this._triggerWithDeprecated(prefix + "show", { + prevPage: from || $(""), + toPage: to + }, to); + } }, // TODO make private once change has been defined in the widget