]> source.dussan.org Git - vaadin-framework.git/commitdiff
#7984 removed Firefox workarounds
authorArtur Signell <artur@vaadin.com>
Tue, 22 Nov 2011 15:05:42 +0000 (17:05 +0200)
committerArtur Signell <artur@vaadin.com>
Tue, 22 Nov 2011 15:05:42 +0000 (17:05 +0200)
WebContent/VAADIN/themes/chameleon/common/common.css
WebContent/VAADIN/themes/reindeer/datefield/datefield.css
WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css
WebContent/VAADIN/themes/reindeer/window/window.css
src/com/vaadin/terminal/gwt/client/BrowserInfo.java
src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
src/com/vaadin/terminal/gwt/client/ui/VTextField.java
src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java
src/com/vaadin/terminal/gwt/client/ui/VView.java
src/com/vaadin/terminal/gwt/client/ui/VWindow.java

index 2e0b9d8e7528fa528be778e4b5a8c02f6e6d4faa..9d5a64b2adca63dfd8205b2813fbf42500ec84e1 100644 (file)
@@ -28,8 +28,7 @@
        -moz-border-radius: 4px;
        }
 
-.v-sa .v-tooltip,
-.v-ff3 .v-tooltip {
+.v-sa .v-tooltip {
        outline: 1px solid rgba(0,0,0,.2);
        -webkit-border-radius: 0;
        -moz-border-radius: 0;
index f023134769e7eb1657538bb08cad9d8ef5ee3d83..1dbc59257a0646c7f15804ca6e26b3f50c0565e4 100644 (file)
@@ -221,7 +221,6 @@ td.v-datefield-calendarpanel-nextyear {
        -moz-border-radius: 3px;
 }
 .v-sa .v-datefield-popup,
-.v-ff3 .v-datefield-popup,
 .v-op .v-datefield-popup {
        background: rgba(255,255,255,.95);
 }
index 471177cb698c9bebfafc0a6ff12bfc18e696505b..47e8b94bc702335eb6a049e434748d0eaf22b4f1 100644 (file)
 .v-tabsheet-tabsheetpanel {
        background: #fff;
 }
-.v-sa .v-tabsheet-content,
-.v-ff3 .v-tabsheet-content {
+.v-sa .v-tabsheet-content {
        border-color: rgba(0,0,0,.1);
 }
 .blue .v-tabsheet-deco {
        background: #e2e2e2;
        overflow: hidden;
 }
-.v-sa .v-tabsheet-deco,
-.v-ff3 .v-tabsheet-deco {
+.v-sa .v-tabsheet-deco {
        border-top-color: rgba(0,0,0,.1);
        background: rgba(0,0,0,.08);
 }
index 255b8f64c99bb7fa10c33fd6f002ed83ebc91f4c..25829b2f2b6d79e0706491a18a2ba657e9f43b2e 100644 (file)
@@ -5,7 +5,6 @@
        border: 1px solid #808386;
 }
 .v-sa .v-window-wrap,
-.v-ff3 .v-window-wrap,
 .v-op .v-window-wrap {
        border-color: rgba(0,0,0,.2);
 }
        overflow: hidden;
 }
 .v-sa .v-window-black .v-window-wrap,
-.v-ff3 .v-window-black .v-window-wrap,
 .v-op .v-window-black .v-window-wrap {
        border-color: rgba(0,0,0,.8);
 }
        -webkit-border-radius: 7px;
 }
 .v-sa .v-window-black .v-window-wrap2,
-.v-ff3 .v-window-black .v-window-wrap2,
 .v-op .v-window-black .v-window-wrap2 {
        background-color: rgba(29,32,33,.9);
 }
index 2229cf32f7f7c1309b8d2cb41b0ed1d95e3692a5..4c9be79787176b39ba6fa1c6670ba65b673f2b88 100644 (file)
@@ -212,17 +212,6 @@ public class BrowserInfo {
         return browserDetails.isWebKit();
     }
 
-    public boolean isFF3() {
-        // FIXME: Should use browserVersion
-        return browserDetails.isFirefox()
-                && browserDetails.getBrowserEngineVersion() == 1.9;
-    }
-
-    public boolean isFF4() {
-        return browserDetails.isFirefox()
-                && browserDetails.getBrowserMajorVersion() == 4;
-    }
-
     /**
      * Returns the Gecko version if the browser is Gecko based. The Gecko
      * version for Firefox 2 is 1.8 and 1.9 for Firefox 3.
index 2af04cb97e87ccefc8821a59ccbc74f54a1e526d..7be01a1195b950f6c2b1e47a40db6773956fe7a1 100644 (file)
@@ -12,7 +12,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;
 import com.google.gwt.event.dom.client.BlurEvent;
 import com.google.gwt.event.dom.client.BlurHandler;
@@ -1244,22 +1243,13 @@ public class VFilterSelect extends Composite implements Paintable, Field,
     }
 
     /**
-     * Sets the text in the text box using a deferred command if on Gecko. This
-     * is required for performance reasons (see #3663).
+     * Sets the text in the text box.
      * 
      * @param text
      *            the text to set in the text box
      */
     private void setTextboxText(final String text) {
-        if (BrowserInfo.get().isFF3()) {
-            Scheduler.get().scheduleDeferred(new Command() {
-                public void execute() {
-                    tb.setText(text);
-                }
-            });
-        } else {
-            tb.setText(text);
-        }
+        tb.setText(text);
     }
 
     /*
index fbbe603ee93b0b5dc29946327ab21d8adaaae6bd..d0aebaf1de7ba7389101c96cf8dfdf85243896bb 100644 (file)
@@ -287,44 +287,15 @@ public class VTextField extends TextBoxBase implements Paintable, Field,
         setPrompting(inputPrompt != null && focusedTextField != this
                 && (text.equals("")));
 
-        if (BrowserInfo.get().isFF3()) {
-            /*
-             * Firefox 3 is really sluggish when updating input attached to dom.
-             * Some optimizations seems to work much better in Firefox3 if we
-             * update the actual content lazily when the rest of the DOM has
-             * stabilized. In tests, about ten times better performance is
-             * achieved with this optimization. See for eg. #2898
-             */
-            Scheduler.get().scheduleDeferred(new Command() {
-                public void execute() {
-                    String fieldValue;
-                    if (prompting) {
-                        fieldValue = isReadOnly() ? "" : inputPrompt;
-                        addStyleDependentName(CLASSNAME_PROMPT);
-                    } else {
-                        fieldValue = text;
-                        removeStyleDependentName(CLASSNAME_PROMPT);
-                    }
-                    /*
-                     * Avoid resetting the old value. Prevents cursor flickering
-                     * which then again happens due to this Gecko hack.
-                     */
-                    if (!getText().equals(fieldValue)) {
-                        setText(fieldValue);
-                    }
-                }
-            });
+        String fieldValue;
+        if (prompting) {
+            fieldValue = isReadOnly() ? "" : inputPrompt;
+            addStyleDependentName(CLASSNAME_PROMPT);
         } else {
-            String fieldValue;
-            if (prompting) {
-                fieldValue = isReadOnly() ? "" : inputPrompt;
-                addStyleDependentName(CLASSNAME_PROMPT);
-            } else {
-                fieldValue = text;
-                removeStyleDependentName(CLASSNAME_PROMPT);
-            }
-            setText(fieldValue);
+            fieldValue = text;
+            removeStyleDependentName(CLASSNAME_PROMPT);
         }
+        setText(fieldValue);
 
         lastTextChangeString = valueBeforeEdit = text;
     }
index 4115f30c37e44ae8965130a4a6ff85ed5e2e2742..caa9c67dd19dfabf1be54dafeeef06bb95464401 100644 (file)
@@ -15,7 +15,6 @@ import com.google.gwt.event.dom.client.FocusHandler;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.TextBox;
 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.EventId;
 import com.vaadin.terminal.gwt.client.Focusable;
@@ -367,10 +366,6 @@ public class VTextualDate extends VDateField implements Paintable, Field,
         if (fieldExtraWidth < 0) {
             text.setWidth("0");
             fieldExtraWidth = text.getOffsetWidth();
-            if (BrowserInfo.get().isFF3()) {
-                // Firefox somehow always leaves the INPUT element 2px wide
-                fieldExtraWidth -= 2;
-            }
         }
         return fieldExtraWidth;
     }
index 1ac3279aab9647f49b293aaeb7bc69178963b544..9fd93bc89d7b537cccd8dc897a4aacf0f282e4a2 100644 (file)
@@ -476,8 +476,7 @@ public class VView extends SimplePanel implements Container, ResizeHandler,
          * browser window. Constantly recalculating the layout causes the resize
          * operation to be really slow with complex layouts.
          */
-        boolean lazy = resizeLazy || BrowserInfo.get().isIE8()
-                || BrowserInfo.get().isFF3();
+        boolean lazy = resizeLazy || BrowserInfo.get().isIE8();
 
         if (lazy) {
             delayedResizeExecutor.trigger();
index a80982ea5e4998ef30b5598bfe42964e7e7c8c4a..21cd4c625d3ca5fc6ea3d9f9bb79f5ff775a2c58 100644 (file)
@@ -667,19 +667,6 @@ public class VWindow extends VOverlay implements Container,
             showModalityCurtain();
         }
         super.show();
-
-        fixFF3OverflowBug();
-    }
-
-    /** Disable overflow auto with FF3 to fix #1837. */
-    private void fixFF3OverflowBug() {
-        if (BrowserInfo.get().isFF3()) {
-            Scheduler.get().scheduleDeferred(new Command() {
-                public void execute() {
-                    DOM.setStyleAttribute(getElement(), "overflow", "");
-                }
-            });
-        }
     }
 
     @Override