aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Dahlström <johannes.dahlstrom@vaadin.com>2012-07-26 08:51:23 +0000
committerJohannes Dahlström <johannes.dahlstrom@vaadin.com>2012-07-26 08:51:23 +0000
commit07ec6a6db41fb5059b1c2ad556de8b7b59f08b10 (patch)
tree2797c5d1f5d9665a8403559a5d389656225b6354
parentb0004167abaa8874f94556da83cb6d0aa0b5e3e6 (diff)
downloadvaadin-framework-07ec6a6db41fb5059b1c2ad556de8b7b59f08b10.tar.gz
vaadin-framework-07ec6a6db41fb5059b1c2ad556de8b7b59f08b10.zip
Reverted #7036 patch, will write a better one
svn changeset:24026/svn branch:6.8
-rw-r--r--WebContent/VAADIN/themes/base/textfield/richtext.css9
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java13
2 files changed, 2 insertions, 20 deletions
diff --git a/WebContent/VAADIN/themes/base/textfield/richtext.css b/WebContent/VAADIN/themes/base/textfield/richtext.css
index 98726756f5..a304fa2a57 100644
--- 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 54a8ff6ad6..bf0a423474 100644
--- 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());
}
}