From 7f57fc6b3df5cd1498562acd515833f654b4618b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leif=20=C3=85strand?= Date: Wed, 9 Nov 2011 16:48:12 +0200 Subject: [PATCH] #7912 Remove support for IE6 --- .../VAADIN/themes/base/button/button.css | 12 +-- .../VAADIN/themes/base/caption/caption.css | 8 -- .../themes/base/datefield/datefield.css | 4 - .../themes/base/gridlayout/gridlayout.css | 1 - .../base/orderedlayout/orderedlayout.css | 3 - .../VAADIN/themes/base/shadow/shadow.css | 17 --- .../VAADIN/themes/base/slider/slider.css | 12 --- .../themes/base/splitpanel/splitpanel.css | 5 - WebContent/VAADIN/themes/base/table/table.css | 1 - .../VAADIN/themes/base/tabsheet/tabsheet.css | 7 +- .../base/tree/img/connector-collapse-ie6.png | Bin 331 -> 0 bytes .../tree/img/connector-collapse-last-ie6.png | Bin 331 -> 0 bytes .../base/tree/img/connector-expand-ie6.png | Bin 367 -> 0 bytes .../tree/img/connector-expand-last-ie6.png | Bin 366 -> 0 bytes .../themes/base/tree/tree-connectors.css | 14 --- .../VAADIN/themes/base/tree/tree-default.css | 24 ----- .../themes/base/treetable/treetable.css | 8 -- .../VAADIN/themes/base/upload/upload.css | 1 - .../VAADIN/themes/base/window/window.css | 22 ---- .../VAADIN/themes/chameleon/common/common.css | 10 -- .../components/accordion/accordion.css | 4 - .../chameleon/components/button/button.css | 17 --- .../components/datefield/datefield.css | 17 --- .../chameleon/components/menubar/menubar.css | 8 -- .../components/notification/notification.css | 4 - .../chameleon/components/panel/panel.css | 4 - .../progressindicator/progressindicator.css | 5 - .../chameleon/components/selects/selects.css | 22 ---- .../chameleon/components/slider/slider.css | 9 -- .../components/splitpanel/splitpanel.css | 22 ---- .../chameleon/components/table/table.css | 9 -- .../components/tabsheet/tabsheet.css | 19 ---- .../components/textfield/textfield.css | 5 - .../chameleon/components/window/window.css | 8 -- .../compound/sidebar-menu/sidebar-menu.css | 5 - .../chameleon/compound/toolbar/toolbar.css | 4 - .../themes/chameleon/img/close-btn-ie6.png | Bin 240 -> 0 bytes .../themes/chameleon/img/date-btn-ie6.png | Bin 341 -> 0 bytes .../themes/chameleon/img/split-handle-ie6.png | Bin 174 -> 0 bytes .../themes/chameleon/img/tab-arrows-ie6.png | Bin 314 -> 0 bytes .../VAADIN/themes/liferay/button/button.css | 5 - .../VAADIN/themes/liferay/common/common.css | 4 - .../themes/liferay/datefield/datefield.css | 2 - .../VAADIN/themes/liferay/select/select.css | 4 - .../themes/liferay/tabsheet/close-ie6.png | Bin 259 -> 0 bytes .../themes/liferay/tabsheet/tabsheet.css | 1 - .../liferay/tree/arrows_sprites-ie6.png | Bin 398 -> 0 bytes .../VAADIN/themes/liferay/tree/tree.css | 1 - .../VAADIN/themes/liferay/window/window.css | 11 -- .../themes/reindeer/button/button-ie.css | 70 ------------ .../VAADIN/themes/reindeer/common/common.css | 3 - .../reindeer/common/icons/bullet-ie6.png | Bin 198 -> 0 bytes .../common/icons/bullet-white-ie6.png | Bin 126 -> 0 bytes .../reindeer/common/icons/error-ie6.png | Bin 272 -> 0 bytes .../themes/reindeer/datefield/datefield.css | 9 -- .../themes/reindeer/formlayout/formlayout.css | 7 -- .../VAADIN/themes/reindeer/panel/panel.css | 9 -- .../select/img/black/left-black-focus-ie6.png | Bin 201 -> 0 bytes .../select/img/black/left-black-ie6.png | Bin 207 -> 0 bytes .../reindeer/select/img/left-focus-ie6.png | Bin 236 -> 0 bytes .../themes/reindeer/select/img/left-ie6.png | Bin 236 -> 0 bytes .../VAADIN/themes/reindeer/select/select.css | 24 ----- .../VAADIN/themes/reindeer/table/table.css | 13 --- .../tabsheet/tabsheet-normal-style.css | 6 -- .../themes/reindeer/textfield/textfield.css | 8 -- .../themes/reindeer/tree/img/arrows-ie6.png | Bin 282 -> 0 bytes .../VAADIN/themes/reindeer/tree/tree.css | 16 --- .../window/img/black/content-bg-ie6.png | Bin 343 -> 0 bytes .../window/img/black/header-bg-ie6.png | Bin 238 -> 0 bytes .../reindeer/window/img/black/resize-ie6.png | Bin 213 -> 0 bytes .../VAADIN/themes/reindeer/window/window.css | 27 +---- .../VAADIN/themes/runo/button/button.css | 4 - .../VAADIN/themes/runo/caption/caption.css | 4 - .../themes/runo/formlayout/formlayout.css | 3 - WebContent/VAADIN/themes/runo/panel/panel.css | 23 ---- .../VAADIN/themes/runo/select/select.css | 6 -- .../VAADIN/themes/runo/slider/slider.css | 13 --- .../themes/runo/splitpanel/splitpanel.css | 21 ---- WebContent/VAADIN/themes/runo/table/table.css | 14 --- .../VAADIN/themes/runo/tabsheet/tabsheet.css | 21 ---- WebContent/VAADIN/themes/runo/tree/tree.css | 9 -- .../VAADIN/themes/runo/window/window.css | 1 - .../buildhelpers/CompileDefaultTheme.java | 5 +- .../terminal/gwt/DefaultWidgetSet.gwt.xml | 2 +- .../gwt/client/ApplicationConfiguration.java | 17 --- .../gwt/client/ApplicationConnection.java | 13 --- .../terminal/gwt/client/BrowserInfo.java | 4 - src/com/vaadin/terminal/gwt/client/Util.java | 71 +----------- .../vaadin/terminal/gwt/client/VCaption.java | 10 +- .../gwt/client/ui/FocusElementPanel.java | 56 ++++------ .../gwt/client/ui/FocusableScrollPanel.java | 16 +-- .../vaadin/terminal/gwt/client/ui/Icon.java | 1 - .../gwt/client/ui/VAbsoluteLayout.java | 73 ------------- .../terminal/gwt/client/ui/VAccordion.java | 13 --- .../terminal/gwt/client/ui/VButton.java | 6 +- .../terminal/gwt/client/ui/VContextMenu.java | 6 -- .../terminal/gwt/client/ui/VEmbedded.java | 1 - .../terminal/gwt/client/ui/VFilterSelect.java | 38 +------ .../vaadin/terminal/gwt/client/ui/VForm.java | 4 - .../vaadin/terminal/gwt/client/ui/VLabel.java | 2 +- .../terminal/gwt/client/ui/VMenuBar.java | 93 ++-------------- .../terminal/gwt/client/ui/VNativeButton.java | 4 +- .../terminal/gwt/client/ui/VNativeSelect.java | 7 -- .../terminal/gwt/client/ui/VOptionGroup.java | 6 -- .../terminal/gwt/client/ui/VOverlay.java | 10 +- .../vaadin/terminal/gwt/client/ui/VPanel.java | 34 ------ .../gwt/client/ui/VPopupCalendar.java | 2 +- .../terminal/gwt/client/ui/VScrollTable.java | 18 +--- .../terminal/gwt/client/ui/VSlider.java | 4 +- .../terminal/gwt/client/ui/VTextField.java | 4 - .../terminal/gwt/client/ui/VTextualDate.java | 9 -- .../vaadin/terminal/gwt/client/ui/VTree.java | 102 +++--------------- .../terminal/gwt/client/ui/VTreeTable.java | 2 +- .../gwt/client/ui/VTwinColSelect.java | 17 +-- .../terminal/gwt/client/ui/VUpload.java | 2 - .../gwt/client/ui/VUriFragmentUtility.java | 5 - .../terminal/gwt/client/ui/VWindow.java | 29 ----- src/com/vaadin/ui/RichTextArea.java | 1 + .../tests/components/button/Buttons.java | 8 +- .../layouttester/LayoutTesterApplication.html | 6 -- 120 files changed, 83 insertions(+), 1268 deletions(-) delete mode 100644 WebContent/VAADIN/themes/base/tree/img/connector-collapse-ie6.png delete mode 100644 WebContent/VAADIN/themes/base/tree/img/connector-collapse-last-ie6.png delete mode 100644 WebContent/VAADIN/themes/base/tree/img/connector-expand-ie6.png delete mode 100644 WebContent/VAADIN/themes/base/tree/img/connector-expand-last-ie6.png delete mode 100644 WebContent/VAADIN/themes/chameleon/img/close-btn-ie6.png delete mode 100644 WebContent/VAADIN/themes/chameleon/img/date-btn-ie6.png delete mode 100644 WebContent/VAADIN/themes/chameleon/img/split-handle-ie6.png delete mode 100644 WebContent/VAADIN/themes/chameleon/img/tab-arrows-ie6.png delete mode 100644 WebContent/VAADIN/themes/liferay/tabsheet/close-ie6.png delete mode 100644 WebContent/VAADIN/themes/liferay/tree/arrows_sprites-ie6.png delete mode 100644 WebContent/VAADIN/themes/reindeer/common/icons/bullet-ie6.png delete mode 100644 WebContent/VAADIN/themes/reindeer/common/icons/bullet-white-ie6.png delete mode 100644 WebContent/VAADIN/themes/reindeer/common/icons/error-ie6.png delete mode 100644 WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus-ie6.png delete mode 100644 WebContent/VAADIN/themes/reindeer/select/img/black/left-black-ie6.png delete mode 100644 WebContent/VAADIN/themes/reindeer/select/img/left-focus-ie6.png delete mode 100644 WebContent/VAADIN/themes/reindeer/select/img/left-ie6.png delete mode 100644 WebContent/VAADIN/themes/reindeer/tree/img/arrows-ie6.png delete mode 100644 WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png delete mode 100644 WebContent/VAADIN/themes/reindeer/window/img/black/header-bg-ie6.png delete mode 100644 WebContent/VAADIN/themes/reindeer/window/img/black/resize-ie6.png diff --git a/WebContent/VAADIN/themes/base/button/button.css b/WebContent/VAADIN/themes/base/button/button.css index 2212120915..874619747e 100644 --- a/WebContent/VAADIN/themes/base/button/button.css +++ b/WebContent/VAADIN/themes/base/button/button.css @@ -29,10 +29,6 @@ cursor: default; } -.v-ie6 .v-button { - display: inline; -} - .v-ie7 .v-button { display: inline; } @@ -117,10 +113,7 @@ zoom: 1; float: none; } -/* Fixes streched buttons in IE6 and IE7*/ -.v-ie6 .v-nativebutton { - width: 1px; -} +/* Fixes stretched buttons in IE7*/ .v-ie .v-nativebutton { overflow: visible; padding-left: 1em; @@ -147,8 +140,7 @@ white-space: nowrap; } -/* Fix for IE6/IE7 issue where checkbox moves 1 pixel down after selection (#4636) */ -.v-ie6 .v-checkbox, +/* Fix for IE7 issue where checkbox moves 1 pixel down after selection (#4636) */ .v-ie7 .v-checkbox { vertical-align: baseline; } diff --git a/WebContent/VAADIN/themes/base/caption/caption.css b/WebContent/VAADIN/themes/base/caption/caption.css index bdeaae3de2..549d4f9cef 100644 --- a/WebContent/VAADIN/themes/base/caption/caption.css +++ b/WebContent/VAADIN/themes/base/caption/caption.css @@ -29,14 +29,6 @@ overflow: hidden; } -/* Fix IE6 "double-float-margin-bug" */ -.v-ie6 .v-errorindicator, -.v-ie6 .v-icon, -.v-ie6 .v-captiontext, -.v-ie6 .v-required-field-indicator { - display: inline; -} - .v-ie9 .v-gridlayout-margin>div>div>.v-caption, .v-ie9 .v-verticallayout>div>div>.v-caption, .v-ie9 .v-horizontallayout>div>div>.v-caption { diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css index 72d9510c3f..ef08509ed5 100644 --- a/WebContent/VAADIN/themes/base/datefield/datefield.css +++ b/WebContent/VAADIN/themes/base/datefield/datefield.css @@ -61,11 +61,9 @@ outline: 1px dotted black; } -.v-ie6 .v-datefield-calendarpanel-day, .v-ie7 .v-datefield-calendarpanel-day { margin: 1px; } -.v-ie6 .v-datefield-calendarpanel-day-focused, .v-ie7 .v-datefield-calendarpanel-day-focused { border: 1px dotted black; margin: 0px; @@ -95,8 +93,6 @@ } */ /* IE somehow loses generic v-disabled alpha. See #1960 */ -.v-ie6 .v-disabled .v-datefield-button, -.v-ie6 .v-disabled .v-datefield-textfield, .v-ie7 .v-disabled .v-datefield-button, .v-ie7 .v-disabled .v-datefield-textfield { filter: alpha(opacity=30); diff --git a/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css b/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css index 87cdcfd361..033fea5867 100644 --- a/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css +++ b/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css @@ -24,7 +24,6 @@ overflow: hidden; } /* Ensure that resizing gridlayout works in IE */ -.v-ie6 .v-gridlayout, .v-ie7 .v-gridlayout { overflow: hidden; } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css index 9f91669385..58badbc615 100644 --- a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css +++ b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css @@ -32,9 +32,6 @@ padding-left: 0; } /* To make sure IE don't expand elements larger than they should */ -.v-ie6 .v-orderedlayout, -.v-ie6 .v-horizontallayout, -.v-ie6 .v-verticallayout, .v-ie7 .v-orderedlayout, .v-ie7 .v-horizontallayout, .v-ie7 .v-verticallayout { diff --git a/WebContent/VAADIN/themes/base/shadow/shadow.css b/WebContent/VAADIN/themes/base/shadow/shadow.css index 209dd0e235..c576a026bd 100644 --- a/WebContent/VAADIN/themes/base/shadow/shadow.css +++ b/WebContent/VAADIN/themes/base/shadow/shadow.css @@ -66,20 +66,3 @@ width: 10px; height: 10px; background: transparent url(img/bottom-right.png); } - - - - - -/* For IE6 (no transparent png's, we use a blur filter) */ - -.v-ie6 .v-shadow * { - display: none; -} - -.v-ie6 .v-shadow { - background: #000; - filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=2) alpha(opacity=20); - margin-top: -2px; - margin-left: -2px; -} \ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/slider/slider.css b/WebContent/VAADIN/themes/base/slider/slider.css index 5ee6cbf31c..1be474f04e 100644 --- a/WebContent/VAADIN/themes/base/slider/slider.css +++ b/WebContent/VAADIN/themes/base/slider/slider.css @@ -63,15 +63,3 @@ background: #FFE0E0; } */ - -/* IE specific styles */ -.v-ie6 .v-slider, -.v-ie6 .v-slider-vertical { - margin: 0; -} -.v-ie6 .v-slider .v-slider-handle { - margin: -1px 0; -} -.v-ie6 .v-slider-vertical .v-slider-handle { - margin: 0 -1px; -} \ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css index 80a2133b23..3473092fa5 100644 --- a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css +++ b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css @@ -34,11 +34,6 @@ cursor: default; } /* IE specific styles */ -.v-ie6 .v-splitpanel-hsplitter div { - height: 99%; -} -.v-ie6 .v-splitpanel-first-container, -.v-ie6 .v-splitpanel-second-container, .v-ie7 .v-splitpanel-first-container, .v-ie7 .v-splitpanel-second-container { position: relative; diff --git a/WebContent/VAADIN/themes/base/table/table.css b/WebContent/VAADIN/themes/base/table/table.css index 4b3922c554..dd452c851f 100644 --- a/WebContent/VAADIN/themes/base/table/table.css +++ b/WebContent/VAADIN/themes/base/table/table.css @@ -181,7 +181,6 @@ position: relative; /* hide this from IE, it works without it */ cursor: pointer; } -.v-ie6 .v-table-column-selector, .v-ie7 .v-table-column-selector { position: static; } diff --git a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css index 6fae7381a1..b150a1981e 100644 --- a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css +++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css @@ -81,13 +81,9 @@ cursor: default; visibility: hidden; } -.v-tabsheet-tabitem:hover .v-tabsheet-caption-close, -.v-ie6 .v-tabsheet-caption-close { +.v-tabsheet-tabitem:hover .v-tabsheet-caption-close { visibility: visible; } -.v-ie6 .v-tabsheet-caption-close { - float: right; -} .v-tabsheet-tabitem { border: 1px solid #aaa; border-right: none; @@ -111,7 +107,6 @@ border-bottom: none; position: relative; } -.v-ie6 .v-tabsheet-content, .v-ie7 .v-tabsheet-content { zoom: 1; } diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-ie6.png b/WebContent/VAADIN/themes/base/tree/img/connector-collapse-ie6.png deleted file mode 100644 index f0e59532351bb02130aab418faf615bcaff197ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^JV4yQ!3-ohZdQ~5DajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MScN3A+D=eufBTq>f5((KYsjp^XAPjU%p(rbSWhz<@@*V zot>Tk|Nnpd`0>4a_g=hsv3c|6EnBvnJ9qB+^XGf_?!9*H+Qo|(@87?_ZQHhe`}R$o zI1#8g)$o-I&}6BSAirQB7dv1OQDV3SRF&)L;uunK>&-<^z6J#Wmy20*QUeZl{*J%m z=iL!*@N&E2)bmX&Px$v7|0^4{<?BQs(=6h diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-last-ie6.png b/WebContent/VAADIN/themes/base/tree/img/connector-collapse-last-ie6.png deleted file mode 100644 index 0d2fd548855de925465a5cb371f44fa24abde8d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^JV4yQ!3-ohZdQ~5DajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MScN3A+8fAPF%fu_0_9a-@bkO@#DvvH*bFV^5xQ{ODQQS z-@kwF?Ckvi|NrC1k2i1LeDB`97cX9%J9qBl#f#UjUE8;B-`>4@w{6>Y|Ni|gTeduZ z{v4?CLixmcpvh7tL4LtNE_T2mqQr0us4Caf#WAGf)|+#ld<_abtq-q1(rIoI{=R?3 z5~)XrxFvp?ot?j3^AYnr_EgQ&?bCA=H|7Y+^u@_ECWaITvxTIx1VwT^XL}gKwbpuJ zDOa|8Vs4j}@*Cs(&t&W7Mj5V^n|StX-^1(cy{G(0p2Nh$@Tar$=;dP-{y>WvJYD@< J);T3K0RYlJsS5xA diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-expand-ie6.png b/WebContent/VAADIN/themes/base/tree/img/connector-expand-ie6.png deleted file mode 100644 index 1a7758fce58a21bcb903477a75880bdc3f5a2713..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^JV4yQ!3-ohZdQ~5DajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MNt7hA+D=eufBTq>f5((Q&Lhse*F05%a@xsZ+`#&{r~^} zmo8n}ym@nHXXoR`k6*laaqr%}2@@u4*|O#0#f#6MKR&K$VT2E{-7;x86+j|GiZ#V-Z^OHJ`R20p r)LUXHn~oRjZ2h0Pbn50mED{VQ(TkX-XuE0v9mC-1>gTe~DWM4fLsq_l diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-expand-last-ie6.png b/WebContent/VAADIN/themes/base/tree/img/connector-expand-last-ie6.png deleted file mode 100644 index db94fc0d8e7221cc21b69364b5e4b3f79df67ea0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^JV4yQ!3-ohZdQ~5DajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MNt7hA+8fAPF%fu_0_9aQ&LjizJ2@U%a@xsZ+`sv@%#7h z|NsBLbm>xOXXoR`k2i1LeDB`97cX8+m@whu#f$s)?R)mfGQh2T^vIyZoTRA6gp(U z!?IPP%g_bs0vzdhq)|3|R|hCfT^&#{(p2mrc;!PC{xWt~$(695|Iy;A@H diff --git a/WebContent/VAADIN/themes/base/tree/tree-connectors.css b/WebContent/VAADIN/themes/base/tree/tree-connectors.css index 6e7ce45391..c60e41c48b 100644 --- a/WebContent/VAADIN/themes/base/tree/tree-connectors.css +++ b/WebContent/VAADIN/themes/base/tree/tree-connectors.css @@ -33,17 +33,3 @@ .v-tree-connectors .v-tree-node-drag-top.v-tree-node-leaf { background-position: 2px 50%; } - -/* IE6 */ -.v-ie6 .v-tree-connectors .v-tree-node { - background: transparent url(img/connector-expand-ie6.png) no-repeat 2px -52px; -} -.v-ie6 .v-tree-connectors .v-tree-node-expanded { - background: transparent url(img/connector-collapse-ie6.png) no-repeat 2px -52px; -} -.v-ie6 .v-tree-connectors .v-tree-node-last { - background: transparent url(img/connector-expand-last-ie6.png) no-repeat 2px -52px; -} -.v-ie6 .v-tree-connectors .v-tree-node-last.v-tree-node-expanded { - background: transparent url(img/connector-collapse-last-ie6.png) no-repeat 2px -52px; -} \ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/tree/tree-default.css b/WebContent/VAADIN/themes/base/tree/tree-default.css index c486233ea8..23721c77ae 100644 --- a/WebContent/VAADIN/themes/base/tree/tree-default.css +++ b/WebContent/VAADIN/themes/base/tree/tree-default.css @@ -37,27 +37,6 @@ div.v-tree-node-leaf { .v-tree-node-children { padding-left: 1em; } -/* ie6compatnode is hidden from non ie6 browsers, for ie6 - * uses weird hack to sink all events properly - */ -.v-tree-node-ie6compatnode { - display: none; -} -/* IMPORTANT keep the offsetWidth of this element the same as the margin-left of v-tree-node-caption */ -.v-ie6 .v-tree-node-ie6compatnode { - display: inline; - float: left; - background: orange; - margin: 0; - width: 0.8em; - height: 0.8em; - padding: 0.1em; - filter: alpha(opacity=0); -} -.v-ie6 .v-tree-node, -.v-ie6 .v-tree-node-children { - clear: left; -} /*************************************** * Drag'n'drop styles ***************************************/ @@ -106,9 +85,6 @@ div.v-tree-node-leaf { margin: -2px 2px -2px -2px; background-color: #bcdcff; } -.v-ie6 .v-tree .v-tree-node-caption-drag-center div { - margin: -2px ; -} .v-tree .v-tree-node-caption-drag-center div { background-color: rgba(169,209,255,.6); } diff --git a/WebContent/VAADIN/themes/base/treetable/treetable.css b/WebContent/VAADIN/themes/base/treetable/treetable.css index 1bc21b890c..02f358e4e6 100644 --- a/WebContent/VAADIN/themes/base/treetable/treetable.css +++ b/WebContent/VAADIN/themes/base/treetable/treetable.css @@ -13,18 +13,10 @@ background: url(../treetable/img/arrow-right.png) right center no-repeat; } -.v-ie6 .v-treetable-node-closed { - background-image: url(../treetable/img/arrow-right.gif); -} - .v-treetable-node-open { background: url(../treetable/img/arrow-down.png) right center no-repeat; } -.v-ie6 .v-treetable-node-open { - background-image: url(../treetable/img/arrow-down.gif); -} - .v-treetable .v-checkbox { display: inline-block; padding-bottom: 4px; diff --git a/WebContent/VAADIN/themes/base/upload/upload.css b/WebContent/VAADIN/themes/base/upload/upload.css index e6b58fb14e..e6951e5dbf 100644 --- a/WebContent/VAADIN/themes/base/upload/upload.css +++ b/WebContent/VAADIN/themes/base/upload/upload.css @@ -2,7 +2,6 @@ white-space: nowrap; } -.v-ie6 .v-upload, .v-ie7 .v-upload { margin:0; } diff --git a/WebContent/VAADIN/themes/base/window/window.css b/WebContent/VAADIN/themes/base/window/window.css index d4c03bd82e..d5dfd66e2b 100644 --- a/WebContent/VAADIN/themes/base/window/window.css +++ b/WebContent/VAADIN/themes/base/window/window.css @@ -17,9 +17,6 @@ div.v-window-header { overflow: hidden; padding: 0; } -.v-ie6 .v-window-header { - width: 100%; -} .v-window-header .v-icon { vertical-align: middle; /* This has to be 'middle', not 'bottom', to allow larger icons than 16px */ } @@ -77,15 +74,6 @@ div.v-window-header { height: 100%; filter: alpha(opacity=50); } -/* IE6 workaround for position:fixed; */ -.v-ie6 .v-window-modalitycurtain { - position: absolute; - top: expression(document.documentElement.scrollTop + "px"); -} -/* min-width for IE6 */ -.v-ie6 .v-window { - width: 0; /* */ -} /* Shadow for window */ .v-shadow-window { position: absolute; @@ -147,13 +135,3 @@ div.v-window-header { width: 28px; height: 28px; background: transparent url(img/shadow/bottom-right.png); } -/* For IE6 (no transparent png's, we use a blur filter) */ -.v-ie6 .v-shadow-window * { - display: none; -} -.v-ie6 .v-shadow-window { - background: #000; - filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=5) alpha(opacity=20); - margin-top: 2px; - margin-left: 2px; -} \ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/common/common.css b/WebContent/VAADIN/themes/chameleon/common/common.css index e1a5bdce7a..2e0b9d8e75 100644 --- a/WebContent/VAADIN/themes/chameleon/common/common.css +++ b/WebContent/VAADIN/themes/chameleon/common/common.css @@ -98,16 +98,6 @@ overflow: hidden; } -.v-ie6 .v-window, -.v-ie6 .v-popupview-popup, -.v-ie6 .v-filterselect-suggestpopup, -.v-ie6 .v-datefield-popup, -.v-ie6 .v-contextmenu, -.v-ie6 .v-Notification, -.v-ie6 .v-menubar-submenu { - background-image: none; - } - .v-filterselect-suggestpopup, .v-contextmenu, .v-menubar-submenu { diff --git a/WebContent/VAADIN/themes/chameleon/components/accordion/accordion.css b/WebContent/VAADIN/themes/chameleon/components/accordion/accordion.css index 6b0f69aaaa..8fb7254008 100644 --- a/WebContent/VAADIN/themes/chameleon/components/accordion/accordion.css +++ b/WebContent/VAADIN/themes/chameleon/components/accordion/accordion.css @@ -14,10 +14,6 @@ border-style: solid none; } -.v-ie6 .v-accordion-item-caption { - background-image: none; - } - div.v-accordion-item-caption, div.v-accordion-item-open .v-accordion-item-caption:active { background-color: transparent; diff --git a/WebContent/VAADIN/themes/chameleon/components/button/button.css b/WebContent/VAADIN/themes/chameleon/components/button/button.css index 13fa53cc3f..d31bdd0ecf 100644 --- a/WebContent/VAADIN/themes/chameleon/components/button/button.css +++ b/WebContent/VAADIN/themes/chameleon/components/button/button.css @@ -22,10 +22,6 @@ div.v-button-down .v-button-wrap { background-image: url(../../img/grad-dark-top2.png); } -.v-ie6 div.v-button-down .v-button-wrap { - background-image: none; - } - .v-button { overflow: hidden; } @@ -66,16 +62,6 @@ div.v-button-down .v-button-wrap { overflow: hidden; } -body.v-ie6 .v-button { - background-image: none; - } - -body.v-ie6 .v-button .v-button-wrap { - background-image: none; - display: inline; - zoom: 1; - } - .v-button:focus { outline: none; } @@ -263,17 +249,14 @@ body.v-ie .v-pressed.v-button-borderless .v-button-wrap { margin-right: -0.5em; } -.v-ie6 .v-button-icon-on-right, .v-ie7 .v-button-icon-on-right { position: relative; } -.v-ie6 .v-button-icon-on-right .v-button-caption, .v-ie7 .v-button-icon-on-right .v-button-caption { padding-right: 14px; } -.v-ie6 .v-button-icon-on-right .v-icon, .v-ie7 .v-button-icon-on-right .v-icon { position: absolute; right: 0; diff --git a/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css b/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css index 71771ad6e1..79bf7f904a 100644 --- a/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css +++ b/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css @@ -23,7 +23,6 @@ height: 1.2em; } -.v-ie6 .v-datefield-button, .v-ie7 .v-datefield-button { height: 1.55em; margin-top: 1px; @@ -116,10 +115,6 @@ td.v-datefield-calendarpanel-month { text-shadow: 0 1px 0 rgba(255,255,255,.7); } -.v-ie6 td.v-datefield-calendarpanel-month { - background-image: none; - } - span.v-datefield-calendarpanel-month { display: block; text-align: center; @@ -172,10 +167,6 @@ td.v-datefield-calendarpanel-nextyear { background-position: 0 0; } -.v-ie6 .v-datefield-calendarpanel-header button { - background-image: none; - } - .v-datefield-calendarpanel-header button:active { background-image: url(../../img/grad-dark-top2.png); } @@ -239,10 +230,6 @@ td.v-datefield-calendarpanel-nextyear { margin-bottom: 2px; } -.v-ie6 .v-datefield-calendarpanel-weekdays strong { - background-image: none; - } - .v-datefield-calendarpanel .v-first strong { -webkit-border-bottom-left-radius: 3px; -moz-border-radius-bottomleft: 3px; @@ -293,10 +280,6 @@ td.v-datefield-calendarpanel-nextyear { border: 1px solid #c9c9c9; } -.v-ie6 .v-datefield-calendarpanel-day-today { - background-image: none; - } - .v-datefield-calendarpanel-day-selected, .v-datefield-calendarpanel-day-selected:hover { margin: 0 0 0 .3em; diff --git a/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css b/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css index 00b062f8d6..4f6be1b923 100644 --- a/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css +++ b/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css @@ -5,10 +5,6 @@ border-width: 1px 0; } -.v-ie6 .v-menubar { - background-image: none; - } - .v-menubar .v-menubar-menuitem { padding: .2em .5em; line-height: normal; @@ -26,7 +22,3 @@ background-image: url(../../img/grad-light-top2.png); background-position: 0 -1px; } - -.v-ie6 .v-menubar-submenu .v-menubar-menuitem-selected { - background-image: none; - } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/notification/notification.css b/WebContent/VAADIN/themes/chameleon/components/notification/notification.css index 1e4268cf92..ee686912c5 100644 --- a/WebContent/VAADIN/themes/chameleon/components/notification/notification.css +++ b/WebContent/VAADIN/themes/chameleon/components/notification/notification.css @@ -47,10 +47,6 @@ div.v-Notification-tray { text-shadow: 0 1px 1px rgba(0,0,0,.5); } -.v-ie6 .v-Notification-tray { - background-image: none; - } - .v-Notification-tray h1 { font-size: 14px; line-height: 18px; diff --git a/WebContent/VAADIN/themes/chameleon/components/panel/panel.css b/WebContent/VAADIN/themes/chameleon/components/panel/panel.css index e83e245ce6..0e5dcb8a38 100644 --- a/WebContent/VAADIN/themes/chameleon/components/panel/panel.css +++ b/WebContent/VAADIN/themes/chameleon/components/panel/panel.css @@ -87,10 +87,6 @@ div.v-panel-content-light { padding: .3em .6em; } -.v-ie6 .v-panel-bubble .v-panel-caption-bubble { - background-image: none; - } - .v-panel-nocaption-bubble { padding: 0; margin: 0; diff --git a/WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.css b/WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.css index b13b627ed6..c080c0fc43 100644 --- a/WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.css +++ b/WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.css @@ -18,11 +18,6 @@ border: 1px solid #b3b3b3; } -.v-ie6 .v-progressindicator-wrapper, -.v-ie6 .v-progressindicator-indicator { - background-image: none; - } - /******************************************************************************* * Small diff --git a/WebContent/VAADIN/themes/chameleon/components/selects/selects.css b/WebContent/VAADIN/themes/chameleon/components/selects/selects.css index 170a4bb991..3c8496f0fe 100644 --- a/WebContent/VAADIN/themes/chameleon/components/selects/selects.css +++ b/WebContent/VAADIN/themes/chameleon/components/selects/selects.css @@ -84,13 +84,6 @@ body .v-filterselect-suggestpopup-big td { -ms-user-select: none; } -.v-ie6 .v-filterselect-prevpage-off, -.v-ie6 .v-filterselect-nextpage-off, -.v-ie6 .v-filterselect-prevpage, -.v-ie6 .v-filterselect-nextpage { - background-image: none; - } - .v-filterselect-prevpage:active, .v-filterselect-nextpage:active { background-image: (../../img/grad-dark-bottom2.png); @@ -126,10 +119,6 @@ body .v-filterselect-suggestpopup-big td { background-position: 0 -1px; } -.v-ie6 .v-filterselect-suggestmenu .gwt-menuItem-selected { - background-image: none; - } - .v-filterselect-suggestpopup-small .v-filterselect-status { font-size: .8em; } @@ -156,10 +145,6 @@ body .v-filterselect-suggestpopup-big td { padding: .3em .5em; } -.v-ie6 .v-filterselect-select-button { - background-image: none; - } - .v-filterselect-select-button .v-filterselect-input { display: block; width: 100% !important; @@ -176,10 +161,3 @@ body .v-filterselect-suggestpopup-big td { height: 100%; background-position: 100% -8px; } - -.v-ie6 .v-filterselect-select-button .v-filterselect-button { - float: none; - position: relative; - margin: -1.8em -.5em -.3em -.5em; - padding: .3em .5em; - } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/slider/slider.css b/WebContent/VAADIN/themes/chameleon/components/slider/slider.css index c0fc271d3f..6a430723e2 100644 --- a/WebContent/VAADIN/themes/chameleon/components/slider/slider.css +++ b/WebContent/VAADIN/themes/chameleon/components/slider/slider.css @@ -42,10 +42,6 @@ border-width: 0 1px; } -.v-ie6 .v-slider-vertical { - width: 6px; - } - .v-slider-vertical .v-slider-base { background-image: none; width: 4px; @@ -58,8 +54,3 @@ margin: 0; margin-left: -5px; } - -.v-ie6 .v-slider-base, -.v-ie6 .v-slider-handle { - background-image: none; - } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.css b/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.css index bd407592cb..1cb04bc29b 100644 --- a/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.css +++ b/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.css @@ -5,11 +5,6 @@ width: 9px; } -.v-ie6 .v-splitpanel-hsplitter div, -.v-ie6 .v-splitpanel-vsplitter div { - background-image: url(../../img/split-handle-ie6.png); - } - .v-splitpanel-vsplitter div { background-position: 50% 2px; margin: -1px 0; @@ -35,13 +30,6 @@ background: #b3b3b3 url(../../img/grad-light-top.png) repeat-x; } -.v-ie6 .v-splitpanel-hsplitter, -.v-ie6 .v-splitpanel-hsplitter-locked, -.v-ie6 .v-splitpanel-vsplitter, -.v-ie6 .v-splitpanel-vsplitter-locked { - background-image: none; - } - /******************************************************************************* * Small ******************************************************************************/ @@ -61,11 +49,6 @@ body .v-splitpanel-vsplitter-small-locked { line-height: 1px; } -body.v-ie6 .v-splitpanel-vsplitter-small, -body.v-ie6 .v-splitpanel-vsplitter-small-locked { - overflow: hidden; - } - .v-splitpanel-hsplitter-small div { width: 7px; margin-left: -2px; @@ -78,8 +61,3 @@ body.v-ie6 .v-splitpanel-vsplitter-small-locked { background: transparent; overflow: hidden; } - -.v-ie6 .v-splitpanel-hsplitter-small div, -.v-ie6 .v-splitpanel-vsplitter-small div { - background-image: none; - } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/table/table.css b/WebContent/VAADIN/themes/chameleon/components/table/table.css index 1511beb913..ea56b14f98 100644 --- a/WebContent/VAADIN/themes/chameleon/components/table/table.css +++ b/WebContent/VAADIN/themes/chameleon/components/table/table.css @@ -5,11 +5,6 @@ line-height: normal; } -.v-ie6 .v-table-header-wrap, -.v-ie6 .v-table-header-drag { - background-image: none; - } - .v-table-caption-container, .v-table-header-drag { padding-top: .2em; @@ -52,10 +47,6 @@ div.v-table-focus-slot-left { background-position: 0 -1px; } -.v-ie6 .v-table tr.v-selected { - background-image: none; - } - div.v-table-focus-slot-right { background: transparent; border-right: 2px solid #b3b3b3; diff --git a/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css index 1c52c27576..0db9b9d960 100644 --- a/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css +++ b/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css @@ -36,10 +36,6 @@ -moz-border-radius-topright: 2px; } -.v-ie6 .v-tabsheet-tabitem-selected .v-caption { - background-image: none; - } - .v-tabsheet-content { background: #fff; border-color: #b3b3b3; @@ -62,10 +58,6 @@ margin: .2em 0 0 0; } -.v-ie6 .v-tabsheet-caption-close { - background-image: url(../../img/close-btn-ie6.png); - } - .v-tabsheet-caption-close:hover { background-position: .5em -25px; } @@ -89,10 +81,6 @@ -moz-border-radius: 6px; } -.v-ie6 .v-tabsheet-scroller { - background-image: none; - } - .v-tabsheet-scrollerPrev, .v-tabsheet-scrollerNext, .v-tabsheet-scrollerPrev-disabled, @@ -110,13 +98,6 @@ filter: alpha(opacity=50); } -.v-ie6 .v-tabsheet-scrollerPrev, -.v-ie6 .v-tabsheet-scrollerNext, -.v-ie6 .v-tabsheet-scrollerPrev-disabled, -.v-ie6 .v-tabsheet-scrollerNext-disabled{ - background-image: url(../../img/tab-arrows-ie6.png); - } - .v-tabsheet-scroller button::-moz-focus-inner { border: none; padding: 0; diff --git a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css index 9c448eee00..42bd986cef 100644 --- a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css +++ b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css @@ -123,8 +123,3 @@ input.v-textfield-search[type=text], .v-filterselect-search { padding-left: 17px; } - -.v-ie6 input.v-textfield-search { - /* Compensate for big style as well, since IE6 doesn't handle the selector */ - padding-left: 21px; - } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/window/window.css b/WebContent/VAADIN/themes/chameleon/components/window/window.css index 3034a58fbf..b5cc0170ac 100644 --- a/WebContent/VAADIN/themes/chameleon/components/window/window.css +++ b/WebContent/VAADIN/themes/chameleon/components/window/window.css @@ -11,10 +11,6 @@ z-index: 2; } -.v-ie6 .v-window-closebox { - background-image: url(../../img/close-btn-ie6.png); - } - .v-window-closebox:hover { background-position: 0 -25px; } @@ -35,10 +31,6 @@ background-repeat: repeat-x; } -.v-ie6 .v-window-wrap { - background: transparent !important; - } - .v-window-outerheader { padding: .2em 1.7em .5em 1.2em; height: auto; diff --git a/WebContent/VAADIN/themes/chameleon/compound/sidebar-menu/sidebar-menu.css b/WebContent/VAADIN/themes/chameleon/compound/sidebar-menu/sidebar-menu.css index 83b736584f..e2ab7f2080 100644 --- a/WebContent/VAADIN/themes/chameleon/compound/sidebar-menu/sidebar-menu.css +++ b/WebContent/VAADIN/themes/chameleon/compound/sidebar-menu/sidebar-menu.css @@ -33,11 +33,6 @@ color: #fff; } -.v-ie6 .sidebar-menu .tab-selected, -.v-ie6 .sidebar-menu .selected { - background-image: none; - } - .sidebar-menu .tab-selected:focus, .sidebar-menu .selected:focus { outline: none; diff --git a/WebContent/VAADIN/themes/chameleon/compound/toolbar/toolbar.css b/WebContent/VAADIN/themes/chameleon/compound/toolbar/toolbar.css index 594fc245a6..468172037e 100644 --- a/WebContent/VAADIN/themes/chameleon/compound/toolbar/toolbar.css +++ b/WebContent/VAADIN/themes/chameleon/compound/toolbar/toolbar.css @@ -4,10 +4,6 @@ border-width: 1px 0; } -.v-ie6 .v-csslayout-toolbar { - background-image: none; - } - .v-csslayout-toolbar .v-csslayout-margin { margin: 3px .3em 2px; padding-bottom: 1px; diff --git a/WebContent/VAADIN/themes/chameleon/img/close-btn-ie6.png b/WebContent/VAADIN/themes/chameleon/img/close-btn-ie6.png deleted file mode 100644 index 334b03769a283a6281ed6de45cf17c51ecba67e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^d_c_2!3-oTqJ08@lw^r(L`iUdT1k0gQ7VIDN`6wR zf@f}GdTLN=VoGJ<$y6JlBCP-O&5yKC33hYugJ#55`Zb@7!1`33(+1`MtT?wkP1IC;7_hE&|j>51lIP~c#B z8yod~e_mP?%h}@x4s0@zdocNBMrvuOs;A4n%{g~ktEbMaW^H9WeWPVXXU8gAKKI}T aMh3^zY!}b3KWYjzjlt8^&t;ucLK6V(9bPy9 diff --git a/WebContent/VAADIN/themes/chameleon/img/date-btn-ie6.png b/WebContent/VAADIN/themes/chameleon/img/date-btn-ie6.png deleted file mode 100644 index d22411b260ede176e1b0800b9f3fc006159e2e21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 341 zcmV-b0jmCqP)~v_V)Jo_xJPj^X={J>FMd~ z>+9_7?C$RF{r&y^{{HIf>hkjP@bK{T^z`}p`S0)V_4W1o`uhC*{P_6z@$vEh|NrRd z=pQ311ONa41$0tQQ~&?}{{Z{84pRUC0Fp^WK~#9!?9f{U5cu z>7gyrcnS27If&?ou8Jo0#N6s~<@~!du%<{xjMM-F8IBb46a*z+TXU?uh12=SS*i+L zut&z~TArV&sqb^yhMK1`$Y)FC+MQM?Ej2Agx!6|ekyXIfp#&D#&Q;EOrb@THV_Nlz nO{lBByZ?>3|KlI1mjD9*3;1bY;Xah000000NkvXXu0mjfw2ZYF diff --git a/WebContent/VAADIN/themes/chameleon/img/split-handle-ie6.png b/WebContent/VAADIN/themes/chameleon/img/split-handle-ie6.png deleted file mode 100644 index 2e23c10d9091551e2eac18faf50babfc025108a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm3?%32=lK9B$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1G5&=FTt_B7M>(;GPS64rD=+LA|lZ1qXu3x_nlzjL2@@pW) zR1)MD{GZ|Jb^|XUPtMcDF{I*FQbI}s5GAFjCnY4NrY0t&q@}TN7%(tyX3*c-eNzRf OlEKr}&t;ucLK6T%z%<7I diff --git a/WebContent/VAADIN/themes/chameleon/img/tab-arrows-ie6.png b/WebContent/VAADIN/themes/chameleon/img/tab-arrows-ie6.png deleted file mode 100644 index 963cf2e1a0e1e454edb0a255bcf9eda6d3eda367..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^B0$W=!3-puyZf#HDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MScN3A+GG~?9--A)7RG*6%{>t^r)PioRE;viWMuKK7IP~ z<;%y99|s2q&zm=|x3`y%k55cY?81c$FJ8Pjbm$NZ3kwGahrGP}#*G_gWo4C=lpa2O z=rUnlAkbu~k|4j}|F{5yh!VpspsE;87srr_TOsExg&Gt@m@jlRaC5B4+4sf8p*CnrCS6pe49K!iLx$8*MJmEXrD|fzq oeCe&~uiyVqIzQ5w&%n&^<&eNnwqJ+t0qtS%boFyt=akR{08iS6dH?_b diff --git a/WebContent/VAADIN/themes/liferay/button/button.css b/WebContent/VAADIN/themes/liferay/button/button.css index 8181a041a0..bd0f307947 100644 --- a/WebContent/VAADIN/themes/liferay/button/button.css +++ b/WebContent/VAADIN/themes/liferay/button/button.css @@ -50,11 +50,6 @@ line-height: 16px; } -.v-ie6 .v-button .v-button-wrap { - display: inline; - zoom: 1; -} - /* Link style button */ .v-button-link, .v-disabled.v-button-link, diff --git a/WebContent/VAADIN/themes/liferay/common/common.css b/WebContent/VAADIN/themes/liferay/common/common.css index 26a0354ff3..521c4f3ac1 100644 --- a/WebContent/VAADIN/themes/liferay/common/common.css +++ b/WebContent/VAADIN/themes/liferay/common/common.css @@ -33,7 +33,3 @@ div.v-app { font-weight: bold; margin: 1px 0 4px 0; } - -.v-ie6 .v-view { - border-top: none; -} \ No newline at end of file diff --git a/WebContent/VAADIN/themes/liferay/datefield/datefield.css b/WebContent/VAADIN/themes/liferay/datefield/datefield.css index 4307658449..fc10f1639e 100644 --- a/WebContent/VAADIN/themes/liferay/datefield/datefield.css +++ b/WebContent/VAADIN/themes/liferay/datefield/datefield.css @@ -116,8 +116,6 @@ span.v-datefield-calendarpanel-month { min-width: 22px; } -.v-ie6 .v-datefield-calendarpanel-prevyear button, -.v-ie6 .v-datefield-calendarpanel-nextyear button, .v-ie7 .v-datefield-calendarpanel-prevyear button, .v-ie7 .v-datefield-calendarpanel-nextyear button { width: 22px; diff --git a/WebContent/VAADIN/themes/liferay/select/select.css b/WebContent/VAADIN/themes/liferay/select/select.css index 48e35f9baa..66672cc573 100644 --- a/WebContent/VAADIN/themes/liferay/select/select.css +++ b/WebContent/VAADIN/themes/liferay/select/select.css @@ -7,10 +7,6 @@ select { background-color: #fff; } -.v-ie6 select { - font-size: 1em; -} - .v-filterselect-button { width: 24px; height: 24px; diff --git a/WebContent/VAADIN/themes/liferay/tabsheet/close-ie6.png b/WebContent/VAADIN/themes/liferay/tabsheet/close-ie6.png deleted file mode 100644 index fcbbedb6d4ea215efe6914ff294a975b2295d81b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#4ne^UZdjKx9jP7LeL$-D$|TmyVUTp5`f zBp4Xv85k587}OaUbQu^77#OS=7@QawJQx`K85lws7%~|c3K$s585rsq7@8Rv+8G!g z%F4blH2mQ0{UbT~Ur9-M(cwst=_Nsa!3+-1Zlr-YN#5=*3>~bpKw}s<3p^r=85p>Q zL70(Y)*PUn47Q#wjv*Y^lM@^m%pA=O(h>v&gdZ>^DRfVb7vY%ccxg_JQjLrP8~1tx sflUmNHcmEg9C%U;3yql!g(qb)q$V)Q@$pYv3p9wq)78&qol`;+07p+cB>(^b diff --git a/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css index 4d5c21d7af..7f23edb809 100644 --- a/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css +++ b/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css @@ -132,7 +132,6 @@ .v-tabsheet-caption-close { background: transparent url(close.png) no-repeat right top; - -background-image: url(close-ie6.png); cursor: default; float: right; margin: 3px -1px 0; diff --git a/WebContent/VAADIN/themes/liferay/tree/arrows_sprites-ie6.png b/WebContent/VAADIN/themes/liferay/tree/arrows_sprites-ie6.png deleted file mode 100644 index c9a0bbd3881319e4cb385bb748c657e13e334301..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 398 zcmV;90df9`P)Px#cu-7KMF8+WCMG6XSy_dJg@}lVn3$NMp`jea_ok+%si~E&quIKu%=lZVb`mpHxv*`P?>HEd* z{KxP7$nX5k?)%E{{Lt_F(DMD)@%-2F`~uwN^Z)<=0d!JMQvg8b*k%9#00Cl4M??UK z1szBL000SaNLh0L01FcU01FcV0GgZ_0001$NklnuQf^Sh# z1pNO$v~JyKZVZXZ-2F-0>4;cw07*qoM6N<$f}@$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1G1_3@Hu5;$jn>T+!QffwYd}4f3>hIsbgF?d7GIOR*o3U)g zszpnd{`&PRB_k^~F(o)G($m}T^0sbOpk5tM7srr_TRaEb85tBfm^XCg1pNOWCgd@r tRiXU5-vvpQea##1F`NqByN`jHL2?44%ami2ErI$NJYD@<);T3K0RUSGMdkni diff --git a/WebContent/VAADIN/themes/reindeer/common/icons/bullet-white-ie6.png b/WebContent/VAADIN/themes/reindeer/common/icons/bullet-white-ie6.png deleted file mode 100644 index 9661802744652f4ae963df1326ccf6d96ba29467..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|R3?#1$$yWg>$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWu=T0X`wF|Ns97GD8ntt^-nho-U3d6}OTS6vP-vCFnGH9xvX3?#4ne^UZdk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XTmyVUTptEm-qsg<6zy_DnfXO!+5>;HyLL+Vy$s&X?!BqX z_PVF~?aZ!6;r9Q&e|s~z div { background: transparent; } -.v-ie6 .v-panel-content-light { - background: transparent; -} .v-panel-light .v-panel-deco-light { height: 0; border: none; diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus-ie6.png b/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus-ie6.png deleted file mode 100644 index 5cf13fac6ae08e9cc1197e278812187f042c5a47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^IzTMW!3-qbpU1`mDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MREZ?A+Fwqliaepyz_d@yyNV{vIGPLt)ofC_ZlFr8k|4ieAQu7{Hl5Kq4;0n*ba4!+xRvxEMOn_kz-Y4&uY`m}2m9hKchP<= nH7`S9Zq6>to1N?ojBE@cC9>aErP#XxwJ~_Q`njxgN@xNA8^%8& diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-ie6.png b/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-ie6.png deleted file mode 100644 index d06d599e0e4718243e99e91f90fc6c67003d9d5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^IzTMW!3-qbpU1`mDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MT!AFA+8pdmKK&)R@T-ks;b($dM2i30)m2e_VzludZOau z|NsAweG)VgsF=GX$S)Ykg#rdIf5uNhVO>ub$B>F!Ne><=$Qf)f+APQ`Az|6c?i^%z tc*Uc@qb1>IjyN?X>6JZVbZB5?c(GdX&c)>++khGwJYD@<);T3K0RYMqL^}Wg diff --git a/WebContent/VAADIN/themes/reindeer/select/img/left-focus-ie6.png b/WebContent/VAADIN/themes/reindeer/select/img/left-focus-ie6.png deleted file mode 100644 index 643aac1bc9f4e8a92b2bf24708642a9314d8daef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^MnEji!3-qp8s4x0DajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MFs&rA+C;f+XLG7eERDSr z1<%~X^wgl##FWaylc_d9MFs&rA+FnZ?A*I|-_M^v4;?@1fh~3zu^DqfZ@^p{X#(57*7|+ zkcwMp&UtekP!M3g@bUJqOy76)HpVXAaf=!|>8kKbRezpR+*ZDrD__GR!Epb#T%bGuiUmM> O7(8A5T-G@yGywp^JbD@c diff --git a/WebContent/VAADIN/themes/reindeer/tree/tree.css b/WebContent/VAADIN/themes/reindeer/tree/tree.css index 63ac914fdf..f72f61c545 100644 --- a/WebContent/VAADIN/themes/reindeer/tree/tree.css +++ b/WebContent/VAADIN/themes/reindeer/tree/tree.css @@ -1,13 +1,6 @@ .v-tree-node { background: transparent url(img/arrows.png) no-repeat 6px -10px; } -.v-ie6 .v-tree-node { - background-image: url(img/arrows-ie6.png); - background-repeat: no-repeat; -} -.v-ie6 div.v-tree-node-leaf { - background: transparent; -} .v-tree-node-expanded { background-position: -7px 5px; } @@ -32,12 +25,6 @@ .v-tree-node-children { padding-left: 16px; } -/* IMPORTANT keep the offsetWidth (width + padding) of this element the same as the margin-left of v-tree-node-caption */ -.v-ie6 .v-tree-node-ie6compatnode { - width: 14px; - height: 10px; - padding: 1px; -} .v-tree-node-caption.v-tree-node-focused span{ padding-left: 1px; padding-top: 0px; @@ -46,9 +33,6 @@ .v-tree-node-focused span{ border: 1px dotted black; } -.v-ie6 .v-tree-node-ie6compatnode.v-tree-node-focused{ - padding-left: 0px; -} /*************************************** * Drag'n'drop styles ***************************************/ diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png b/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png deleted file mode 100644 index 8ff06a11edddfe9989b73b1018d39ee33d30b3c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^j6kHx!3<=jI`0SpQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>Jidq7ELR=M;Rn;`LbYvA2r!C># z26RuRr;B4q#jPg?*@c=M1XvD;PDxPU)Y3TUAn@kH;UcA#ZaAmjNd}8U}fi7AzZCsS>JiUI?CLR{6gbrqCV)wOhW4UF`SO&nc4%O_fyDHFfp1^$m0ljO7%SRW-He ze%ogTG~C$J#WAGf7SEw}-UbB*h7G&6bL9QE54n`p!?!i^ec;VIdKVimO@G_;DSr z1<%~X^wgl##FWaylc_d9MY;h#A+8F_Dt3;}Zl2!iTG|TAs$RbS2F9lHO3Fc@;WqY; zt{$GQ9$wmd`f`d&vI>gMeQVAGHQIT)IEGZ*ayhe|kwJln*>R$w!h3r?$&lE^?ejLe z*oZv}{O5})z4*} HQ$iB}e!4$o diff --git a/WebContent/VAADIN/themes/reindeer/window/window.css b/WebContent/VAADIN/themes/reindeer/window/window.css index 5b3997f444..12139d60b7 100644 --- a/WebContent/VAADIN/themes/reindeer/window/window.css +++ b/WebContent/VAADIN/themes/reindeer/window/window.css @@ -9,23 +9,19 @@ .v-op .v-window-wrap { border-color: rgba(0,0,0,.2); } -.v-ff2 .v-window-wrap, -.v-ie6 .v-window-wrap { +.v-ff2 .v-window-wrap { border: none; } -.v-ff2 .v-window-outerheader, -.v-ie6 .v-window-outerheader { +.v-ff2 .v-window-outerheader { border: 1px solid #808386; border-bottom: none; } -.v-ff2 .v-window-contents, -.v-ie6 .v-window-contents { +.v-ff2 .v-window-contents { border: 1px solid #808386; border-top: none; border-bottom: none; } -.v-ff2 .v-window-footer, -.v-ie6 .v-window-footer { +.v-ff2 .v-window-footer { border: 1px solid #808386; border-top: none; } @@ -50,9 +46,6 @@ padding-left: 13px; background: transparent url(../common/icons/error.png) no-repeat 0 50%; } -.v-ie6 .v-window-error .v-window-header { - background-image: url(../common/icons/error-ie6.png); -} .v-window-resizebox { width: 15px; height: 15px; @@ -136,12 +129,6 @@ background: #f7f7f8 repeat-x; background-image: url(img/content-bg-light.png); /** sprite-ref: verticals; sprite-alignment: repeat */ } -.v-ie6 .v-window-light .v-window-wrap2 { - background-image: none; -} - - - /** @@ -203,12 +190,6 @@ width: 14px; height: 14px; } -.v-ie6 .v-window-black .v-window-resizebox { - background-image: url(img/black/resize-ie6.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 4px */ -} -.v-ie6 .v-window-black .v-window-contents { - background: transparent url(img/black/content-bg-ie6.png) repeat-x; -} /* Must be last to make this image last in the sprites */ .v-window-black .v-window-contents { border: none; diff --git a/WebContent/VAADIN/themes/runo/button/button.css b/WebContent/VAADIN/themes/runo/button/button.css index c196841ad3..0ab4d60d1d 100644 --- a/WebContent/VAADIN/themes/runo/button/button.css +++ b/WebContent/VAADIN/themes/runo/button/button.css @@ -160,13 +160,9 @@ .v-checkbox .v-errorindicator { padding-left: 10px; } -.v-ie6 .v-checkbox .v-errorindicator { - padding-right: 4px; - } .v-ie7 .v-checkbox .v-errorindicator { padding-right: 7px; } -.v-ie6 .v-button .v-errorindicator, .v-ie7 .v-button .v-errorindicator { padding-right: 5px; } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/caption/caption.css b/WebContent/VAADIN/themes/runo/caption/caption.css index d5be467822..43abda4067 100644 --- a/WebContent/VAADIN/themes/runo/caption/caption.css +++ b/WebContent/VAADIN/themes/runo/caption/caption.css @@ -6,10 +6,6 @@ height: 16px; background: transparent url(../icons/16/error.png) no-repeat top right; } -.v-ie6 .v-errorindicator { - /* gif for transparency */ - background-image: url(../icons/16/error.gif); -} .v-ie7 .v-errorindicator { margin-left: -3px; } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/formlayout/formlayout.css b/WebContent/VAADIN/themes/runo/formlayout/formlayout.css index fa4a7bde63..466baafd8c 100644 --- a/WebContent/VAADIN/themes/runo/formlayout/formlayout.css +++ b/WebContent/VAADIN/themes/runo/formlayout/formlayout.css @@ -36,9 +36,6 @@ margin-top: 5px; min-height: 20px; } -.v-ie6 .v-form-errormessage { - height: 20px -} .v-form fieldset { border: none; border-top: 1px solid #babfc0; diff --git a/WebContent/VAADIN/themes/runo/panel/panel.css b/WebContent/VAADIN/themes/runo/panel/panel.css index 8fcfcaf100..d69e319a8d 100644 --- a/WebContent/VAADIN/themes/runo/panel/panel.css +++ b/WebContent/VAADIN/themes/runo/panel/panel.css @@ -67,37 +67,14 @@ overflow: hidden; } /* IE specific rules */ -.v-ie6 .v-panel { - background: transparent; -} -.v-ie6 .v-panel-caption { - border: 1px solid #babfc0; - border-bottom: none; - background: #fff; - margin: 0; - padding-left: 18px -} -.v-ie6 .v-panel-nocaption { - border: none; - background: transparent; - margin: 0; - height: 0; -} -.v-ie6 .v-panel-caption-light { - border: none; - background: transparent; -} -.v-ie6 .v-panel-content, .v-ie7 .v-panel-content, .v-ie8 .v-panel-content { border-bottom: 1px solid #babfc0; } -.v-ie6 .v-panel-content-light, .v-ie7 .v-panel-content-light, .v-ie8 .v-panel-content-light { border-bottom: none; } -.v-ie6 .v-panel-deco, .v-ie7 .v-panel-deco, .v-ie8 .v-panel-deco { height: 0; diff --git a/WebContent/VAADIN/themes/runo/select/select.css b/WebContent/VAADIN/themes/runo/select/select.css index ad1744288a..5ea1dad783 100644 --- a/WebContent/VAADIN/themes/runo/select/select.css +++ b/WebContent/VAADIN/themes/runo/select/select.css @@ -127,12 +127,6 @@ border-top: 1px solid #b6bbbc; } -/* IE6 needs some help identifying when the input is readonly */ -.v-ie6 .v-filterselect.v-readonly, -.v-ie6 .v-filterselect .v-filterselect-input-readonly { - background: transparent; -} - /* Error styles (disabled by default) ---------------------------------- diff --git a/WebContent/VAADIN/themes/runo/slider/slider.css b/WebContent/VAADIN/themes/runo/slider/slider.css index 07b10dfa17..698d15de90 100644 --- a/WebContent/VAADIN/themes/runo/slider/slider.css +++ b/WebContent/VAADIN/themes/runo/slider/slider.css @@ -68,16 +68,3 @@ background-color: #FFE0E0; } */ - -/* IE specific styles */ - -.v-ie6 .v-slider, -.v-ie6 .v-slider-vertical { - margin: 0; -} -.v-ie6 .v-slider .v-slider-handle { - margin: -1px 0; -} -.v-ie6 .v-slider-vertical .v-slider-handle { - margin: 0 -1px; -} \ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/splitpanel/splitpanel.css b/WebContent/VAADIN/themes/runo/splitpanel/splitpanel.css index c74ab257ba..ff46127e16 100644 --- a/WebContent/VAADIN/themes/runo/splitpanel/splitpanel.css +++ b/WebContent/VAADIN/themes/runo/splitpanel/splitpanel.css @@ -36,23 +36,6 @@ margin: -1px 0; } -/* IE6 specific styles */ - -.v-ie6 .v-splitpanel-hsplitter div, -.v-ie6 .v-splitpanel-hsplitter-locked div { - height: 99%; -} - -.v-ie6 .v-splitpanel-vsplitter, -.v-ie6 .v-splitpanel-vsplitter-locked { - height: 8px; -} - -.v-ie6 .v-splitpanel-vsplitter div, -.v-ie6 .v-splitpanel-vsplitter-locked div { - margin: 0; -} - /* Rounded style */ .v-splitpanel-hsplitter-rounded div, @@ -72,10 +55,6 @@ .v-splitpanel-vsplitter-rounded-locked div { margin: -1px 4px; } -.v-ie6 .v-splitpanel-hsplitter-rounded div, -.v-ie6 .v-splitpanel-hsplitter-rounded-locked div { - height: 97%; -} /* Small style */ diff --git a/WebContent/VAADIN/themes/runo/table/table.css b/WebContent/VAADIN/themes/runo/table/table.css index 8c82a6f3e8..369aafa486 100644 --- a/WebContent/VAADIN/themes/runo/table/table.css +++ b/WebContent/VAADIN/themes/runo/table/table.css @@ -158,20 +158,6 @@ tr.v-table-row-odd:hover { .v-table .v-link { display: inline; } -/* IE6 hack */ -.v-ie6 .v-table-scrollposition { - background: transparent; - /* - AlphaImageLoader uses src attribute relative to host page, not CSS - We need multiple different filters because we cannot be sure how host page is served compared to theme resources - TODO: This actually does not work as expected, since only the last filter is applied. Can we chain filters together (i.e. contain all versions on one line)? - */ - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../../VAADIN/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../VAADIN/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="VAADIN/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="/VAADIN/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); -} - /* Borderless style */ .v-table-borderless .v-table-header-wrap, diff --git a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css index 9c224cb84f..da95cb0c8b 100644 --- a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css +++ b/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css @@ -132,24 +132,6 @@ padding-top: 12px; }*/ /* IE specific styles */ -.v-ie6 .v-tabsheet-tabs { - height: 46px; -} -.v-ie6 .v-tabsheet-tabitem-selected { - border: 1px solid #babfc0; - border-bottom: none; - background: #fff; - margin-top: 0; - height: 23px; - padding: 18px 14px 6px 15px; - cursor: default; - color: #ee5311; -} -.v-ie6 .v-tabsheet-tabitem-selected .v-caption { - background: transparent; - padding: 0; - margin: 0; -} .v-ie .v-tabsheet-content { border-bottom: none; } @@ -268,18 +250,15 @@ padding-left: 3px; }*/ /* IE specific styles */ -.v-ie6 .v-tabsheet-tabs-light, .v-ie7 .v-tabsheet-tabs-light { height: 32px; } -.v-ie6 .v-tabsheet-tabs-light .v-tabsheet-tabitem-selected, .v-ie7 .v-tabsheet-tabs-light .v-tabsheet-tabitem-selected { border: none; background: #fff url(img/inline-tab-right.png) no-repeat right top; padding: 0; height: 32px; } -.v-ie6 .v-tabsheet-tabs-light .v-tabsheet-tabitem-selected .v-caption, .v-ie7 .v-tabsheet-tabs-light .v-tabsheet-tabitem-selected .v-caption { background: transparent url(img/inline-tab-left.png) no-repeat -7px 0; padding: 9px 11px 0 11px; diff --git a/WebContent/VAADIN/themes/runo/tree/tree.css b/WebContent/VAADIN/themes/runo/tree/tree.css index 03c8a0d829..14061b8afb 100644 --- a/WebContent/VAADIN/themes/runo/tree/tree.css +++ b/WebContent/VAADIN/themes/runo/tree/tree.css @@ -30,12 +30,6 @@ .v-tree-node-children { padding-left: 16px; } -/* IMPORTANT keep the offsetWidth (width + padding) of this element the same as the margin-left of v-tree-node-caption */ -.v-ie6 .v-tree-node-ie6compatnode { - width: 14px; - height: 10px; - padding: 1px; -} .v-tree{ outline:none; } @@ -47,9 +41,6 @@ .v-tree-node-focused span{ border: 1px dotted black; } -.v-ie6 .v-tree-node-ie6compatnode.v-tree-node-focused{ - padding-left: 0px; -} /*************************************** * Drag'n'drop styles ***************************************/ diff --git a/WebContent/VAADIN/themes/runo/window/window.css b/WebContent/VAADIN/themes/runo/window/window.css index 81509146aa..7edea92ed1 100644 --- a/WebContent/VAADIN/themes/runo/window/window.css +++ b/WebContent/VAADIN/themes/runo/window/window.css @@ -21,7 +21,6 @@ letter-spacing: -0.03em; color: #f14c1a; text-shadow: 0 1px 0 #fff; - /* This element is 100% wide in IE6 */ } .v-window-contents { background: #fff; diff --git a/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java b/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java index 15d2acf6e9..0f7ec4a14b 100644 --- a/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java +++ b/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java @@ -224,9 +224,8 @@ public class CompileDefaultTheme { private static void createSprites(String themeName) throws FileNotFoundException, IOException { String[] parameters = new String[] { "--sprite-png-depth", "AUTO", - "--sprite-png-ie6", "--css-file-suffix", "-sprite", - "--css-file-encoding", "UTF-8", "--root-dir-path", - THEME_DIR + themeName, "--log-level", "WARN" }; + "--css-file-suffix", "-sprite", "--css-file-encoding", "UTF-8", + "--root-dir-path", THEME_DIR + themeName, "--log-level", "WARN" }; org.carrot2.labs.smartsprites.SmartSprites.main(parameters); diff --git a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml index 66ab7202ed..5884cdaceb 100644 --- a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml +++ b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml @@ -18,7 +18,7 @@ - + diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java index 506f2d8eaf..15a025937d 100644 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java +++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java @@ -443,10 +443,6 @@ public class ApplicationConfiguration implements EntryPoint { public void onModuleLoad() { - // Enable IE6 Background image caching - if (BrowserInfo.get().isIE6()) { - enableIE6BackgroundImageCache(); - } // Prepare VConsole for debugging if (isDebugMode()) { VDebugConsole console = GWT.create(VDebugConsole.class); @@ -476,19 +472,6 @@ public class ApplicationConfiguration implements EntryPoint { startNextApplication(); } - // From ImageSrcIE6 - private static native void enableIE6BackgroundImageCache() - /*-{ - // Fix IE background image refresh bug, present through IE6 - // see http://www.mister-pixel.com/#Content__state=is_that_simple - // this only works with IE6 SP1+ - try { - $doc.execCommand("BackgroundImageCache", false, true); - } catch (e) { - // ignore error on other browsers - } - }-*/; - /** * Checks if client side is in debug mode. Practically this is invoked by * adding ?debug parameter to URI. diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java index 18ccd363a8..5e0f420d49 100644 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java +++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java @@ -2332,19 +2332,6 @@ public class ApplicationConnection { } - /** - * Adds PNG-fix conditionally (only for IE6) to the specified IMG -element. - * - * @param el - * the IMG element to fix - */ - public void addPngFix(Element el) { - BrowserInfo b = BrowserInfo.get(); - if (b.isIE6()) { - Util.addPngFix(el); - } - } - /* * Helper to run layout functions triggered by child components with a * decent interval. diff --git a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java index 3c908556fa..daa62b4495 100644 --- a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java +++ b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java @@ -192,10 +192,6 @@ public class BrowserInfo { return isSafari() && browserDetails.getBrowserMajorVersion() == 4; } - public boolean isIE6() { - return isIE() && browserDetails.getBrowserMajorVersion() == 6; - } - public boolean isIE7() { return isIE() && browserDetails.getBrowserMajorVersion() == 7; } diff --git a/src/com/vaadin/terminal/gwt/client/Util.java b/src/com/vaadin/terminal/gwt/client/Util.java index bd46871902..fd014bffe6 100644 --- a/src/com/vaadin/terminal/gwt/client/Util.java +++ b/src/com/vaadin/terminal/gwt/client/Util.java @@ -11,7 +11,6 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.dom.client.DivElement; @@ -208,18 +207,6 @@ public class Util { return BrowserInfo.get().isIE(); } - /** - * Detects if current browser is IE6. - * - * @deprecated use BrowserInfo class instead - * - * @return true if IE6 - */ - @Deprecated - public static boolean isIE6() { - return BrowserInfo.get().isIE6(); - } - /** * @deprecated use BrowserInfo class instead * @return @@ -250,7 +237,7 @@ public class Util { DOM.setInnerText(escapeHtmlHelper, html); String escapedText = DOM.getInnerHTML(escapeHtmlHelper); if (BrowserInfo.get().isIE() && BrowserInfo.get().getIEVersion() < 9) { - // #7478 IE6-IE8 "incorrectly" returns "
" for newlines set using + // #7478 IE7-IE8 "incorrectly" returns "
" for newlines set using // setInnerText. The same for " " which is converted to " " escapedText = escapedText.replaceAll("<(BR|br)>", "\n"); escapedText = escapedText.replaceAll(" ", " "); @@ -274,48 +261,6 @@ public class Util { return attribute; } - /** - * Adds transparent PNG fix to image element; only use for IE6. - * - * @param el - * IMG element - */ - public native static void addPngFix(Element el) - /*-{ - el.attachEvent("onload", function() { - @com.vaadin.terminal.gwt.client.Util::doIE6PngFix(Lcom/google/gwt/user/client/Element;)(el); - },false); - }-*/; - - private native static void doPngFix(Element el, String blankImageUrl) - /*-{ - var src = el.src; - if (src.indexOf(".png") < 1) return; - var w = el.width || 16; - var h = el.height || 16; - if(h==30 || w==28) { - setTimeout(function(){ - el.style.height = el.height + "px"; - el.style.width = el.width + "px"; - el.src = blankImageUrl; - },10); - } else { - el.src = blankImageUrl; - el.style.height = h + "px"; - el.style.width = w + "px"; - } - el.style.padding = "0"; - el.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+src+"', sizingMethod='crop')"; - }-*/; - - public static void doIE6PngFix(Element el) { - String blankImageUrl = GWT.getModuleBaseURL() + "ie6pngfix/blank.gif"; - String src = el.getAttribute("src"); - if (src != null && !src.equals(blankImageUrl)) { - doPngFix(el, blankImageUrl); - } - } - /** * Clones given element as in JavaScript. * @@ -334,11 +279,7 @@ public class Util { public static int measureHorizontalPaddingAndBorder(Element element, int paddingGuess) { String originalWidth = DOM.getStyleAttribute(element, "width"); - String originalOverflow = ""; - if (BrowserInfo.get().isIE6()) { - originalOverflow = DOM.getStyleAttribute(element, "overflow"); - DOM.setStyleAttribute(element, "overflow", "hidden"); - } + int originalOffsetWidth = element.getOffsetWidth(); int widthGuess = (originalOffsetWidth - paddingGuess); if (widthGuess < 1) { @@ -348,9 +289,7 @@ public class Util { int padding = element.getOffsetWidth() - widthGuess; DOM.setStyleAttribute(element, "width", originalWidth); - if (BrowserInfo.get().isIE6()) { - DOM.setStyleAttribute(element, "overflow", originalOverflow); - } + return padding; } @@ -412,7 +351,6 @@ public class Util { int offsetWidth = element.getOffsetWidth(); int offsetHeight = element.getOffsetHeight(); - // if (BrowserInfo.get().isIE6()) { if (offsetHeight < 1) { offsetHeight = 1; } @@ -420,7 +358,6 @@ public class Util { offsetWidth = 10; } element.getStyle().setPropertyPx("width", offsetWidth); - // } element.getStyle().setPropertyPx("height", offsetHeight); @@ -428,9 +365,7 @@ public class Util { - element.getPropertyInt("clientHeight"); element.getStyle().setProperty("height", height); - // if (BrowserInfo.get().isIE6()) { element.getStyle().setProperty("width", width); - // } } else { borders = element.getOffsetHeight() - element.getPropertyInt("clientHeight"); diff --git a/src/com/vaadin/terminal/gwt/client/VCaption.java b/src/com/vaadin/terminal/gwt/client/VCaption.java index 5381f20d1b..59f1a5c437 100644 --- a/src/com/vaadin/terminal/gwt/client/VCaption.java +++ b/src/com/vaadin/terminal/gwt/client/VCaption.java @@ -29,7 +29,6 @@ public class VCaption extends HTML { private final ApplicationConnection client; private boolean placedAfterComponent = false; - private boolean iconOnloadHandled = false; private int maxWidth = -1; @@ -112,7 +111,6 @@ public class VCaption extends HTML { // Icon forces the caption to be above the component placedAfterComponent = false; - iconOnloadHandled = false; icon.setUri(uidl.getStringAttribute(ATTRIBUTE_ICON)); } else if (icon != null) { @@ -246,16 +244,10 @@ public class VCaption extends HTML { } if (DOM.eventGetType(event) == Event.ONLOAD - && icon.getElement() == target && !iconOnloadHandled) { + && icon.getElement() == target) { icon.setWidth(""); icon.setHeight(""); - /* - * IE6 pngFix causes two onload events to be fired and we want to - * react only to the first one - */ - iconOnloadHandled = true; - // if max width defined, recalculate if (maxWidth != -1) { setMaxWidth(maxWidth); diff --git a/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java b/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java index 5f3e5b18fd..76e6edcc43 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java @@ -13,11 +13,9 @@ import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.client.ui.impl.FocusImpl; -import com.vaadin.terminal.gwt.client.BrowserInfo; /** * A panel that contains an always visible 0x0 size element that holds the focus - * for all browsers but IE6. */ public class FocusElementPanel extends SimpleFocusablePanel { @@ -30,22 +28,20 @@ public class FocusElementPanel extends SimpleFocusablePanel { @Override public void setWidget(Widget w) { super.setWidget(w); - if (!BrowserInfo.get().isIE6()) { - if (focusElement.getParentElement() == null) { - Style style = focusElement.getStyle(); - style.setPosition(Position.FIXED); - style.setTop(0, Unit.PX); - style.setLeft(0, Unit.PX); - getElement().appendChild(focusElement); - /* Sink from focusElement too as focus and blur don't bubble */ - DOM.sinkEvents( - (com.google.gwt.user.client.Element) focusElement - .cast(), Event.FOCUSEVENTS); - // revert to original, not focusable - getElement().setPropertyObject("tabIndex", null); - } else { - moveFocusElementAfterWidget(); - } + if (focusElement.getParentElement() == null) { + Style style = focusElement.getStyle(); + style.setPosition(Position.FIXED); + style.setTop(0, Unit.PX); + style.setLeft(0, Unit.PX); + getElement().appendChild(focusElement); + /* Sink from focusElement too as focus and blur don't bubble */ + DOM.sinkEvents( + (com.google.gwt.user.client.Element) focusElement.cast(), + Event.FOCUSEVENTS); + // revert to original, not focusable + getElement().setPropertyObject("tabIndex", null); + } else { + moveFocusElementAfterWidget(); } } @@ -58,28 +54,20 @@ public class FocusElementPanel extends SimpleFocusablePanel { @Override public void setFocus(boolean focus) { - if (BrowserInfo.get().isIE6()) { - super.setFocus(focus); + if (focus) { + FocusImpl.getFocusImplForPanel().focus( + (Element) focusElement.cast()); } else { - if (focus) { - FocusImpl.getFocusImplForPanel().focus( - (Element) focusElement.cast()); - } else { - FocusImpl.getFocusImplForPanel().blur( - (Element) focusElement.cast()); - } + FocusImpl.getFocusImplForPanel() + .blur((Element) focusElement.cast()); } } @Override public void setTabIndex(int tabIndex) { - if (BrowserInfo.get().isIE6()) { - super.setTabIndex(tabIndex); - } else { - getElement().setTabIndex(-1); - if (focusElement != null) { - focusElement.setTabIndex(tabIndex); - } + getElement().setTabIndex(-1); + if (focusElement != null) { + focusElement.setTabIndex(tabIndex); } } diff --git a/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java b/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java index 74823ce75b..2452190d9d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java @@ -21,7 +21,6 @@ import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.client.ui.impl.FocusImpl; -import com.vaadin.terminal.gwt.client.BrowserInfo; /** * A scrollhandlers similar to {@link ScrollPanel}. @@ -57,18 +56,9 @@ public class FocusableScrollPanel extends SimpleFocusablePanel implements if (useFakeFocusElement()) { if (focusElement.getParentElement() == null) { Style style = focusElement.getStyle(); - if (BrowserInfo.get().isIE6()) { - style.setOverflow(Overflow.HIDDEN); - style.setHeight(0, Unit.PX); - style.setWidth(0, Unit.PX); - style.setPosition(Position.ABSOLUTE); - - addScrollHandler(this); - } else { - style.setPosition(Position.FIXED); - style.setTop(0, Unit.PX); - style.setLeft(0, Unit.PX); - } + style.setPosition(Position.FIXED); + style.setTop(0, Unit.PX); + style.setLeft(0, Unit.PX); getElement().appendChild(focusElement); /* Sink from focusElemet too as focusa and blur don't bubble */ DOM.sinkEvents( diff --git a/src/com/vaadin/terminal/gwt/client/ui/Icon.java b/src/com/vaadin/terminal/gwt/client/ui/Icon.java index eba1a9bd78..bf24f6dac2 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/Icon.java +++ b/src/com/vaadin/terminal/gwt/client/ui/Icon.java @@ -19,7 +19,6 @@ public class Icon extends UIObject { DOM.setElementProperty(getElement(), "alt", ""); setStyleName(CLASSNAME); this.client = client; - client.addPngFix(getElement()); } public Icon(ApplicationConnection client, String uidlUri) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java index b0590ce5a0..cace2105c5 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java @@ -22,7 +22,6 @@ import com.google.gwt.user.client.ui.ComplexPanel; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; import com.vaadin.terminal.gwt.client.ApplicationConnection; -import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.Container; import com.vaadin.terminal.gwt.client.EventId; import com.vaadin.terminal.gwt.client.Paintable; @@ -30,7 +29,6 @@ import com.vaadin.terminal.gwt.client.RenderSpace; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; import com.vaadin.terminal.gwt.client.VCaption; -import com.vaadin.terminal.gwt.client.VConsole; public class VAbsoluteLayout extends ComplexPanel implements Container { @@ -211,9 +209,6 @@ public class VAbsoluteLayout extends ComplexPanel implements Container { canvas.getStyle().setProperty("width", width); if (!rendering) { - if (BrowserInfo.get().isIE6()) { - relayoutWrappersForIe6(); - } relayoutRelativeChildren(); } } @@ -236,21 +231,10 @@ public class VAbsoluteLayout extends ComplexPanel implements Container { canvas.getStyle().setProperty("height", height); if (!rendering) { - if (BrowserInfo.get().isIE6()) { - relayoutWrappersForIe6(); - } relayoutRelativeChildren(); } } - private void relayoutWrappersForIe6() { - for (Widget wrapper : getChildren()) { - if (wrapper instanceof AbsoluteWrapper) { - ((AbsoluteWrapper) wrapper).ie6Layout(); - } - } - } - public class AbsoluteWrapper extends SimplePanel { private String css; private String left; @@ -353,9 +337,6 @@ public class VAbsoluteLayout extends ComplexPanel implements Container { style.setProperty("right", right); style.setProperty("bottom", bottom); - if (BrowserInfo.get().isIE6()) { - ie6Layout(); - } } updateCaptionPosition(); } @@ -369,60 +350,6 @@ public class VAbsoluteLayout extends ComplexPanel implements Container { - caption.getHeight()); } } - - private void ie6Layout() { - // special handling for IE6 is needed, it does not support - // setting both left/right or top/bottom - Style style = getElement().getStyle(); - if (bottom != null && top != null) { - // define height for wrapper to simulate bottom property - int bottompixels = measureForIE6(bottom, true); - VConsole.log("ALB" + bottompixels); - int height = canvas.getOffsetHeight() - bottompixels - - getElement().getOffsetTop(); - VConsole.log("ALB" + height); - if (height < 0) { - height = 0; - } - style.setPropertyPx("height", height); - } else { - // reset possibly existing value - style.setProperty("height", ""); - } - if (left != null && right != null) { - // define width for wrapper to simulate right property - int rightPixels = measureForIE6(right, false); - VConsole.log("ALR" + rightPixels); - int width = canvas.getOffsetWidth() - rightPixels - - getElement().getOffsetLeft(); - VConsole.log("ALR" + width); - if (width < 0) { - width = 0; - } - style.setPropertyPx("width", width); - } else { - // reset possibly existing value - style.setProperty("width", ""); - } - } - - } - - private Element measureElement; - - private int measureForIE6(String cssLength, boolean vertical) { - if (measureElement == null) { - measureElement = DOM.createDiv(); - measureElement.getStyle().setProperty("position", "absolute"); - canvas.appendChild(measureElement); - } - if (vertical) { - measureElement.getStyle().setProperty("height", cssLength); - return measureElement.getOffsetHeight(); - } else { - measureElement.getStyle().setProperty("width", cssLength); - return measureElement.getOffsetWidth(); - } } /** diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java b/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java index 66192489a9..6faf82446a 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java @@ -16,7 +16,6 @@ import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.ComplexPanel; import com.google.gwt.user.client.ui.Widget; import com.vaadin.terminal.gwt.client.ApplicationConnection; -import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.ContainerResizedListener; import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.RenderInformation; @@ -50,10 +49,6 @@ public class VAccordion extends VTabsheetBase implements public VAccordion() { super(CLASSNAME); - // IE6 needs this to calculate offsetHeight correctly - if (BrowserInfo.get().isIE6()) { - DOM.setStyleAttribute(getElement(), "zoom", "1"); - } } @Override @@ -434,10 +429,6 @@ public class VAccordion extends VTabsheetBase implements setElement(DOM.createDiv()); caption = new VCaption(null, client); caption.addClickHandler(this); - if (BrowserInfo.get().isIE6()) { - DOM.setEventListener(captionNode, this); - DOM.sinkEvents(captionNode, Event.BUTTON_LEFT); - } super.add(caption, captionNode); DOM.appendChild(captionNode, caption.getElement()); DOM.appendChild(getElement(), captionNode); @@ -496,10 +487,6 @@ public class VAccordion extends VTabsheetBase implements removeStyleDependentName("open"); setHeight(-1); setWidth(""); - if (BrowserInfo.get().isIE6()) { - // Work around for IE6 layouting problem #3359 - getElement().getStyle().setProperty("zoom", "1"); - } open = false; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VButton.java b/src/com/vaadin/terminal/gwt/client/ui/VButton.java index 442d0709ef..3df623415a 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VButton.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VButton.java @@ -143,8 +143,8 @@ public class VButton extends FocusWidget implements Paintable, ClickHandler, } wrapper.insertBefore(errorIndicatorElement, captionElement); - // Fix for IE6, IE7 - if (BrowserInfo.get().isIE6() || BrowserInfo.get().isIE7()) { + // Fix for IE7 + if (BrowserInfo.get().isIE7()) { errorIndicatorElement.setInnerText(" "); } @@ -453,7 +453,7 @@ public class VButton extends FocusWidget implements Paintable, ClickHandler, @Override public void setWidth(String width) { - if (BrowserInfo.get().isIE6() || BrowserInfo.get().isIE7()) { + if (BrowserInfo.get().isIE7()) { if (width != null && width.length() > 2) { // Assume pixel values are always sent from // ApplicationConnection diff --git a/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java b/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java index c519990aee..4c1d644756 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java @@ -31,7 +31,6 @@ import com.google.gwt.user.client.ui.MenuBar; import com.google.gwt.user.client.ui.MenuItem; import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.impl.FocusImpl; -import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.Focusable; import com.vaadin.terminal.gwt.client.Util; @@ -218,11 +217,6 @@ public class VContextMenu extends VOverlay implements SubPartAware { public void onLoad(LoadEvent event) { // Handle icon onload events to ensure shadow is resized correctly - if (BrowserInfo.get().isIE6()) { - // Ensure PNG transparency works in IE6 - Util.doIE6PngFix((Element) Element.as(event.getNativeEvent() - .getEventTarget())); - } delayedImageLoadExecutioner.trigger(); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java index 59f0afdd3c..80dc2ef015 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java @@ -87,7 +87,6 @@ public class VEmbedded extends HTML implements Paintable { setHTML(""); el = DOM.createImg(); created = true; - client.addPngFix(el); DOM.sinkEvents(el, Event.ONLOAD); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java index 7c3d3066ce..6f90a140e8 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java @@ -12,7 +12,6 @@ import java.util.List; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; -import com.google.gwt.dom.client.Style.Overflow; import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; import com.google.gwt.event.dom.client.ClickEvent; @@ -726,12 +725,6 @@ public class VFilterSelect extends Composite implements Paintable, Field, } public void onLoad(LoadEvent event) { - if (BrowserInfo.get().isIE6()) { - // Ensure PNG transparency works in IE6 - Util.doIE6PngFix((Element) Element.as(event.getNativeEvent() - .getEventTarget())); - } - // Handle icon onload events to ensure shadow is resized // correctly delayedImageLoadExecutioner.trigger(); @@ -1315,13 +1308,7 @@ public class VFilterSelect extends Composite implements Paintable, Field, private void updateSelectedIconPosition() { // Position icon vertically to middle int availableHeight = 0; - if (BrowserInfo.get().isIE6()) { - getElement().getStyle().setOverflow(Overflow.HIDDEN); - availableHeight = getOffsetHeight(); - getElement().getStyle().setProperty("overflow", ""); - } else { - availableHeight = getOffsetHeight(); - } + availableHeight = getOffsetHeight(); int iconHeight = Util.getRequiredHeight(selectedItemIcon); int marginTop = (availableHeight - iconHeight) / 2; @@ -1664,16 +1651,8 @@ public class VFilterSelect extends Composite implements Paintable, Field, this.width = width; } - if (BrowserInfo.get().isIE6()) { - // Required in IE when textfield is wider than this.width - getElement().getStyle().setOverflow(Overflow.HIDDEN); - horizPaddingAndBorder = Util.setWidthExcludingPaddingAndBorder( - this, width, horizPaddingAndBorder); - getElement().getStyle().setProperty("overflow", ""); - } else { - horizPaddingAndBorder = Util.setWidthExcludingPaddingAndBorder( - this, width, horizPaddingAndBorder); - } + horizPaddingAndBorder = Util.setWidthExcludingPaddingAndBorder(this, + width, horizPaddingAndBorder); if (initDone) { updateRootWidth(); @@ -1763,16 +1742,7 @@ public class VFilterSelect extends Composite implements Paintable, Field, * @return The width in pixels */ private int getMainWidth() { - int componentWidth; - if (BrowserInfo.get().isIE6()) { - // Required in IE when textfield is wider than this.width - getElement().getStyle().setOverflow(Overflow.HIDDEN); - componentWidth = getOffsetWidth(); - getElement().getStyle().setProperty("overflow", ""); - } else { - componentWidth = getOffsetWidth(); - } - return componentWidth; + return getOffsetWidth(); } /** diff --git a/src/com/vaadin/terminal/gwt/client/ui/VForm.java b/src/com/vaadin/terminal/gwt/client/ui/VForm.java index cabe691a3e..67be713e1a 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VForm.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VForm.java @@ -16,7 +16,6 @@ import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.ComplexPanel; import com.google.gwt.user.client.ui.Widget; import com.vaadin.terminal.gwt.client.ApplicationConnection; -import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.Container; import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.RenderInformation; @@ -214,9 +213,6 @@ public class VForm extends ComplexPanel implements Container, KeyDownHandler { renderInformation.setContentAreaHeight(renderInformation .getRenderedSize().getHeight() - getSpaceConsumedVertically()); - if (BrowserInfo.get().isIE6()) { - getElement().getStyle().setProperty("overflow", "hidden"); - } renderInformation.setContentAreaWidth(renderInformation .getRenderedSize().getWidth() - borderPaddingHorizontal); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VLabel.java b/src/com/vaadin/terminal/gwt/client/ui/VLabel.java index 28d16b4a39..76ea1297ea 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VLabel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VLabel.java @@ -125,7 +125,7 @@ public class VLabel extends HTML implements Paintable { @Override public void setText(String text) { if (BrowserInfo.get().isIE() && BrowserInfo.get().getIEVersion() < 9) { - // #3983 - IE6-IE8 incorrectly replaces \n with
so we do the + // #3983 - IE7,IE8 incorrectly replaces \n with
so we do the // escaping manually and set as HTML super.setHTML(Util.escapeHTML(text)); } else { diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java index a2b49bae05..8b53fb01c1 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java @@ -11,7 +11,6 @@ import java.util.Stack; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; -import com.google.gwt.dom.client.NodeList; import com.google.gwt.dom.client.Style; import com.google.gwt.dom.client.Style.Overflow; import com.google.gwt.dom.client.Style.Unit; @@ -157,24 +156,9 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, } this.width = width; - if (BrowserInfo.get().isIE6() && width.endsWith("px")) { - // IE6 sometimes measures wrong using - // Util.setWidthExcludingPaddingAndBorder so this is extracted to a - // special case that uses another method. Really should fix the - // Util.setWidthExcludingPaddingAndBorder method but that will - // probably break additional cases - int requestedPixelWidth = Integer.parseInt(width.substring(0, - width.length() - 2)); - int paddingBorder = Util.measureHorizontalPaddingAndBorder( - getElement(), 0); - int w = requestedPixelWidth - paddingBorder; - if (w < 0) { - w = 0; - } - getElement().getStyle().setWidth(w, Unit.PX); - } else { - Util.setWidthExcludingPaddingAndBorder(this, width, 0); - } + + Util.setWidthExcludingPaddingAndBorder(this, width, 0); + if (!subMenu) { // Only needed for root level menu hideChildren(); @@ -478,9 +462,6 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, // Handle onload events (icon loaded, size changes) if (DOM.eventGetType(e) == Event.ONLOAD) { - if (BrowserInfo.get().isIE6()) { - Util.doIE6PngFix((Element) Element.as(e.getEventTarget())); - } VMenuBar parent = getParentMenu(); if (parent != null) { // The onload event for an image in a popup should be sent to @@ -780,19 +761,10 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, style.setHeight(availableHeight, Unit.PX); style.setOverflowY(Overflow.SCROLL); - // Make room for the scroll bar - if (BrowserInfo.get().isIE6()) { - // IE6 renders the sub menu arrow icons on the scroll bar - // unless we add some padding - style.setPaddingRight(Util.getNativeScrollbarSize(), - Unit.PX); - } else { - // For other browsers, adjusting the width of the popup is - // enough - style.setWidth( - contentWidth + Util.getNativeScrollbarSize(), - Unit.PX); - } + // Make room for the scroll bar by adjusting the width of the + // popup + style.setWidth(contentWidth + Util.getNativeScrollbarSize(), + Unit.PX); popup.updateShadowSizeAndPosition(); } } @@ -962,6 +934,7 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, addStyleDependentName("selected"); // needed for IE6 to have a single style name to match for an // element + // TODO Can be optimized now that IE6 is not supported any more if (checkable) { if (checked) { removeStyleDependentName("selected-unchecked"); @@ -1170,22 +1143,9 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, paddingWidth = widthBefore - getElement().getClientWidth(); getElement().getStyle().setProperty("padding", ""); } - String overflow = ""; - if (BrowserInfo.get().isIE6()) { - // IE6 cannot measure available width correctly without - // overflow:hidden - overflow = getElement().getStyle().getProperty("overflow"); - getElement().getStyle().setProperty("overflow", "hidden"); - } int availableWidth = getElement().getClientWidth() - paddingWidth; - if (BrowserInfo.get().isIE6()) { - // IE6 cannot measure available width correctly without - // overflow:hidden - getElement().getStyle().setProperty("overflow", overflow); - } - // Used width includes the "more" item if present int usedWidth = getConsumedWidth(); int diff = availableWidth - usedWidth; @@ -1230,16 +1190,6 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, } else { widthAvailable = diff; } - - if (BrowserInfo.get().isIE6()) { - /* - * Handle transparency for IE6 here as we cannot - * implement it in CustomMenuItem.onAttach because - * onAttach is never called for CustomMenuItem due to an - * invalid component hierarchy (#6203)... - */ - reloadImages(expand.getElement()); - } } } if (collapsedRootItems.getItems().size() > 0) { @@ -1636,31 +1586,4 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, return null; } - @Override - protected void onLoad() { - super.onLoad(); - if (BrowserInfo.get().isIE6()) { - reloadImages(getElement()); - } - } - - /** - * Force a new onload event for all images. Used only for IE6 to deal with - * PNG transparency. - */ - private void reloadImages(Element root) { - - NodeList imgElements = root - .getElementsByTagName("img"); - for (int i = 0; i < imgElements.getLength(); i++) { - Element e = (Element) imgElements.getItem(i); - - // IE6 fires onload events for the icons before the listener - // is attached (or never). Updating the src force another - // onload event - String src = e.getAttribute("src"); - e.setAttribute("src", src); - } - } - } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java b/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java index 3034259353..458c43024c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java @@ -99,7 +99,9 @@ public class VNativeButton extends Button implements Paintable, ClickHandler, } getElement().insertBefore(errorIndicatorElement, captionElement); - // Fix for IE6, IE7 + // Fix for IE + // TODO This was originally for IE6 & IE7 and might not be needed + // any more if (BrowserInfo.get().isIE()) { errorIndicatorElement.setInnerText(" "); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java index 6261a3988a..a441fb24bd 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java @@ -8,9 +8,7 @@ import java.util.ArrayList; import java.util.Iterator; import com.google.gwt.event.dom.client.ChangeEvent; -import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.UIDL; -import com.vaadin.terminal.gwt.client.Util; public class VNativeSelect extends VOptionGroupBase implements Field { @@ -58,11 +56,6 @@ public class VNativeSelect extends VOptionGroupBase implements Field { select.setItemSelected(0, true); firstValueIsTemporaryNullItem = true; } - if (BrowserInfo.get().isIE6()) { - // lazy size change - IE6 uses naive dropdown that does not have a - // proper size yet - Util.notifyParentOfSizeChange(this, true); - } } @Override diff --git a/src/com/vaadin/terminal/gwt/client/ui/VOptionGroup.java b/src/com/vaadin/terminal/gwt/client/ui/VOptionGroup.java index e524d4ed9a..f33b905dea 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VOptionGroup.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VOptionGroup.java @@ -20,7 +20,6 @@ import com.google.gwt.event.dom.client.LoadEvent; import com.google.gwt.event.dom.client.LoadHandler; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.Element; import com.google.gwt.user.client.ui.CheckBox; import com.google.gwt.user.client.ui.FocusWidget; import com.google.gwt.user.client.ui.Focusable; @@ -28,7 +27,6 @@ import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.RadioButton; import com.google.gwt.user.client.ui.Widget; import com.vaadin.terminal.gwt.client.ApplicationConnection; -import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.EventId; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; @@ -51,10 +49,6 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler, private final LoadHandler iconLoadHandler = new LoadHandler() { public void onLoad(LoadEvent event) { - if (BrowserInfo.get().isIE6()) { - Util.doIE6PngFix((Element) Element.as(event.getNativeEvent() - .getEventTarget())); - } Util.notifyParentOfSizeChange(VOptionGroup.this, true); } }; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java b/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java index 27b8840823..0957b6270f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java @@ -162,9 +162,7 @@ public class VOverlay extends PopupPanel implements CloseHandler { private static int adjustByRelativeTopBodyMargin() { if (topFix == -1) { - boolean ie6OrIe7 = BrowserInfo.get().isIE() - && BrowserInfo.get().getIEVersion() <= 7; - topFix = detectRelativeBodyFixes("top", ie6OrIe7); + topFix = detectRelativeBodyFixes("top", BrowserInfo.get().isIE7()); } return topFix; } @@ -178,7 +176,7 @@ public class VOverlay extends PopupPanel implements CloseHandler { if(cstyle && cstyle.position == 'relative') { var offset = b.getBoundingClientRect()[axis]; if (removeClientLeftOrTop) { - // IE6 and IE7 include the top left border of the client area into the boundingClientRect + // IE7 include the top left border of the client area into the boundingClientRect var clientTopOrLeft = 0; if (axis == "top") clientTopOrLeft = $wnd.document.documentElement.clientTop; @@ -195,9 +193,7 @@ public class VOverlay extends PopupPanel implements CloseHandler { private static int adjustByRelativeLeftBodyMargin() { if (leftFix == -1) { - boolean ie6OrIe7 = BrowserInfo.get().isIE() - && BrowserInfo.get().getIEVersion() <= 7; - leftFix = detectRelativeBodyFixes("left", ie6OrIe7); + leftFix = detectRelativeBodyFixes("left", BrowserInfo.get().isIE7()); } return leftFix; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VPanel.java index 692b8a4858..4611f6e4ab 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VPanel.java @@ -322,40 +322,6 @@ public class VPanel extends SimplePanel implements Container, } public void runHacks(boolean runGeckoFix) { - if (BrowserInfo.get().isIE6() && width != null && !width.equals("")) { - /* - * IE6 requires overflow-hidden elements to have a width specified - * so we calculate the width of the content and caption nodes when - * no width has been specified. - */ - /* - * Fixes #1923 VPanel: Horizontal scrollbar does not appear in IE6 - * with wide content - */ - - /* - * Caption must be shrunk for parent measurements to return correct - * result in IE6 - */ - DOM.setStyleAttribute(captionNode, "width", "1px"); - - int parentPadding = Util.measureHorizontalPaddingAndBorder( - getElement(), 0); - - int parentWidthExcludingPadding = getElement().getOffsetWidth() - - parentPadding; - - Util.setWidthExcludingPaddingAndBorder(captionNode, - parentWidthExcludingPadding - getCaptionMarginLeft(), 26, - false); - - int contentMarginLeft = getContentMarginLeft(); - - Util.setWidthExcludingPaddingAndBorder(contentNode, - parentWidthExcludingPadding - contentMarginLeft, 2, false); - - } - if ((BrowserInfo.get().isIE() || BrowserInfo.get().isFF2()) && (width == null || width.equals(""))) { /* diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java index 2cbae57175..06d58fe733 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java @@ -264,7 +264,7 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field, int l = calendarToggle.getAbsoluteLeft(); // Add a little extra space to the right to avoid - // problems with IE6/IE7 scrollbars and to make it look + // problems with IE7 scrollbars and to make it look // nicer. int extraSpace = 30; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java index 959b92cffa..c42567f9b1 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java @@ -2287,7 +2287,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, * of the caption container element by the correct amount */ public void resizeCaptionContainer(int rightSpacing) { - if (BrowserInfo.get().isIE6() || td.getClassName().contains("-asc") + if (td.getClassName().contains("-asc") || td.getClassName().contains("-desc")) { /* * Room for the sort indicator is made by subtracting the styled @@ -3017,12 +3017,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, } public void setHorizontalScrollPosition(int scrollLeft) { - if (BrowserInfo.get().isIE6()) { - hTableWrapper.getStyle().setPosition(Position.RELATIVE); - hTableWrapper.getStyle().setLeft(-scrollLeft, Unit.PX); - } else { - hTableWrapper.setScrollLeft(scrollLeft); - } + hTableWrapper.setScrollLeft(scrollLeft); } public void setColumnCollapsingAllowed(boolean cc) { @@ -3873,12 +3868,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, * The value of the leftScroll */ public void setHorizontalScrollPosition(int scrollLeft) { - if (BrowserInfo.get().isIE6()) { - hTableWrapper.getStyle().setProperty("position", "relative"); - hTableWrapper.getStyle().setPropertyPx("left", -scrollLeft); - } else { - hTableWrapper.setScrollLeft(scrollLeft); - } + hTableWrapper.setScrollLeft(scrollLeft); } /** @@ -5934,7 +5924,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, */ private int getContentAreaBorderHeight() { if (contentAreaBorderHeight < 0) { - if (BrowserInfo.get().isIE7() || BrowserInfo.get().isIE6()) { + if (BrowserInfo.get().isIE7()) { contentAreaBorderHeight = Util .measureVerticalBorder(scrollBodyPanel.getElement()); } else { diff --git a/src/com/vaadin/terminal/gwt/client/ui/VSlider.java b/src/com/vaadin/terminal/gwt/client/ui/VSlider.java index f6c9b3ab0d..34838698b5 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VSlider.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VSlider.java @@ -300,9 +300,7 @@ public class VSlider extends SimpleFocusablePanel implements Paintable, Field, p = 0; } if (vertical) { - // IE6 rounding behaves a little unstable, reduce one pixel so the - // containing element (base) won't expand without limits - p = range - p - (BrowserInfo.get().isIE6() ? 1 : 0); + p = range - p; } final double pos = p; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java index 41d48041fc..ec3eeed15c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java @@ -468,10 +468,6 @@ public class VTextField extends TextBoxBase implements Paintable, Field, setText(""); removeStyleDependentName(CLASSNAME_PROMPT); setPrompting(false); - if (BrowserInfo.get().isIE6()) { - // IE6 does not show the cursor when tabbing into the field - setCursorPos(0); - } } focusedTextField = this; if (client.hasEventListeners(this, EventId.FOCUS)) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java b/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java index 4a0d6ff0f5..4115f30c37 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java @@ -12,7 +12,6 @@ import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.event.dom.client.FocusEvent; import com.google.gwt.event.dom.client.FocusHandler; -import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.ui.TextBox; import com.vaadin.terminal.gwt.client.ApplicationConnection; @@ -341,10 +340,6 @@ public class VTextualDate extends VDateField implements Paintable, Field, @Override public void setWidth(String newWidth) { if (!"".equals(newWidth) && (width == null || !newWidth.equals(width))) { - if (BrowserInfo.get().isIE6()) { - // in IE6 cols ~ min-width - DOM.setElementProperty(text.getElement(), "size", "1"); - } needLayout = true; width = newWidth; super.setWidth(width); @@ -354,10 +349,6 @@ public class VTextualDate extends VDateField implements Paintable, Field, } } else { if ("".equals(newWidth) && width != null && !"".equals(width)) { - if (BrowserInfo.get().isIE6()) { - // revert IE6 hack - DOM.setElementProperty(text.getElement(), "size", ""); - } super.setWidth(""); needLayout = true; iLayout(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTree.java b/src/com/vaadin/terminal/gwt/client/ui/VTree.java index f50b722d0c..e959038374 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTree.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTree.java @@ -279,13 +279,8 @@ public class VTree extends FocusElementPanel implements Paintable, continue; } childTree = new TreeNode(); - if (childTree.ie6compatnode != null) { - body.add(childTree); - } childTree.updateFromUIDL(childUidl, client); - if (childTree.ie6compatnode == null) { - body.add(childTree); - } + body.add(childTree); childTree.addStyleDependentName("root"); childTree.childNodeContainer.addStyleDependentName("root"); } @@ -582,19 +577,12 @@ public class VTree extends FocusElementPanel implements Paintable, private Icon icon; - private Element ie6compatnode; - private Event mouseDownEvent; private int cachedHeight = -1; private boolean focused = false; - /** - * Track onload events as IE6 sends two - */ - private boolean onloadHandled = false; - public TreeNode() { constructDom(); sinkEvents(Event.ONCLICK | Event.ONDBLCLICK | Event.MOUSEEVENTS @@ -692,11 +680,11 @@ public class VTree extends FocusElementPanel implements Paintable, // always when clicking an item, focus it setFocusedNode(this, false); - if (!isIE6OrOpera()) { + if (!BrowserInfo.get().isOpera()) { /* * Ensure that the tree's focus element also gains focus * (TreeNodes focus is faked using FocusElementPanel in browsers - * other than IE6 and Opera). + * other than Opera). */ focus(); } @@ -764,14 +752,7 @@ public class VTree extends FocusElementPanel implements Paintable, final Element target = DOM.eventGetTarget(event); if (type == Event.ONLOAD && target == icon.getElement()) { - if (onloadHandled) { - return; - } - if (BrowserInfo.get().isIE6()) { - fixWidth(); - } iconLoaded.trigger(); - onloadHandled = true; } if (disabled) { @@ -792,7 +773,7 @@ public class VTree extends FocusElementPanel implements Paintable, fireClick(event); } if (type == Event.ONCLICK) { - if (getElement() == target || ie6compatnode == target) { + if (getElement() == target) { // state change toggleState(); } else if (!readonly && inCaption) { @@ -878,7 +859,7 @@ public class VTree extends FocusElementPanel implements Paintable, * previously modified field may contain dirty variables. */ if (!treeHasFocus) { - if (isIE6OrOpera()) { + if (BrowserInfo.get().isOpera()) { if (focusedNode == null) { getNodeByKey(key).setFocused(true); } else { @@ -939,15 +920,6 @@ public class VTree extends FocusElementPanel implements Paintable, protected void constructDom() { addStyleName(CLASSNAME); - // workaround for a very weird IE6 issue #1245 - if (BrowserInfo.get().isIE6()) { - ie6compatnode = DOM.createDiv(); - setStyleName(ie6compatnode, CLASSNAME + "-ie6compatnode"); - DOM.setInnerText(ie6compatnode, " "); - DOM.appendChild(getElement(), ie6compatnode); - - DOM.sinkEvents(ie6compatnode, Event.ONCLICK); - } nodeCaptionDiv = DOM.createDiv(); DOM.setElementProperty(nodeCaptionDiv, "className", CLASSNAME @@ -959,7 +931,7 @@ public class VTree extends FocusElementPanel implements Paintable, DOM.appendChild(nodeCaptionDiv, wrapper); DOM.appendChild(wrapper, nodeCaptionSpan); - if (isIE6OrOpera()) { + if (BrowserInfo.get().isOpera()) { /* * Focus the caption div of the node to get keyboard navigation * to work without scrolling up or down when focusing a node. @@ -1023,7 +995,6 @@ public class VTree extends FocusElementPanel implements Paintable, if (uidl.hasAttribute("icon")) { if (icon == null) { - onloadHandled = false; icon = new Icon(client); DOM.insertBefore(DOM.getFirstChild(nodeCaptionDiv), icon.getElement(), nodeCaptionSpan); @@ -1036,10 +1007,6 @@ public class VTree extends FocusElementPanel implements Paintable, icon = null; } } - - if (BrowserInfo.get().isIE6() && isAttached()) { - fixWidth(); - } } public boolean isLeaf() { @@ -1103,13 +1070,8 @@ public class VTree extends FocusElementPanel implements Paintable, continue; } final TreeNode childTree = new TreeNode(); - if (ie6compatnode != null) { - childNodeContainer.add(childTree); - } childTree.updateFromUIDL(childUidl, client); - if (ie6compatnode == null) { - childNodeContainer.add(childTree); - } + childNodeContainer.add(childTree); if (!i.hasNext()) { childTree .addStyleDependentName(childTree.isLeaf() ? "leaf-last" @@ -1219,32 +1181,6 @@ public class VTree extends FocusElementPanel implements Paintable, } } - /* - * We need to fix the width of TreeNodes so that the float in - * ie6compatNode does not wrap (see ticket #1245) - */ - private void fixWidth() { - nodeCaptionDiv.getStyle().setProperty("styleFloat", "left"); - nodeCaptionDiv.getStyle().setProperty("display", "inline"); - nodeCaptionDiv.getStyle().setProperty("marginLeft", "0"); - final int captionWidth = ie6compatnode.getOffsetWidth() - + nodeCaptionDiv.getOffsetWidth(); - setWidth(captionWidth + "px"); - } - - /* - * (non-Javadoc) - * - * @see com.google.gwt.user.client.ui.Widget#onAttach() - */ - @Override - public void onAttach() { - super.onAttach(); - if (ie6compatnode != null) { - fixWidth(); - } - } - /* * (non-Javadoc) * @@ -1275,19 +1211,14 @@ public class VTree extends FocusElementPanel implements Paintable, public void setFocused(boolean focused) { if (!this.focused && focused) { nodeCaptionDiv.addClassName(CLASSNAME_FOCUSED); - if (BrowserInfo.get().isIE6()) { - ie6compatnode.addClassName(CLASSNAME_FOCUSED); - } + this.focused = focused; - if (isIE6OrOpera()) { + if (BrowserInfo.get().isOpera()) { nodeCaptionDiv.focus(); } treeHasFocus = true; } else if (this.focused && !focused) { nodeCaptionDiv.removeClassName(CLASSNAME_FOCUSED); - if (BrowserInfo.get().isIE6()) { - ie6compatnode.removeClassName(CLASSNAME_FOCUSED); - } this.focused = focused; treeHasFocus = false; } @@ -2174,7 +2105,7 @@ public class VTree extends FocusElementPanel implements Paintable, */ public Element getSubPartElement(String subPart) { if ("fe".equals(subPart)) { - if (isIE6OrOpera() && focusedNode != null) { + if (BrowserInfo.get().isOpera() && focusedNode != null) { return focusedNode.getElement(); } return getFocusElement(); @@ -2206,11 +2137,7 @@ public class VTree extends FocusElementPanel implements Paintable, } if (expandCollapse) { - if (treeNode.ie6compatnode != null) { - return treeNode.ie6compatnode; - } else { - return treeNode.getElement(); - } + return treeNode.getElement(); } else { return treeNode.nodeCaptionSpan; } @@ -2254,8 +2181,7 @@ public class VTree extends FocusElementPanel implements Paintable, return null; } - if (subElement == treeNode.getElement() - || subElement == treeNode.ie6compatnode) { + if (subElement == treeNode.getElement()) { // Targets expand/collapse arrow isExpandCollapse = true; } @@ -2316,8 +2242,4 @@ public class VTree extends FocusElementPanel implements Paintable, event.preventDefault(); } } - - private boolean isIE6OrOpera() { - return BrowserInfo.get().isIE6() || BrowserInfo.get().isOpera(); - } } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java b/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java index f7bd0b115d..8db320b1da 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java @@ -164,7 +164,7 @@ public class VTreeTable extends VScrollTable { private boolean browserSupportsAnimation() { BrowserInfo bi = BrowserInfo.get(); - return !(bi.isIE6() || bi.isIE7() || bi.isSafari4()); + return !(bi.isIE7() || bi.isSafari4()); } class VTreeTableScrollBody extends VScrollTable.VScrollTableBody { diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java index 1d02e50032..de2a903187 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java @@ -27,7 +27,6 @@ import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.Panel; import com.vaadin.terminal.gwt.client.ApplicationConnection; -import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; @@ -385,16 +384,7 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, private void setInternalHeights() { int captionHeight = 0; - int totalHeight; - if (BrowserInfo.get().isIE6()) { - String o = getElement().getStyle().getOverflow(); - - getElement().getStyle().setOverflow(Overflow.HIDDEN); - totalHeight = getOffsetHeight(); - getElement().getStyle().setProperty("overflow", o); - } else { - totalHeight = getOffsetHeight(); - } + int totalHeight = getOffsetHeight(); if (optionsCaption != null) { captionHeight = Util.getRequiredHeight(optionsCaption); @@ -424,11 +414,6 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, int bordersAndPaddings = Util.measureHorizontalPaddingAndBorder( buttons.getElement(), 0); - if (BrowserInfo.get().isIE6()) { - // IE6 sets a border on selects by default.. - bordersAndPaddings += 4; - } - int buttonWidth = Util.getRequiredWidth(buttons); int totalWidth = getOffsetWidth(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/VUpload.java b/src/com/vaadin/terminal/gwt/client/ui/VUpload.java index 25fd1d7604..77d7a7f762 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VUpload.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VUpload.java @@ -144,8 +144,6 @@ public class VUpload extends SimplePanel implements Paintable { private static native void setEncoding(Element form, String encoding) /*-{ form.enctype = encoding; - // For IE6 - form.encoding = encoding; }-*/; public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java b/src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java index 535ec16030..3da85e1b2b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java @@ -10,7 +10,6 @@ import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.History; import com.google.gwt.user.client.ui.Widget; import com.vaadin.terminal.gwt.client.ApplicationConnection; -import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.UIDL; @@ -30,10 +29,6 @@ public class VUriFragmentUtility extends Widget implements Paintable, public VUriFragmentUtility() { setElement(Document.get().createDivElement()); - if (BrowserInfo.get().isIE6()) { - getElement().getStyle().setProperty("overflow", "hidden"); - getElement().getStyle().setProperty("height", "0"); - } } @Override diff --git a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java index 8ffb0246a3..cec6bf4581 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java @@ -593,19 +593,6 @@ public class VWindow extends VOverlay implements Container, DOM.setStyleAttribute(getElement(), "width", ""); - String oldHeaderWidth = ""; // Only for IE6 - if (BrowserInfo.get().isIE6()) { - /* - * For some reason IE6 has title DIV set to width 100% which - * interferes with the header measuring. Also IE6 has width set to - * the contentPanel. - */ - oldHeaderWidth = headerText.getStyle().getProperty("width"); - DOM.setStyleAttribute(contentPanel.getElement(), "width", "auto"); - DOM.setStyleAttribute(contentPanel.getElement(), "zoom", "1"); - headerText.getStyle().setProperty("width", "auto"); - } - // Content int contentWidth = contentPanel.getElement().getScrollWidth(); contentWidth += getContentAreaToRootDifference(); @@ -616,10 +603,6 @@ public class VWindow extends VOverlay implements Container, int naturalWidth = (contentWidth > windowCaptionWidth ? contentWidth : windowCaptionWidth); - if (BrowserInfo.get().isIE6()) { - headerText.getStyle().setProperty("width", oldHeaderWidth); - } - setWidth(naturalWidth + "px"); } @@ -1056,10 +1039,6 @@ public class VWindow extends VOverlay implements Container, // "width" now contains the new width in pixels - if (BrowserInfo.get().isIE6()) { - getElement().getStyle().setProperty("overflow", "hidden"); - } - // Apply the new pixel width getElement().getStyle().setProperty("width", width); @@ -1073,14 +1052,6 @@ public class VWindow extends VOverlay implements Container, DOM.setStyleAttribute(getElement(), "width", rootWidth + "px"); } - // IE6 needs the actual inner content width on the content element, - // otherwise it won't wrap the content properly (no scrollbars - // appear, content flows out of window) - if (BrowserInfo.get().isIE6()) { - DOM.setStyleAttribute(contentPanel.getElement(), "width", - contentAreaInnerWidth + "px"); - } - renderSpace.setWidth(contentAreaInnerWidth); updateShadowSizeAndPosition(); diff --git a/src/com/vaadin/ui/RichTextArea.java b/src/com/vaadin/ui/RichTextArea.java index d371e3c181..848e778755 100644 --- a/src/com/vaadin/ui/RichTextArea.java +++ b/src/com/vaadin/ui/RichTextArea.java @@ -129,6 +129,7 @@ public class RichTextArea extends AbstractField { public void setReadOnly(boolean readOnly) { super.setReadOnly(readOnly); // IE6 cannot support multi-classname selectors properly + // TODO Can be optimized now that support for I6 is dropped if (readOnly) { addStyleName("v-richtextarea-readonly"); } else { diff --git a/tests/testbench/com/vaadin/tests/components/button/Buttons.java b/tests/testbench/com/vaadin/tests/components/button/Buttons.java index afbc90d197..573c95c2b8 100644 --- a/tests/testbench/com/vaadin/tests/components/button/Buttons.java +++ b/tests/testbench/com/vaadin/tests/components/button/Buttons.java @@ -46,13 +46,7 @@ public class Buttons extends ComponentTestCase