From fe7e04e6ac7fa7962651d7a6a330c3fbe3be138d Mon Sep 17 00:00:00 2001 From: jlukic Date: Mon, 8 Jun 2015 11:34:07 -0400 Subject: [PATCH] Fix for #16644 - Safari iOS fix for canvas resizing affecting Chrome iOS display of fixed content --- src/definitions/modules/sidebar.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/definitions/modules/sidebar.js b/src/definitions/modules/sidebar.js index 81c20c8ee..74cec93f7 100644 --- a/src/definitions/modules/sidebar.js +++ b/src/definitions/modules/sidebar.js @@ -799,10 +799,11 @@ $.fn.sidebar = function(parameters) { }, ios: function() { var - userAgent = navigator.userAgent, - isIOS = userAgent.match(regExp.ios) + userAgent = navigator.userAgent, + isIOS = userAgent.match(regExp.ios), + isMobileChrome = userAgent.match(regExp.mobileChrome) ; - if(isIOS) { + if(isIOS && !isMobileChrome) { module.verbose('Browser was found to be iOS', userAgent); return true; } @@ -1096,8 +1097,9 @@ $.fn.sidebar.settings = { }, regExp: { - ios : /(iPad|iPhone|iPod)/g, - mobile : /Mobile|iP(hone|od|ad)|Android|BlackBerry|IEMobile|Kindle|NetFront|Silk-Accelerated|(hpw|web)OS|Fennec|Minimo|Opera M(obi|ini)|Blazer|Dolfin|Dolphin|Skyfire|Zune/g + ios : /(iPad|iPhone|iPod)/g, + mobileChrome : /(CriOS)/g, + mobile : /Mobile|iP(hone|od|ad)|Android|BlackBerry|IEMobile|Kindle|NetFront|Silk-Accelerated|(hpw|web)OS|Fennec|Minimo|Opera M(obi|ini)|Blazer|Dolfin|Dolphin|Skyfire|Zune/g }, error : {