Browse Source

#7981 Removed Firefox 2 specific code and CSS

tags/7.0.0.alpha1
Artur Signell 12 years ago
parent
commit
f915fdaf7d

+ 0
- 3
WebContent/VAADIN/themes/base/tabsheet/tabsheet.css View File

@@ -36,9 +36,6 @@
text-align: right;
margin-top: -1em;
}
.v-ff2 .v-tabsheet-scroller {
position: relative;
}
.v-disabled .v-tabsheet-scroller {
display: none;
}

+ 0
- 5
WebContent/VAADIN/themes/reindeer/button/button-firefox.css View File

@@ -1,5 +0,0 @@
.v-ff2 .v-button .v-button-caption {
display: -moz-inline-box;
padding-top: 6px;
height: 20px;
}

+ 0
- 1
WebContent/VAADIN/themes/reindeer/button/button.css View File

@@ -7,5 +7,4 @@
@import "button-link-style.css";

/* Browser-specific corrections to the standard implementation */
@import "button-firefox.css";
@import "button-ie.css";

+ 1
- 7
WebContent/VAADIN/themes/reindeer/datefield/datefield.css View File

@@ -43,13 +43,7 @@ span.v-datefield-calendarpanel-month {
.v-datefield-full {
min-width: 240px;
}
.v-ff2 .v-datefield-month,
.v-ff2 .v-datefield-day,
.v-ff2 .v-datefield-full {
min-width: 254px;
}
.v-datefield-popupcalendar,
.v-ff2 .v-datefield-popupcalendar {
.v-datefield-popupcalendar {
min-width: 0;
}
.v-datefield-year .v-datefield-calendarpanel {

+ 0
- 4
WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css View File

@@ -147,10 +147,6 @@
height: 16px;
background: transparent url(../common/icons/error.png) no-repeat 50%;
}
.v-ff2 .v-tabsheet-tabs .v-icon,
.v-ff2 .v-tabsheet-tabs .v-errorindicator {
display: -moz-inline-stack;
}
.v-ie .v-tabsheet-tabs .v-errorindicator {
zoom: 1;
display: inline;

+ 0
- 16
WebContent/VAADIN/themes/reindeer/window/window.css View File

@@ -9,22 +9,6 @@
.v-op .v-window-wrap {
border-color: rgba(0,0,0,.2);
}
.v-ff2 .v-window-wrap {
border: none;
}
.v-ff2 .v-window-outerheader {
border: 1px solid #808386;
border-bottom: none;
}
.v-ff2 .v-window-contents {
border: 1px solid #808386;
border-top: none;
border-bottom: none;
}
.v-ff2 .v-window-footer {
border: 1px solid #808386;
border-top: none;
}
.v-window-outerheader {
padding: 12px 32px 0 14px;
height: 25px;

+ 0
- 6
src/com/vaadin/terminal/gwt/client/BrowserInfo.java View File

@@ -212,12 +212,6 @@ public class BrowserInfo {
return browserDetails.isWebKit();
}

public boolean isFF2() {
// FIXME: Should use browserVersion
return browserDetails.isFirefox()
&& browserDetails.getBrowserEngineVersion() == 1.8;
}

public boolean isFF3() {
// FIXME: Should use browserVersion
return browserDetails.isFirefox()

+ 3
- 4
src/com/vaadin/terminal/gwt/client/ui/VPanel.java View File

@@ -322,11 +322,10 @@ public class VPanel extends SimplePanel implements Container,
}

public void runHacks(boolean runGeckoFix) {
if ((BrowserInfo.get().isIE() || BrowserInfo.get().isFF2())
&& (width == null || width.equals(""))) {
if ((BrowserInfo.get().isIE()) && (width == null || width.equals(""))) {
/*
* IE and FF2 needs width to be specified for the root DIV so we
* calculate that from the sizes of the caption and layout
* IE (what version??) needs width to be specified for the root DIV
* so we calculate that from the sizes of the caption and layout
*/
int captionWidth = captionText.getOffsetWidth()
+ getCaptionMarginLeft() + getCaptionPaddingHorizontal();

+ 0
- 35
src/com/vaadin/terminal/gwt/client/ui/VWindow.java View File

@@ -668,7 +668,6 @@ public class VWindow extends VOverlay implements Container,
}
super.show();

setFF2CaretFixEnabled(true);
fixFF3OverflowBug();
}

@@ -683,28 +682,6 @@ public class VWindow extends VOverlay implements Container,
}
}

/**
* Fix "missing cursor" browser bug workaround for FF2 in Windows and Linux.
*
* Calling this method has no effect on other browsers than the ones based
* on Gecko 1.8
*
* @param enable
*/
private void setFF2CaretFixEnabled(boolean enable) {
if (BrowserInfo.get().isFF2()) {
if (enable) {
Scheduler.get().scheduleDeferred(new Command() {
public void execute() {
DOM.setStyleAttribute(getElement(), "overflow", "auto");
}
});
} else {
DOM.setStyleAttribute(getElement(), "overflow", "");
}
}
}

@Override
public void hide() {
if (vaadinModality) {
@@ -731,14 +708,6 @@ public class VWindow extends VOverlay implements Container,
}

private void showModalityCurtain() {
if (BrowserInfo.get().isFF2()) {
DOM.setStyleAttribute(
getModalityCurtain(),
"height",
DOM.getElementPropertyInt(RootPanel.getBodyElement(),
"offsetHeight") + "px");
DOM.setStyleAttribute(getModalityCurtain(), "position", "absolute");
}
DOM.setStyleAttribute(getModalityCurtain(), "zIndex",
"" + (windowOrder.indexOf(this) + Z_INDEX));
if (isShowing()) {
@@ -760,8 +729,6 @@ public class VWindow extends VOverlay implements Container,
private void showDraggingCurtain(boolean show) {
if (show && draggingCurtain == null) {

setFF2CaretFixEnabled(false); // makes FF2 slow

draggingCurtain = DOM.createDiv();
DOM.setStyleAttribute(draggingCurtain, "position", "absolute");
DOM.setStyleAttribute(draggingCurtain, "top", "0px");
@@ -774,8 +741,6 @@ public class VWindow extends VOverlay implements Container,
DOM.appendChild(RootPanel.getBodyElement(), draggingCurtain);
} else if (!show && draggingCurtain != null) {

setFF2CaretFixEnabled(true); // makes FF2 slow

DOM.removeChild(RootPanel.getBodyElement(), draggingCurtain);
draggingCurtain = null;
}

+ 6
- 24
src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java View File

@@ -9,7 +9,6 @@ import java.util.NoSuchElementException;
import com.google.gwt.dom.client.DivElement;
import com.google.gwt.dom.client.Document;
import com.google.gwt.dom.client.Element;
import com.google.gwt.dom.client.TableElement;
import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.Widget;
import com.vaadin.terminal.gwt.client.ApplicationConnection;
@@ -78,29 +77,12 @@ public class ChildComponentContainer extends Panel {
containerDIV = Document.get().createDivElement();

widgetDIV = Document.get().createDivElement();
if (BrowserInfo.get().isFF2()) {
// Style style = widgetDIV.getStyle();
// FF2 chokes on some floats very easily. Measuring size escpecially
// becomes terribly slow
TableElement tableEl = Document.get().createTableElement();
tableEl.setInnerHTML("<tbody><tr><td><div></div></td></tr></tbody>");
DivElement div = (DivElement) tableEl.getFirstChildElement()
.getFirstChildElement().getFirstChildElement()
.getFirstChildElement();
tableEl.setCellPadding(0);
tableEl.setCellSpacing(0);
tableEl.setBorder(0);
div.getStyle().setProperty("padding", "0");

setElement(tableEl);
containerDIV = div;
} else {
setFloat(widgetDIV, "left");
setElement(containerDIV);
containerDIV.getStyle().setProperty("height", "0");
containerDIV.getStyle().setProperty("width", "0px");
containerDIV.getStyle().setProperty("overflow", "hidden");
}

setFloat(widgetDIV, "left");
setElement(containerDIV);
containerDIV.getStyle().setProperty("height", "0");
containerDIV.getStyle().setProperty("width", "0px");
containerDIV.getStyle().setProperty("overflow", "hidden");

if (BrowserInfo.get().isIE()) {
/*

Loading…
Cancel
Save