Skip to content

Commit 4567901

Browse files
luigifabluigifab
authored
(BC) Removed IE compatibility (#1073)
* Remove IE files * Remove css filter:progid * Mark addCssIe and addJsIe and <if> tag as deprecated and disable them * Remove isIE6 and remove two unused parameter * Remove disabled console emulation * Remove fix-defer-before.js * Remove eot files
1 parent 0b25d96 commit 4567901

File tree

59 files changed

+170
-10207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+170
-10207
lines changed

‎app/code/core/Mage/Page/Block/Html/Head.php‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ public function addJs($name, $params = "", $referenceName = "*", $before = null)
8686
* @param string $referenceName
8787
* @param bool $before
8888
* @return $this
89+
* @deprecated
8990
*/
9091
public function addCssIe($name, $params = "", $referenceName = "*", $before = null)
9192
{
92-
$this->addItem('skin_css', $name, $params, 'IE', null, $referenceName, $before);
9393
return $this;
9494
}
9595

@@ -101,10 +101,10 @@ public function addCssIe($name, $params = "", $referenceName = "*", $before = nu
101101
* @param string $referenceName
102102
* @param bool $before
103103
* @return $this
104+
* @deprecated
104105
*/
105106
public function addJsIe($name, $params = "", $referenceName = "*", $before = null)
106107
{
107-
$this->addItem('js', $name, $params, 'IE', null, $referenceName, $before);
108108
return $this;
109109
}
110110

@@ -225,12 +225,8 @@ public function getCssJsHtml()
225225
continue;
226226
}
227227
if (!empty($if)) {
228-
// open !IE conditional using raw value
229-
if (strpos($if, "><!-->") !== false) {
230-
$html .= $if . "\n";
231-
} else {
232-
$html .= '<!--[if '.$if.']>' . "\n";
233-
}
228+
// @deprecated
229+
continue;
234230
}
235231

236232
// static and skin css
@@ -253,15 +249,6 @@ public function getCssJsHtml()
253249
if (!empty($items['other'])) {
254250
$html .= $this->_prepareOtherHtmlHeadElements($items['other']) . "\n";
255251
}
256-
257-
if (!empty($if)) {
258-
// close !IE conditional comments correctly
259-
if (strpos($if, "><!-->") !== false) {
260-
$html .= '<!--<![endif]-->' . "\n";
261-
} else {
262-
$html .= '<![endif]-->' . "\n";
263-
}
264-
}
265252
}
266253
return $html;
267254
}

‎app/design/adminhtml/default/default/layout/main.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ Default layout, loads most of the pages
5656
<block type="adminhtml/page_head" name="head" as="head" template="page/head.phtml">
5757
<action method="setTitle" translate="title"><title>OpenMage Admin</title></action>
5858
<action method="addJs"><script>prototype/prototype.js</script></action>
59-
<action method="addItem"><type>js</type><name>extjs/fix-defer-before.js</name><params/><if/><condition>can_load_ext_js</condition></action>
6059
<action method="addJs"><script>prototype/window.js</script></action>
6160
<action method="addJs"><script>scriptaculous/builder.js</script></action>
6261
<action method="addJs"><script>scriptaculous/effects.js</script></action>
@@ -83,15 +82,8 @@ Default layout, loads most of the pages
8382
<action method="addCss"><name>boxes.css</name></action>
8483
<action method="addCss"><name>custom.css</name></action>
8584

86-
<action method="addItem"><type>skin_css</type><name>iestyles.css</name><params/><if>lt IE 8</if></action>
87-
<action method="addItem"><type>skin_css</type><name>below_ie7.css</name><params/><if>lt IE 7</if></action>
88-
<action method="addItem"><type>skin_css</type><name>ie7.css</name><params/><if>IE 7</if></action>
89-
9085
<action method="addCss"><name>print.css</name><params>media="print"</params></action>
9186

92-
<action method="addItem"><type>js</type><name>lib/ds-sleight.js</name><params>defer</params><if>lt IE 7</if></action>
93-
<action method="addItem"><type>js</type><name>varien/iehover-fix.js</name><params/><if>lt IE 7</if></action>
94-
9587
<action method="addItem"><type>skin_css</type><name>menu.css</name><params>media="screen, projection"</params></action>
9688

9789
<action method="addItem"><type>js_css</type><name>calendar/calendar-win2k-1.css</name><params/><!--<if/><condition>can_load_calendar_js</condition>--></action>

‎app/design/adminhtml/default/default/layout/oauth.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@
9696
<action method="removeItem"><type>js</type><name>mage/adminhtml/product.js</name></action>
9797
<action method="removeItem"><type>js</type><name>mage/adminhtml/rules.js</name></action>
9898
<action method="removeItem"><type>js</type><name>mage/adminhtml/wysiwyg/tiny_mce/setup.js</name></action>
99-
<action method="removeItem"><type>js</type><name>lib/ds-sleight.js</name></action>
100-
<action method="removeItem"><type>js</type><name>varien/iehover-fix.js</name></action>
10199

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

108106
<action method="removeItem"><type>js</type><name>calendar/calendar.js</name></action>
109107
<action method="removeItem"><type>js</type><name>calendar/calendar-setup.js</name></action>
110-
<action method="removeItem"><type>js</type><name>extjs/fix-defer-before.js</name></action>
111108
<action method="removeItem"><type>js</type><name>extjs/ext-tree.js</name></action>
112109
<action method="removeItem"><type>js</type><name>extjs/fix-defer.js</name></action>
113110
<action method="removeItem"><type>js</type><name>extjs/ext-tree-checkbox.js</name></action>

‎app/design/adminhtml/default/default/template/example.phtml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
/*<![CDATA[*/ @import "<?php echo $this->getSkinUrl('styles.css') ?>"; /*]]>*/
3434
</style>
3535
<link rel="stylesheet" type="text/css" media="screen, projection" href="<?php echo $this->getSkinUrl('menu-top.css') ?>" />
36-
<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css') ?>" type="text/css" media="all" /> <![endif]-->
37-
<!--[if lt IE 7]><script defer type="text/javascript" src="<?php echo $baseUrl ?>js/lib/ds-sleight.js"></script><![endif]-->
3836
<script type="text/javascript" src="<?php echo $baseUrl ?>js/lib/dropdown.js"></script>
3937
</head>
4038
<body>

‎app/design/adminhtml/default/default/template/forgotpassword.phtml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@
3737

3838
<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>
3939
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/captcha.js') ?>"></script>
40-
41-
<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css'); ?>" type="text/css" media="all" /> <![endif]-->
42-
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('below_ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->
43-
<!--[if IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->
4440
</head>
4541
<body id="page-login">
4642
<div class="login-container">

‎app/design/adminhtml/default/default/template/login.phtml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@
4040
<script type="text/javascript" src="<?php echo $this->getJsUrl('scriptaculous/effects.js') ?>"></script>
4141
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/adminhtml/form.js') ?>"></script>
4242
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/captcha.js') ?>"></script>
43-
44-
<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css') ?>" type="text/css" media="all" /> <![endif]-->
45-
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('below_ie7.css') ?>" type="text/css" media="all" /> <![endif]-->
46-
<!--[if IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('ie7.css') ?>" type="text/css" media="all" /> <![endif]-->
4743
</head>
4844
<body id="page-login" onload="document.forms.loginForm.username.focus();">
4945
<div class="login-container">

‎app/design/adminhtml/default/default/template/resetforgottenpassword.phtml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@
3636
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico'); ?>" type="image/x-icon" />
3737

3838
<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>
39-
40-
<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css'); ?>" type="text/css" media="all" /> <![endif]-->
41-
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('below_ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->
42-
<!--[if IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->
4339
</head>
4440
<body id="page-login">
4541
<div class="login-container">

‎app/design/adminhtml/default/openmage/template/forgotpassword.phtml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@
3636

3737
<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>
3838
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/captcha.js') ?>"></script>
39-
40-
<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css'); ?>" type="text/css" media="all" /> <![endif]-->
41-
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('below_ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->
42-
<!--[if IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->
4339
</head>
4440
<body id="page-login">
4541
<div class="login-container">
@@ -71,4 +67,3 @@
7167
</div>
7268
</body>
7369
</html>
74-

‎app/design/adminhtml/default/openmage/template/login.phtml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
<meta name="robots" content="noindex, nofollow" />
3232
<title><?php echo Mage::helper('adminhtml')->__('Log into OpenMage LTS Admin Page') ?></title>
3333
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('login.css') ?>" media="all" />
34-
3534
<link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
3635
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
3736

@@ -40,10 +39,6 @@
4039
<script type="text/javascript" src="<?php echo $this->getJsUrl('scriptaculous/effects.js') ?>"></script>
4140
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/adminhtml/form.js') ?>"></script>
4241
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/captcha.js') ?>"></script>
43-
44-
<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css') ?>" type="text/css" media="all" /> <![endif]-->
45-
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('below_ie7.css') ?>" type="text/css" media="all" /> <![endif]-->
46-
<!--[if IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('ie7.css') ?>" type="text/css" media="all" /> <![endif]-->
4742
</head>
4843
<body id="page-login" onload="document.forms.loginForm.username.focus();">
4944
<div class="login-container">
@@ -75,4 +70,3 @@
7570
</div>
7671
</body>
7772
</html>
78-

‎app/design/adminhtml/default/openmage/template/resetforgottenpassword.phtml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico'); ?>" type="image/x-icon" />
3636

3737
<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>
38-
3938
</head>
4039
<body id="page-login">
4140
<div class="login-container">

0 commit comments

Comments
 (0)