Reverted #7036 patch, will write a better one

svn changeset:24026/svn branch:6.8

diff --git a/WebContent/VAADIN/themes/base/textfield/richtext.css b/WebContent/VAADIN/themes/base/textfield/richtext.css
index 98726756f56d8954f25d495e58d0c69f704dd82f..a304fa2a57e4c6c64b9d8d852f513f832eaa12c9 100644 (file)
--- a/WebContent/VAADIN/themes/base/textfield/richtext.css
+++ b/WebContent/VAADIN/themes/base/textfield/richtext.css
@@ -1,19 +1,12 @@
 .v-richtextarea {
        border: 1px solid #aaa;
+       overflow: hidden;
 }
 .v-richtextarea .gwt-RichTextArea {
        background: #fff;
        border: none;
 }
 
-/* IE6 needs a hack to render the editor with a correct height */ 
-.v-ie6 .v-richtextarea {
-       overflow: hidden;
-}
-.v-ie6 .v-scrollable {
-       overflow: auto;
-}
-
 .v-richtextarea .gwt-RichTextToolbar {
        white-space: nowrap;
        background: #959595 url(img/richtext-toolbar-bg.png) repeat-x 0 -42px;

diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java
index 54a8ff6ad6a9d2489bc79dc378582634d2e23e1d..bf0a4234743f9043f4f49b55e8bb3cd902e2573e 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java
@@ -34,8 +34,6 @@ import com.vaadin.terminal.gwt.client.ui.Field;
 import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler;
 import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutActionListener;
 import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
-import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate;
-import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate.TouchScrollHandler;
 
 /**
  * This class implements a basic client side rich text editor component.
@@ -83,8 +81,6 @@ public class VRichTextArea extends Composite implements Paintable, Field,
 
     private boolean readOnly = false;
 
-    private TouchScrollHandler touchScrollHandler = null;
-
     public VRichTextArea() {
         createRTAComponents();
         fp.add(formatter);
@@ -92,6 +88,7 @@ public class VRichTextArea extends Composite implements Paintable, Field,
 
         initWidget(fp);
         setStyleName(CLASSNAME);
+
     }
 
     private void createRTAComponents() {
@@ -123,18 +120,10 @@ public class VRichTextArea extends Composite implements Paintable, Field,
             }
             rta.setHTML(currentValue);
             fp.add(rta);
-            if (touchScrollHandler != null) {
-                touchScrollHandler.removeElement(fp.getElement());
-            }
         } else {
             html.setHTML(currentValue);
             fp.remove(rta);
             fp.add(html);
-            if (touchScrollHandler == null) {
-                touchScrollHandler = TouchScrollDelegate
-                        .enableTouchScrolling(this);
-            }
-            touchScrollHandler.addElement(fp.getElement());
         }
     }