From 9317b812612f31636c00d64f8bf065cc6896af29 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Thu, 4 Sep 2014 11:40:29 -0400 Subject: [PATCH] BUG-14022 Cut frame with user experience mobile, switchable IMPROVEMENT - Style not allowed. - A validation was added for version ie 8-10-11 in file index.html --- gulliver/system/class.g.php | 2 +- workflow/engine/skinEngine/simplified/templates/index.html | 4 ++-- workflow/engine/templates/home/index.html | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index b88654655..f8db33d1d 100755 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -4385,7 +4385,7 @@ class G } // Next get the name of the useragent yes seperately and for good reason - if ((preg_match('~Trident/7.0; rv:11.0~',$_SERVER["HTTP_USER_AGENT"]) || preg_match( '/MSIE/i', $u_agent )) && ! preg_match( '/Opera/i', $u_agent )) { + if ((preg_match('~Trident/7.0; rv:11.0~', $u_agent) || preg_match( '/MSIE/i', $u_agent )) && ! preg_match( '/Opera/i', $u_agent )) { $bname = 'Internet Explorer'; $ub = "MSIE"; } elseif (preg_match( '/Firefox/i', $u_agent )) { diff --git a/workflow/engine/skinEngine/simplified/templates/index.html b/workflow/engine/skinEngine/simplified/templates/index.html index 6c548b895..c16fba57a 100644 --- a/workflow/engine/skinEngine/simplified/templates/index.html +++ b/workflow/engine/skinEngine/simplified/templates/index.html @@ -30,8 +30,8 @@ { var h = $(window).height() - 42; $('iframe').height(h); - //IE V10-V11 - if ((navigator.appVersion.indexOf("MSIE 1") != -1) || (!!(navigator.userAgent.match(/Trident/) && !navigator.userAgent.match(/MSIE/)))) { + //IE V8-V10-V11 + if ((navigator.appVersion.indexOf("MSIE 8") != -1) || (navigator.appVersion.indexOf("MSIE 1") != -1) || (!!(navigator.userAgent.match(/Trident/) && !navigator.userAgent.match(/MSIE/)))) { h = $('iframe').attr('style'); $('iframe').attr('style', h+' padding-top : 40px;'); } diff --git a/workflow/engine/templates/home/index.html b/workflow/engine/templates/home/index.html index ac16e3a99..0c416c5d8 100644 --- a/workflow/engine/templates/home/index.html +++ b/workflow/engine/templates/home/index.html @@ -32,8 +32,8 @@ { var h = $(window).height() - 42; $('iframe').height(h); - //IE V10-V11 - if ((navigator.appVersion.indexOf("MSIE 1") != -1) || (!!(navigator.userAgent.match(/Trident/) && !navigator.userAgent.match(/MSIE/)))) { + //IE V8-V10-V11 + if ((navigator.appVersion.indexOf("MSIE 8") != -1) || (navigator.appVersion.indexOf("MSIE 1") != -1) || (!!(navigator.userAgent.match(/Trident/) && !navigator.userAgent.match(/MSIE/)))) { h = $('iframe').attr('style'); $('iframe').attr('style', h+' padding-top : 40px;'); }