fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG-14022 Cut frame with user experience mobile, switchable SOLVED

Browse Source 
- Style not allowed.
- A validation was added for version ie 10-11 in file index.html
This commit is contained in:
Marco Antonio Nina
2014-09-03 13:41:00 -04:00
parent 558903b4dc
commit a6ac05059a
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gulliver/system/class.g.php
View File

@@ -4385,7 +4385,7 @@ class G
} }
// Next get the name of the useragent yes seperately and for good reason // Next get the name of the useragent yes seperately and for good reason
if (preg_match( '/MSIE/i', $u_agent ) && ! preg_match( '/Opera/i', $u_agent )) { 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 )) {
$bname = 'Internet Explorer'; $bname = 'Internet Explorer';
$ub = "MSIE"; $ub = "MSIE";
} elseif (preg_match( '/Firefox/i', $u_agent )) { } elseif (preg_match( '/Firefox/i', $u_agent )) {
@@ -4419,7 +4419,7 @@ class G
if (strripos( $u_agent, "Version" ) < strripos( $u_agent, $ub )) { if (strripos( $u_agent, "Version" ) < strripos( $u_agent, $ub )) {
$version = $matches['version'][0]; $version = $matches['version'][0];
} else { } else {
$version = $matches['version'][1]; $version = isset($matches['version'][1]) ? $matches['version'][1] : '';
} }
} else { } else {
$version = $matches['version'][0]; $version = $matches['version'][0];

3
workflow/engine/skinEngine/simplified/templates/index.html
View File

@@ -31,11 +31,10 @@
var h = $(window).height() - 42; var h = $(window).height() - 42;
$('iframe').height(h); $('iframe').height(h);
//IE V10-V11 //IE V10-V11
if (navigator.appVersion.indexOf("MSIE 1") != -1) { if ((navigator.appVersion.indexOf("MSIE 1") != -1) || (!!(navigator.userAgent.match(/Trident/) && !navigator.userAgent.match(/MSIE/)))) {
h = $('iframe').attr('style'); h = $('iframe').attr('style');
$('iframe').attr('style', h+' padding-top : 40px;'); $('iframe').attr('style', h+' padding-top : 40px;');
} }
} }
function redirect(url) function redirect(url)

3
workflow/engine/templates/home/index.html
View File

@@ -33,11 +33,10 @@
var h = $(window).height() - 42; var h = $(window).height() - 42;
$('iframe').height(h); $('iframe').height(h);
//IE V10-V11 //IE V10-V11
if (navigator.appVersion.indexOf("MSIE 1") != -1) { if ((navigator.appVersion.indexOf("MSIE 1") != -1) || (!!(navigator.userAgent.match(/Trident/) && !navigator.userAgent.match(/MSIE/)))) {
h = $('iframe').attr('style'); h = $('iframe').attr('style');
$('iframe').attr('style', h+' padding-top : 40px;'); $('iframe').attr('style', h+' padding-top : 40px;');
} }
} }
function redirect(url) function redirect(url)