[TASK] Remove last relics of IE6 backend support

Remove the last occurrences of IE6 specific code.
Resolves: #26274

Change-Id: I82e86c5b8ecc14d6592871a2f86d6c50d69eed48
Reviewed-on: http://review.typo3.org/1723
Reviewed-by: Peter Beernink
Tested-by: Peter Beernink
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn

diff --git a/typo3/js/extjs/debugPanel.js b/typo3/js/extjs/debugPanel.js
index 3fe8045..29ae767 100644 (file)
--- a/typo3/js/extjs/debugPanel.js
+++ b/typo3/js/extjs/debugPanel.js
@@ -253,7 +253,7 @@ TYPO3.DebugPanel = Ext.extend(Ext.TabPanel, {
                        // add drag&drop and the wheel click functionality
                tabWidget.on('afterlayout', function(element) {
                        Ext.get(this.id + '__' + element.id).on('mousedown', function(event) {
-                               if (!Ext.isIE6 && !Ext.isIE7) {
+                               if (!Ext.isIE7) {
                                        if ((Ext.isIE && event.button === 1) ||
                                                (!Ext.isIE && event.browserEvent.button === 1)
                                        ) {
@@ -462,9 +462,6 @@ TYPO3.DebugPanel = Ext.extend(Ext.TabPanel, {
         * @return void
         */
        openBrowserWindow: function(title, content, group) {
-               if (Ext.isIE6) {
-                       group = group.replace(' ', '_');
-               }
                var newWindow = window.open('', 'TYPO3DebugWindow_' + group,
                        'width=600,height=400,menubar=0,toolbar=1,status=0,scrollbars=1,resizable=1'
                );

diff --git a/typo3/sysext/install/Resources/Public/Stylesheets/ie6.css b/typo3/sysext/install/Resources/Public/Stylesheets/ie6.css
deleted file mode 100644 (file)
index 562031f..0000000
--- a/typo3/sysext/install/Resources/Public/Stylesheets/ie6.css
+++ /dev/null
@@ -1,23 +0,0 @@
-@CHARSET "UTF-8";
-
-/* IE6 only styles */
-
-/* center align for install tool */
-body {
-       text-align: center;
-}
-
-#t3-install-outer {
-       text-align: left;
-}
-
-/* fix width and position of right hand section */
-#t3-install-right {
-       width: 56em;
-       padding-left: 0px !important;
-}
-
-/* fix background image in menu */
-#t3-install-menu li {
-       height: 1%;
-}
\ No newline at end of file

diff --git a/typo3/sysext/install/mod/class.tx_install.php b/typo3/sysext/install/mod/class.tx_install.php
index 71718eb..8d239e2 100755 (executable)
--- a/typo3/sysext/install/mod/class.tx_install.php
+++ b/typo3/sysext/install/mod/class.tx_install.php
@@ -7696,12 +7696,6 @@ $out="
                                        t3lib_div::createVersionNumberedFilename($this->backPath .
                                                'sysext/install/Resources/Public/Stylesheets/ie7.css'
                                ) . '" />';
-                               // IE6
-                       } elseif (intval($browserInfo['version']) < 7) {
-                               $this->stylesheets[] = '<link rel="stylesheet" type="text/css" href="' .
-                                       t3lib_div::createVersionNumberedFilename($this->backPath .
-                                               'sysext/install/Resources/Public/Stylesheets/ie6.css'
-                               ) . '" />';
                        }
                }
 
@@ -8429,4 +8423,4 @@ $out="
 if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/install/mod/class.tx_install.php'])) {
        include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/install/mod/class.tx_install.php']);
 }
-?>
\ No newline at end of file
+?>

diff --git a/typo3/sysext/t3skin/extjs/xtheme-t3skin.css b/typo3/sysext/t3skin/extjs/xtheme-t3skin.css
index 51f6326..3b12367 100644 (file)
--- a/typo3/sysext/t3skin/extjs/xtheme-t3skin.css
+++ b/typo3/sysext/t3skin/extjs/xtheme-t3skin.css
@@ -2272,7 +2272,7 @@ body.x-body-masked .x-window-plain .x-window-mc {
 .no-boxshadow #typo3-navigationContainer-xcollapsed,
 .no-boxshadow #typo3-navigationDummy  {
        background-image: url("data:image/png;base64,R0lGODlhAgABAIAAAMjIyLOzsyH5BAAAAAAALAAAAAACAAEAAAICRAoAOw==");
-       /* star-hack targets IE6+7 */
+       /* star-hack targets IE7 */
        *background-image: url("../images/backgrounds/module-menu-right.png");
        background-position: right;
        background-repeat: repeat-y;

diff --git a/typo3/sysext/t3skin/stylesheets/visual/element_docheader.css b/typo3/sysext/t3skin/stylesheets/visual/element_docheader.css
index ff7759a..6ad1455 100644 (file)
--- a/typo3/sysext/t3skin/stylesheets/visual/element_docheader.css
+++ b/typo3/sysext/t3skin/stylesheets/visual/element_docheader.css
@@ -69,7 +69,7 @@ div#typo3-docheader-row2 div {
 .no-boxshadow #typo3-pagetree #typo3-docheader-row1,
 .no-boxshadow #typo3-alt-file-navframe-php #typo3-docheader-row1 {
        background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAABCAMAAAAsPuSGAAAACVBMVEVGRkZAQEBRUVH4z1uMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAxJREFUCNdjYGJgBAAACwAEhbbR0wAAAABJRU5ErkJggg==");
-       /* star-hack targets IE6+7 */
+       /* star-hack targets IE7 */
        *background-image: url("../../images/backgrounds/module-menu-right-top.png");
        background-position: right;
        background-repeat: repeat-y;
@@ -79,7 +79,7 @@ div#typo3-docheader-row2 div {
 .no-boxshadow #typo3-pagetree #typo3-docheader-row2,
 .no-boxshadow #typo3-alt-file-navframe-php #typo3-docheader-row2 {
        background-image: url("data:image/png;base64,R0lGODlhAgABAIAAAMjIyLOzsyH5BAAAAAAALAAAAAACAAEAAAICRAoAOw==");
-       /* star-hack targets IE6+7 */
+       /* star-hack targets IE7 */
        *background-image: url("../../images/backgrounds/module-menu-right.png");
        background-position: right;
        background-repeat: repeat-y;

diff --git a/typo3/sysext/t3skin/stylesheets/visual/element_pagetree.css b/typo3/sysext/t3skin/stylesheets/visual/element_pagetree.css
index 0cbcbcd..67dd10f 100644 (file)
--- a/typo3/sysext/t3skin/stylesheets/visual/element_pagetree.css
+++ b/typo3/sysext/t3skin/stylesheets/visual/element_pagetree.css
@@ -26,7 +26,7 @@ Pagetree
 
 #typo3-pagetree .x-tree-node .x-tree-node-over {
        background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAABCAYAAAAb4BS0AAAAGElEQVR42gENAPL/AMjIyEzIyMizyMjI/zhvCQelaHPPAAAAAElFTkSuQmCC");
-       /* star-hack targets IE6+7 */
+       /* star-hack targets IE7 */
        *background-image: url("../../images/shadows/navigation-container.png");
        background-position: right;
        background-repeat: repeat-y;

diff --git a/typo3/sysext/t3skin/stylesheets/visual/element_tree.css b/typo3/sysext/t3skin/stylesheets/visual/element_tree.css
index 088a9af..a05c985 100644 (file)
--- a/typo3/sysext/t3skin/stylesheets/visual/element_tree.css
+++ b/typo3/sysext/t3skin/stylesheets/visual/element_tree.css
@@ -24,7 +24,7 @@ body#typo3-alt-file-navframe-php {
 #typo3-alt-file-navframe-php #typo3-docbody,
 #typo3-pagetree-treeContainer {
        background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAABCAYAAAAb4BS0AAAAGElEQVR42gENAPL/AMjIyEzIyMizyMjI/zhvCQelaHPPAAAAAElFTkSuQmCC");
-       /* star-hack targets IE6+7 */
+       /* star-hack targets IE7 */
        *background-image: url("../../images/shadows/navigation-container.png");
 }
 
@@ -33,7 +33,7 @@ body#typo3-alt-file-navframe-php {
 #typo3-pagetree .x-panel-tbar,
 #typo3-pagetree-deletionDropZone .x-panel-body {
        background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAABCAYAAAAb4BS0AAAAGElEQVR42gENAPL/AEBAQExAQECzQEBA/xb3BD8CHBN0AAAAAElFTkSuQmCC");
-       /* star-hack targets IE6+7 */
+       /* star-hack targets IE7 */
        *background-image: url("../../images/shadows/docheader1.png");
 }
 
@@ -41,7 +41,7 @@ body#typo3-alt-file-navframe-php {
 .typo3-pagetree-indicatorBar-item,
 #typo3-pagetree-topPanel .typo3-pagetree-topPanel-item {
        background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAABCAYAAAAb4BS0AAAAGElEQVR42gENAPL/ALi4uEy4uLi0uLi4/zSECHijpwMGAAAAAElFTkSuQmCC");
-       /* star-hack targets IE6+7 */
+       /* star-hack targets IE7 */
        *background-image: url("../../images/shadows/docheader2.png");
 }
 

diff --git a/typo3/sysext/t3skin/stylesheets/visual/module_menu.css b/typo3/sysext/t3skin/stylesheets/visual/module_menu.css
index d2e97a3..fd2d660 100644 (file)
--- a/typo3/sysext/t3skin/stylesheets/visual/module_menu.css
+++ b/typo3/sysext/t3skin/stylesheets/visual/module_menu.css
@@ -16,7 +16,7 @@ Module menu
 #typo3-module-menu,
 #typo3-menu li.menuSection li a:hover {
        background-image: url("data:image/png;base64,R0lGODlhAgABAIAAAMjIyLOzsyH5BAAAAAAALAAAAAACAAEAAAICRAoAOw==");
-       /* star-hack targets IE6+7 */
+       /* star-hack targets IE7 */
        *background-image: url("../../images/backgrounds/module-menu-right.png");
        background-position: right;
        background-repeat: repeat-y;

diff --git a/typo3/sysext/taskcenter/task/index.php b/typo3/sysext/taskcenter/task/index.php
index 4192f4f..a4a4545 100755 (executable)
--- a/typo3/sysext/taskcenter/task/index.php
+++ b/typo3/sysext/taskcenter/task/index.php
@@ -478,11 +478,7 @@ class SC_mod_user_task_index extends t3lib_SCbase {
                        $("list_frame").setStyle({height: parentHeight+"px", width: parentWidth+"px"});
 
                }
-               // event crashes IE6 so he is excluded first
-               var version = parseFloat(navigator.appVersion.split(";")[1].strip().split(" ")[1]);
-               if (!(Prototype.Browser.IE && version == 6)) {
-                       Event.observe(window, "resize", resizeIframe, false);
-               }';
+               Event.observe(window, "resize", resizeIframe, false);';
 
                return '<iframe onload="resizeIframe(this,' . $max . ');" scrolling="auto"  width="100%" src="' . $url . '" name="list_frame" id="list_frame" frameborder="no" style="margin-top:-51px;border: none;"></iframe>';
        }

diff --git a/typo3/template.php b/typo3/template.php
index 4446ec1..bd98584 100644 (file)
--- a/typo3/template.php
+++ b/typo3/template.php
@@ -1946,20 +1946,6 @@ $str.=$this->docBodyTagBegin().
                $moduleBody = t3lib_parsehtml::getSubpart($this->moduleTemplate, '###FULLDOC###');
                        // Add CSS
                $this->inDocStylesArray[] = 'html { overflow: hidden; }';
-                       // Add JS code to the <head> for IE
-               $this->JScode.= $this->wrapScriptTags('
-                               // workaround since IE6 cannot deal with relative height for scrolling elements
-                       function resizeDocBody()        {
-                               $("typo3-docbody").style.height = (document.body.offsetHeight - parseInt($("typo3-docheader").getStyle("height")));
-                       }
-                       if (Prototype.Browser.IE) {
-                               var version = parseFloat(navigator.appVersion.split(\';\')[1].strip().split(\' \')[1]);
-                               if (version == 6) {
-                                       Event.observe(window, "resize", resizeDocBody, false);
-                                       Event.observe(window, "load", resizeDocBody, false);
-                               }
-                       }
-               ');
 
                        // Get the page path for the docheader
                $markerArray['PAGEPATH'] = $this->getPagePath($pageRecord);
@@ -2292,4 +2278,4 @@ if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLA
 $GLOBALS['TBE_TEMPLATE'] = t3lib_div::makeInstance('template');
 
 
-?>
\ No newline at end of file
+?>