tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-25 14:54:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove IE8 & IE9 traces

Browse Source
This commit is contained in:
Jennifer Mourek 2019-07-04 12:15:23 +02:00 committed by Johannes Meyer
parent 5fe264be6a
commit 07586af41f
3 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
application/layouts/scripts/layout.phtml
View File

@ -10,7 +10,6 @@ if (array_key_exists('_dev', $_GET)) {
$cssfile = 'css/icinga.min.css'; $cssfile = 'css/icinga.min.css';
} }
$ie8jsfile = 'js/icinga.ie8.js';
$lang = Translator::splitLocaleCode()->language; $lang = Translator::splitLocaleCode()->language;
$isIframe = $this->layout()->isIframe; $isIframe = $this->layout()->isIframe;
$showFullscreen = $this->layout()->showFullscreen; $showFullscreen = $this->layout()->showFullscreen;
@ -18,8 +17,6 @@ $iframeClass = $isIframe ? ' iframe' : '';
$innerLayoutScript = $this->layout()->innerLayout . '.phtml'; $innerLayoutScript = $this->layout()->innerLayout . '.phtml';
?><!DOCTYPE html> ?><!DOCTYPE html>
<!--[if IE 8]>
<html class="no-js ie8<?= $iframeClass ?>" lang="<?= $lang ?>"> <![endif]-->
<!--[if gt IE 8]><!--> <!--[if gt IE 8]><!-->
<html class="no-js<?= $iframeClass ?>" lang="<?= $lang ?>"> <!--<![endif]--> <html class="no-js<?= $iframeClass ?>" lang="<?= $lang ?>"> <!--<![endif]-->
<head> <head>
@ -46,9 +43,6 @@ $innerLayoutScript = $this->layout()->innerLayout . '.phtml';
<?php endif ?> <?php endif ?>
<link rel="stylesheet" href="<?= $this->href($cssfile) ?>" media="all" type="text/css" /> <link rel="stylesheet" href="<?= $this->href($cssfile) ?>" media="all" type="text/css" />
<!-- Respond.js IE8 support of media queries --> <!-- Respond.js IE8 support of media queries -->
<!--[if lt IE 9]>
<script src="<?= $this->baseUrl('js/vendor/respond.min.js');?>"></script>
<![endif]-->
<link type="image/png" rel="shortcut icon" href="<?= $this->baseUrl('img/favicon.png') ?>" /> <link type="image/png" rel="shortcut icon" href="<?= $this->baseUrl('img/favicon.png') ?>" />
<link rel="apple-touch-icon" href="<?= $this->baseUrl('img/touch-icon.png') ?>"> <link rel="apple-touch-icon" href="<?= $this->baseUrl('img/touch-icon.png') ?>">
</head> </head>
@ -85,9 +79,6 @@ $innerLayoutScript = $this->layout()->innerLayout . '.phtml';
<!--[if lt IE 10]> <!--[if lt IE 10]>
<iframe id="fileupload-frame-target" name="fileupload-frame-target"></iframe> <iframe id="fileupload-frame-target" name="fileupload-frame-target"></iframe>
<![endif]--> <![endif]-->
<!--[if IE 8]>
<script type="text/javascript" src="<?= $this->href($ie8jsfile) ?>"></script>
<![endif]-->
<!--[if gt IE 8]><!--> <!--[if gt IE 8]><!-->
<script type="text/javascript" src="<?= $this->href($jsfile) ?>"></script> <script type="text/javascript" src="<?= $this->href($jsfile) ?>"></script>
<!--<![endif]--> <!--<![endif]-->

4
library/Icinga/Application/webrouter.php
View File

@ -70,10 +70,6 @@ if (in_array($path, $special)) {
JavaScript::sendMinified(); JavaScript::sendMinified();
break; break;
case 'js/icinga.ie8.js':
JavaScript::sendForIe8();
break;
default: default:
return false; return false;
} }

11
library/Icinga/Web/JavaScript.php
View File

@ -46,22 +46,11 @@ class JavaScript
'js/vendor/jquery.tipsy' 'js/vendor/jquery.tipsy'
); );
protected static $ie8VendorFiles = array(
'js/vendor/jquery.sparkline',
'js/vendor/jquery.tipsy'
);
public static function sendMinified() public static function sendMinified()
{ {
self::send(true); self::send(true);
} }
public static function sendForIe8()
{
self::$vendorFiles = self::$ie8VendorFiles;
self::send();
}
/** /**
* Send the client side script code to the client * Send the client side script code to the client
* *