diff --git a/app/code/core/Mage/Page/Block/Html/Head.php b/app/code/core/Mage/Page/Block/Html/Head.php index f520e3e4f8b..c48d42ca53c 100644 --- a/app/code/core/Mage/Page/Block/Html/Head.php +++ b/app/code/core/Mage/Page/Block/Html/Head.php @@ -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; } @@ -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; } @@ -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 .= '") !== false) { - $html .= '' . "\n"; - } else { - $html .= '' . "\n"; - } - } } return $html; } diff --git a/app/design/adminhtml/default/default/layout/main.xml b/app/design/adminhtml/default/default/layout/main.xml index 6ed06a2339b..33d3accb5f8 100644 --- a/app/design/adminhtml/default/default/layout/main.xml +++ b/app/design/adminhtml/default/default/layout/main.xml @@ -56,7 +56,6 @@ Default layout, loads most of the pages OpenMage Admin - jsextjs/fix-defer-before.jscan_load_ext_js @@ -83,15 +82,8 @@ Default layout, loads most of the pages boxes.css custom.css - skin_cssiestyles.csslt IE 8 - skin_cssbelow_ie7.csslt IE 7 - skin_cssie7.cssIE 7 - print.cssmedia="print" - jslib/ds-sleight.jsdeferlt IE 7 - jsvarien/iehover-fix.jslt IE 7 - skin_cssmenu.cssmedia="screen, projection" js_csscalendar/calendar-win2k-1.css diff --git a/app/design/adminhtml/default/default/layout/oauth.xml b/app/design/adminhtml/default/default/layout/oauth.xml index ecf6c07d837..82f44d30230 100644 --- a/app/design/adminhtml/default/default/layout/oauth.xml +++ b/app/design/adminhtml/default/default/layout/oauth.xml @@ -96,8 +96,6 @@ jsmage/adminhtml/product.js jsmage/adminhtml/rules.js jsmage/adminhtml/wysiwyg/tiny_mce/setup.js - jslib/ds-sleight.js - jsvarien/iehover-fix.js cssprint.css js_csscalendar/calendar-win2k-1.css @@ -107,7 +105,6 @@ jscalendar/calendar.js jscalendar/calendar-setup.js - jsextjs/fix-defer-before.js jsextjs/ext-tree.js jsextjs/fix-defer.js jsextjs/ext-tree-checkbox.js diff --git a/app/design/adminhtml/default/default/template/example.phtml b/app/design/adminhtml/default/default/template/example.phtml index bfba40f3bb6..968efe4bcca 100644 --- a/app/design/adminhtml/default/default/template/example.phtml +++ b/app/design/adminhtml/default/default/template/example.phtml @@ -33,8 +33,6 @@ /*getSkinUrl('styles.css') ?>"; /*]]>*/ - - diff --git a/app/design/adminhtml/default/default/template/forgotpassword.phtml b/app/design/adminhtml/default/default/template/forgotpassword.phtml index edda931beda..65b54cdb7b6 100644 --- a/app/design/adminhtml/default/default/template/forgotpassword.phtml +++ b/app/design/adminhtml/default/default/template/forgotpassword.phtml @@ -37,10 +37,6 @@ - - - -
diff --git a/app/design/adminhtml/default/default/template/login.phtml b/app/design/adminhtml/default/default/template/login.phtml index 8a75ce5b398..8a7ac6ae92a 100644 --- a/app/design/adminhtml/default/default/template/login.phtml +++ b/app/design/adminhtml/default/default/template/login.phtml @@ -40,10 +40,6 @@ - - - -