Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(BC) Removed IE compatibility #1073

Merged
merged 7 commits into from
May 19, 2021
Merged

(BC) Removed IE compatibility #1073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
937683e
Remove IE files
luigifab Jul 10, 2020
7ee594b
Remove css filter:progid
luigifab Jul 10, 2020
9cd836c
Mark addCssIe and addJsIe and <if> tag as deprecated and disable them
luigifab Jul 10, 2020
f69b64f
Remove isIE6 and remove two unused parameter
luigifab Jul 10, 2020
cfec0e4
Remove disabled console emulation
luigifab Jul 10, 2020
965c662
Remove fix-defer-before.js
luigifab Jan 1, 2021
26b8726
Remove eot files
luigifab Jan 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions app/code/core/Mage/Page/Block/Html/Head.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ public function addJs($name, $params = "", $referenceName = "*", $before = null)
* @param string $referenceName
* @param bool $before
* @return $this
* @deprecated
*/
public function addCssIe($name, $params = "", $referenceName = "*", $before = null)
{
$this->addItem('skin_css', $name, $params, 'IE', null, $referenceName, $before);
return $this;
}

Expand All @@ -101,10 +101,10 @@ public function addCssIe($name, $params = "", $referenceName = "*", $before = nu
* @param string $referenceName
* @param bool $before
* @return $this
* @deprecated
*/
public function addJsIe($name, $params = "", $referenceName = "*", $before = null)
{
$this->addItem('js', $name, $params, 'IE', null, $referenceName, $before);
return $this;
}

Expand Down Expand Up @@ -225,12 +225,8 @@ public function getCssJsHtml()
continue;
}
if (!empty($if)) {
// open !IE conditional using raw value
if (strpos($if, "><!-->") !== false) {
$html .= $if . "\n";
} else {
$html .= '<!--[if '.$if.']>' . "\n";
}
// @deprecated
continue;
}

// static and skin css
Expand All @@ -253,15 +249,6 @@ public function getCssJsHtml()
if (!empty($items['other'])) {
$html .= $this->_prepareOtherHtmlHeadElements($items['other']) . "\n";
}

if (!empty($if)) {
// close !IE conditional comments correctly
if (strpos($if, "><!-->") !== false) {
$html .= '<!--<![endif]-->' . "\n";
} else {
$html .= '<![endif]-->' . "\n";
}
}
}
return $html;
}
Expand Down
8 changes: 0 additions & 8 deletions app/design/adminhtml/default/default/layout/main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ Default layout, loads most of the pages
<block type="adminhtml/page_head" name="head" as="head" template="page/head.phtml">
<action method="setTitle" translate="title"><title>OpenMage Admin</title></action>
<action method="addJs"><script>prototype/prototype.js</script></action>
<action method="addItem"><type>js</type><name>extjs/fix-defer-before.js</name><params/><if/><condition>can_load_ext_js</condition></action>
<action method="addJs"><script>prototype/window.js</script></action>
<action method="addJs"><script>scriptaculous/builder.js</script></action>
<action method="addJs"><script>scriptaculous/effects.js</script></action>
Expand All @@ -83,15 +82,8 @@ Default layout, loads most of the pages
<action method="addCss"><name>boxes.css</name></action>
<action method="addCss"><name>custom.css</name></action>

<action method="addItem"><type>skin_css</type><name>iestyles.css</name><params/><if>lt IE 8</if></action>
<action method="addItem"><type>skin_css</type><name>below_ie7.css</name><params/><if>lt IE 7</if></action>
<action method="addItem"><type>skin_css</type><name>ie7.css</name><params/><if>IE 7</if></action>

<action method="addCss"><name>print.css</name><params>media="print"</params></action>

<action method="addItem"><type>js</type><name>lib/ds-sleight.js</name><params>defer</params><if>lt IE 7</if></action>
<action method="addItem"><type>js</type><name>varien/iehover-fix.js</name><params/><if>lt IE 7</if></action>

<action method="addItem"><type>skin_css</type><name>menu.css</name><params>media="screen, projection"</params></action>

<action method="addItem"><type>js_css</type><name>calendar/calendar-win2k-1.css</name><params/><!--<if/><condition>can_load_calendar_js</condition>--></action>
Expand Down
3 changes: 0 additions & 3 deletions app/design/adminhtml/default/default/layout/oauth.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@
<action method="removeItem"><type>js</type><name>mage/adminhtml/product.js</name></action>
<action method="removeItem"><type>js</type><name>mage/adminhtml/rules.js</name></action>
<action method="removeItem"><type>js</type><name>mage/adminhtml/wysiwyg/tiny_mce/setup.js</name></action>
<action method="removeItem"><type>js</type><name>lib/ds-sleight.js</name></action>
<action method="removeItem"><type>js</type><name>varien/iehover-fix.js</name></action>

<action method="removeItem"><type>css</type><name>print.css</name></action>
<action method="removeItem"><type>js_css</type><name>calendar/calendar-win2k-1.css</name></action>
Expand All @@ -107,7 +105,6 @@

<action method="removeItem"><type>js</type><name>calendar/calendar.js</name></action>
<action method="removeItem"><type>js</type><name>calendar/calendar-setup.js</name></action>
<action method="removeItem"><type>js</type><name>extjs/fix-defer-before.js</name></action>
<action method="removeItem"><type>js</type><name>extjs/ext-tree.js</name></action>
<action method="removeItem"><type>js</type><name>extjs/fix-defer.js</name></action>
<action method="removeItem"><type>js</type><name>extjs/ext-tree-checkbox.js</name></action>
Expand Down
2 changes: 0 additions & 2 deletions app/design/adminhtml/default/default/template/example.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
/*<![CDATA[*/ @import "<?php echo $this->getSkinUrl('styles.css') ?>"; /*]]>*/
</style>
<link rel="stylesheet" type="text/css" media="screen, projection" href="<?php echo $this->getSkinUrl('menu-top.css') ?>" />
<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css') ?>" type="text/css" media="all" /> <![endif]-->
<!--[if lt IE 7]><script defer type="text/javascript" src="<?php echo $baseUrl ?>js/lib/ds-sleight.js"></script><![endif]-->
<script type="text/javascript" src="<?php echo $baseUrl ?>js/lib/dropdown.js"></script>
</head>
<body>
Expand Down
4 changes: 0 additions & 4 deletions app/design/adminhtml/default/default/template/forgotpassword.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@

<script type="text/javascript" src="<?php echo $this->getJsUrl(); ?>index.php/x.js?f=prototype/prototype.js,prototype/validation.js,mage/adminhtml/events.js,mage/adminhtml/form.js,scriptaculous/effects.js"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/captcha.js') ?>"></script>

<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css'); ?>" type="text/css" media="all" /> <![endif]-->
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('below_ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->
<!--[if IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->
</head>
<body id="page-login">
<div class="login-container">
Expand Down
4 changes: 0 additions & 4 deletions app/design/adminhtml/default/default/template/login.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@
<script type="text/javascript" src="<?php echo $this->getJsUrl('scriptaculous/effects.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/adminhtml/form.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/captcha.js') ?>"></script>

<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css') ?>" type="text/css" media="all" /> <![endif]-->
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('below_ie7.css') ?>" type="text/css" media="all" /> <![endif]-->
<!--[if IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('ie7.css') ?>" type="text/css" media="all" /> <![endif]-->
</head>
<body id="page-login" onload="document.forms.loginForm.username.focus();">
<div class="login-container">
Expand Down
4 changes: 0 additions & 4 deletions app/design/adminhtml/default/default/template/resetforgottenpassword.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico'); ?>" type="image/x-icon" />

<script type="text/javascript" src="<?php echo $this->getJsUrl() ?>index.php/x.js?f=prototype/prototype.js,prototype/validation.js,mage/adminhtml/events.js,mage/adminhtml/form.js,scriptaculous/effects.js"></script>

<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css'); ?>" type="text/css" media="all" /> <![endif]-->
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('below_ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->
<!--[if IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->
</head>
<body id="page-login">
<div class="login-container">
Expand Down
5 changes: 0 additions & 5 deletions app/design/adminhtml/default/openmage/template/forgotpassword.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@

<script type="text/javascript" src="<?php echo $this->getJsUrl(); ?>index.php/x.js?f=prototype/prototype.js,prototype/validation.js,mage/adminhtml/events.js,mage/adminhtml/form.js,scriptaculous/effects.js"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/captcha.js') ?>"></script>

<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css'); ?>" type="text/css" media="all" /> <![endif]-->
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('below_ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->
<!--[if IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->
</head>
<body id="page-login">
<div class="login-container">
Expand Down Expand Up @@ -71,4 +67,3 @@
</div>
</body>
</html>

6 changes: 0 additions & 6 deletions app/design/adminhtml/default/openmage/template/login.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
<meta name="robots" content="noindex, nofollow" />
<title><?php echo Mage::helper('adminhtml')->__('Log into OpenMage LTS Admin Page') ?></title>
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('login.css') ?>" media="all" />

<link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />

Expand All @@ -40,10 +39,6 @@
<script type="text/javascript" src="<?php echo $this->getJsUrl('scriptaculous/effects.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/adminhtml/form.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/captcha.js') ?>"></script>

<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css') ?>" type="text/css" media="all" /> <![endif]-->
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('below_ie7.css') ?>" type="text/css" media="all" /> <![endif]-->
<!--[if IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('ie7.css') ?>" type="text/css" media="all" /> <![endif]-->
</head>
<body id="page-login" onload="document.forms.loginForm.username.focus();">
<div class="login-container">
Expand Down Expand Up @@ -75,4 +70,3 @@
</div>
</body>
</html>

1 change: 0 additions & 1 deletion app/design/adminhtml/default/openmage/template/resetforgottenpassword.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico'); ?>" type="image/x-icon" />

<script type="text/javascript" src="<?php echo $this->getJsUrl() ?>index.php/x.js?f=prototype/prototype.js,prototype/validation.js,mage/adminhtml/events.js,mage/adminhtml/form.js,scriptaculous/effects.js"></script>

</head>
<body id="page-login">
<div class="login-container">
Expand Down
9 changes: 0 additions & 9 deletions app/design/frontend/base/default/layout/page.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,8 @@ Default layout, loads most of the pages
<block type="page/js_cookie" name="js_cookies" template="page/js/cookie.phtml"/>

<action method="addCss"><stylesheet>css/styles.css</stylesheet></action>
<action method="addItem"><type>skin_css</type><name>css/styles-ie.css</name><params/><if>lt IE 8</if></action>
<action method="addCss"><stylesheet>css/widgets.css</stylesheet></action>
<action method="addCss"><stylesheet>css/print.css</stylesheet><params>media="print"</params></action>

<action method="addItem"><type>js</type><name>lib/ds-sleight.js</name><params/><if>lt IE 7</if></action>
<action method="addItem"><type>skin_js</type><name>js/ie6.js</name><params/><if>lt IE 7</if></action>
</block>

<block type="core/text_list" name="after_body_start" as="after_body_start" translate="label">
Expand Down Expand Up @@ -128,13 +124,8 @@ Default layout, loads most of the pages
<action method="addJs"><script>varien/js.js</script></action>

<action method="addCss"><stylesheet>css/styles.css</stylesheet></action>
<action method="addItem"><type>skin_css</type><name>css/styles-ie.css</name><params/><if>lt IE 8</if></action>
<action method="addCss"><stylesheet>css/widgets.css</stylesheet></action>
<action method="addCss"><stylesheet>css/print.css</stylesheet><params>media="print"</params></action>

<action method="addItem"><type>js</type><name>lib/ds-sleight.js</name><params/><if>lt IE 7</if></action>
<action method="addItem"><type>skin_js</type><name>js/ie6.js</name><params/><if>lt IE 7</if></action>

</block>

<block type="core/text_list" name="content" as="content" translate="label">
Expand Down
22 changes: 0 additions & 22 deletions app/design/frontend/base/default/template/checkout/cart.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,28 +102,6 @@
<?php endif; ?>
<button type="submit" name="update_cart_action" value="update_qty" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Shopping Cart')); ?>" class="button btn-update"><span><span><?php echo $this->__('Update Shopping Cart'); ?></span></span></button>
<button type="submit" name="update_cart_action" value="empty_cart" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Clear Shopping Cart')); ?>" class="button btn-empty" id="empty_cart_button"><span><span><?php echo $this->__('Clear Shopping Cart'); ?></span></span></button>
<!--[if lt IE 8]>
<input type="hidden" id="update_cart_action_container" />
<script type="text/javascript">
//<![CDATA[
Event.observe(window, 'load', function()
{
// Internet Explorer (lt 8) does not support value attribute in button elements
$emptyCartButton = $('empty_cart_button');
$cartActionContainer = $('update_cart_action_container');
if ($emptyCartButton && $cartActionContainer) {
Event.observe($emptyCartButton, 'click', function()
{
$emptyCartButton.setAttribute('name', 'update_cart_action_temp');
$cartActionContainer.setAttribute('name', 'update_cart_action');
$cartActionContainer.setValue('empty_cart');
});
}

});
//]]>
</script>
<![endif]-->
</td>
</tr>
</tfoot>
Expand Down
8 changes: 0 additions & 8 deletions app/design/frontend/base/default/template/page/html/head.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,6 @@
<meta name="robots" content="<?php echo htmlspecialchars($this->getRobots()) ?>" />
<link rel="icon" href="<?php echo $this->getFaviconFile(); ?>" type="image/x-icon" />
<link rel="shortcut icon" href="<?php echo $this->getFaviconFile(); ?>" type="image/x-icon" />
<!--[if lt IE 7]>
<script type="text/javascript">
//<![CDATA[
var BLANK_URL = '<?php echo $this->helper('core/js')->getJsUrl('blank.html') ?>';
var BLANK_IMG = '<?php echo $this->helper('core/js')->getJsUrl('spacer.gif') ?>';
//]]>
</script>
<![endif]-->
<?php echo $this->getCssJsHtml() ?>
<?php echo $this->getChildHtml() ?>
<?php echo $this->helper('core/js')->getTranslatorScript() ?>
Expand Down
14 changes: 2 additions & 12 deletions app/design/frontend/rwd/default/layout/page.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@

<block type="page/js_cookie" name="js_cookies" template="page/js/cookie.phtml"/>

<!-- Remove items which the RWD package is not dependent upon -->
<action method="removeItem"><type>skin_js</type><name>js/ie6.js</name></action>

<!-- Add vendor dependencies -->
<action method="addItem"><type>skin_js</type><name>js/lib/modernizr.custom.min.js</name></action>
<action method="addItem"><type>skin_js</type><name>js/lib/selectivizr.js</name></action>
Expand All @@ -69,13 +66,9 @@
<action method="addLinkRel"><rel>stylesheet</rel><href><![CDATA[//fonts.googleapis.com/css?family=Raleway:300,400,500,700,600&display=swap]]></href></action>
<action method="addItem"><type>skin_js</type><name>js/minicart.js</name></action>

<!-- Add stylesheets with no media queries for use in IE 8 and below -->
<action method="addItem"><type>skin_css</type><name>css/styles-ie8.css</name><params/><if><![CDATA[ (lte IE 8) & (!IEMobile)]]></if></action>
<action method="addItem"><type>skin_css</type><name>css/madisonisland-ie8.css</name><params/><if><![CDATA[ (lte IE 8) & (!IEMobile)]]></if></action>

<!-- Add stylesheets with media queries for use by modern browsers -->
<action method="addItem"><type>skin_css</type><name>css/styles.css</name><params/><if><![CDATA[<!--[if (gte IE 9) | (IEMobile)]><!-->]]></if></action>
<action method="addItem"><type>skin_css</type><name>css/madisonisland.css</name><params/><if><![CDATA[<!--[if (gte IE 9) | (IEMobile)]><!-->]]></if></action>
<action method="addItem"><type>skin_css</type><name>css/styles.css</name></action>
<action method="addItem"><type>skin_css</type><name>css/madisonisland.css</name></action>

<!-- Sets viewport meta tag using text block -->
<block type="core/text" name="head.viewport">
Expand Down Expand Up @@ -175,9 +168,6 @@

<action method="addCss"><stylesheet>css/styles.css</stylesheet></action>
<action method="addCss"><stylesheet>css/widgets.css</stylesheet></action>

<action method="addItem"><type>js</type><name>lib/ds-sleight.js</name><params/><if>lt IE 7</if></action>
<!--<action method="addItem"><type>skin_js</type><name>js/iehover-fix.js</name><params/><if>lt IE 7</if></action>-->
</block>

<block type="core/text_list" name="content" as="content" translate="label">
Expand Down
Loading