import java.util.ArrayList;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.dom.client.HeadElement;
import com.google.gwt.dom.client.LinkElement;
import com.google.gwt.dom.client.NativeEvent;
-import com.google.gwt.dom.client.NodeList;
import com.google.gwt.dom.client.Style;
import com.google.gwt.dom.client.Style.Position;
import com.google.gwt.dom.client.StyleInjector;
import com.vaadin.client.ui.VUI;
import com.vaadin.client.ui.layout.MayScrollChildren;
import com.vaadin.client.ui.window.WindowConnector;
-import com.vaadin.server.Page.StyleSheet;
+import com.vaadin.server.Page.Styles;
import com.vaadin.shared.MouseEventDetails;
import com.vaadin.shared.ui.ComponentStateUtil;
import com.vaadin.shared.ui.Connect;
}
/**
- * Reads CSS strings and resources injected by {@link StyleSheet#inject}
+ * Reads CSS strings and resources injected by {@link Styles#inject}
* from the UIDL stream.
*
* @param uidl
/*
* Search the UIDL stream for CSS resources and strings to be injected.
*/
- final List<String> resourcesToInject = new LinkedList<String>();
- final StringBuilder cssToInject = new StringBuilder();
for (Iterator<?> it = uidl.getChildIterator(); it.hasNext();) {
UIDL cssInjectionsUidl = (UIDL) it.next();
String url = getWidget().connection
.translateVaadinUri(cssInjectionsUidl
.getStringAttribute("url"));
-
- // Check if url already has been injected
- boolean injected = false;
- NodeList<com.google.gwt.dom.client.Element> links = head
- .getElementsByTagName(LinkElement.TAG);
- for (int i = 0; i < links.getLength(); i++) {
- LinkElement link = LinkElement.as(links.getItem(i));
- if (link.getHref().equals(url)) {
- injected = true;
- break;
- }
- }
-
- if (!injected) {
- // Ensure duplicates do not get injected
- resourcesToInject.add(url);
- }
+ LinkElement link = LinkElement.as(DOM
+ .createElement(LinkElement.TAG));
+ link.setRel("stylesheet");
+ link.setHref(url);
+ link.setType("text/css");
+ head.appendChild(link);
// Check if we have CSS string to inject
} else if (cssInjectionsUidl.getTag().equals("css-string")) {
for (Iterator<?> it2 = cssInjectionsUidl.getChildIterator(); it2
.hasNext();) {
- cssToInject.append((String) it2.next());
+ StyleInjector.injectAtEnd((String) it2.next());
+ StyleInjector.flush();
}
}
}
-
- /*
- * Inject resources as deferred to ensure other Vaadin resources that
- * are located before in the DOM get applied first so the injected ones
- * can override them.
- */
- if (!resourcesToInject.isEmpty()) {
- Scheduler.get().scheduleDeferred(new ScheduledCommand() {
-
- @Override
- public void execute() {
- for (String url : resourcesToInject) {
- LinkElement link = LinkElement.as(DOM
- .createElement(LinkElement.TAG));
- link.setRel("stylesheet");
- link.setHref(url);
- link.setType("text/css");
- head.appendChild(link);
- }
- }
- });
- }
-
- /*
- * Inject the string CSS injections as a combined style tag. Not
- * injected as deferred since StyleInjector will do it for us.
- */
- if (cssToInject.length() > 0) {
- StyleInjector.injectAtEnd(cssToInject.toString());
- }
}
public void init(String rootPanelId,
import java.net.URI;
import java.net.URISyntaxException;
import java.util.EventObject;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import com.vaadin.event.EventRouter;
import com.vaadin.shared.ui.BorderStyle;
*
* @since 7.1
*/
- public static class StyleSheet implements Serializable {
+ public static class Styles implements Serializable {
- /*
- * Points to last injected string injection
- */
- private int injectedStringPointer;
+ private final Map<Integer, String> stringInjections = new HashMap<Integer, String>();
- private final List<String> stringInjections = new LinkedList<String>();
+ private final Map<Integer, Resource> resourceInjections = new HashMap<Integer, Resource>();
- /*
- * Points to last injected resource injection
- */
- private int injectedResourcesPointer;
+ // The combined injection counter between both string and resource
+ // injections. Used as the key for the injection maps
+ private int injectionCounter = 0;
- private final List<Resource> resourceInjections = new LinkedList<Resource>();
+ // Points to the next injection that has not yet been made into the Page
+ private int nextInjectionPosition = 0;
private final UI ui;
- private StyleSheet(UI ui) {
+ private Styles(UI ui) {
this.ui = ui;
}
* @param css
* The CSS to inject
*/
- public void inject(String css) {
+ public void add(String css) {
if (css == null) {
throw new IllegalArgumentException(
"Cannot inject null CSS string");
}
- /*
- * Check if last injection was the same, in that case ignore it.
- */
- if (!stringInjections.isEmpty() && injectedStringPointer > 0) {
- String lastInjection = stringInjections
- .get(injectedStringPointer - 1);
- if (lastInjection.equals(css.trim())) {
- return;
- }
- }
-
- stringInjections.add(css.trim());
+ stringInjections.put(injectionCounter++, css);
ui.markAsDirty();
}
* @param resource
* The resource to inject.
*/
- public void inject(Resource resource) {
+ public void add(Resource resource) {
if (resource == null) {
throw new IllegalArgumentException(
"Cannot inject null resource");
}
- resourceInjections.add(resource);
+ resourceInjections.put(injectionCounter++, resource);
ui.markAsDirty();
}
// If full repaint repaint all injections
if (target.isFullRepaint()) {
- injectedStringPointer = 0;
- injectedResourcesPointer = 0;
+ nextInjectionPosition = 0;
}
- target.startTag("css-injections");
+ if (injectionCounter > nextInjectionPosition) {
- // Paint pending string injections
- List<String> injections = stringInjections.subList(
- injectedStringPointer, stringInjections.size());
+ target.startTag("css-injections");
- for (String css : injections) {
- target.startTag("css-string");
- target.addText(css);
- target.endTag("css-string");
- }
+ while (injectionCounter > nextInjectionPosition) {
- injectedStringPointer = stringInjections.size();
+ String stringInjection = stringInjections
+ .get(nextInjectionPosition);
+ if (stringInjection != null) {
+ target.startTag("css-string");
+ target.addAttribute("id", nextInjectionPosition);
+ target.addText(stringInjection);
+ target.endTag("css-string");
+ }
- // Paint pending resource injections
- List<Resource> resInjections = resourceInjections.subList(
- injectedResourcesPointer, resourceInjections.size());
+ Resource resourceInjection = resourceInjections
+ .get(nextInjectionPosition);
+ if (resourceInjection != null) {
+ target.startTag("css-resource");
+ target.addAttribute("id", nextInjectionPosition);
+ target.addAttribute("url", resourceInjection);
+ target.endTag("css-resource");
+ }
- for (Resource res : resInjections) {
- target.startTag("css-resource");
- target.addAttribute("url", res);
- target.endTag("css-resource");
- }
-
- target.endTag("css-injections");
+ nextInjectionPosition++;
+ }
- injectedResourcesPointer = resourceInjections.size();
+ target.endTag("css-injections");
+ }
}
}
private JavaScript javaScript;
- private StyleSheet styleSheet;
+ private Styles styles;
/**
* The current browser location.
*
* @since 7.1
*/
- public StyleSheet getStyleSheet() {
- if (styleSheet == null) {
- styleSheet = new StyleSheet(uI);
+ public Styles getStyles() {
+
+ if (styles == null) {
+ styles = new Styles(uI);
}
- return styleSheet;
+ return styles;
}
public void paintContent(PaintTarget target) throws PaintException {
location.toString());
}
- if (styleSheet != null) {
- styleSheet.paint(target);
+ if (styles != null) {
+ styles.paint(target);
}
}
import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.Page;
-import com.vaadin.server.Page.StyleSheet;
+import com.vaadin.server.Page.Styles;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.MarginInfo;
import com.vaadin.shared.ui.colorpicker.Color;
Color color = event.getColor();
// Get the stylesheet of the page
- StyleSheet styles = Page.getCurrent().getStyleSheet();
+ Styles styles = Page.getCurrent().getStyles();
// inject the new background color
- styles.inject(".v-app .v-textarea.text-label { background-color:"
+ styles.add(".v-app .v-textarea.text-label { background-color:"
+ color.getCSS() + "; }");
}
});
Color color = event.getColor();
// Get the stylesheet of the page
- StyleSheet styles = Page.getCurrent().getStyleSheet();
+ Styles styles = Page.getCurrent().getStyles();
// inject the new color as a style
- styles.inject(".v-app .v-textarea.text-label { color:"
+ styles.add(".v-app .v-textarea.text-label { color:"
+ color.getCSS() + "; }");
}
});
String fontFamily = select.getValue().toString();
// Get the stylesheet of the page
- StyleSheet styles = Page.getCurrent().getStyleSheet();
+ Styles styles = Page.getCurrent().getStyles();
// inject the new font size as a style. We need .v-app to
// override Vaadin's default styles here
- styles.inject(".v-app .v-textarea.text-label { font-family:"
+ styles.add(".v-app .v-textarea.text-label { font-family:"
+ fontFamily + "; }");
}
});
Integer fontSize = (Integer) select.getValue();
// Get the stylesheet of the page
- StyleSheet styles = Page.getCurrent().getStyleSheet();
+ Styles styles = Page.getCurrent().getStyles();
// inject the new font size as a style. We need .v-app to
// override Vaadin's default styles here
- styles.inject(".v-app .v-textarea.text-label { font-size:"
+ styles.add(".v-app .v-textarea.text-label { font-size:"
+ String.valueOf(fontSize) + "px; }");
}
});
import java.util.UUID;
import com.vaadin.server.Page;
-import com.vaadin.server.Page.StyleSheet;
+import com.vaadin.server.Page.Styles;
import com.vaadin.server.StreamResource;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.tests.components.TestBase;
@Override
protected void setup() {
- final StyleSheet stylesheet = Page.getCurrent().getStyleSheet();
+ final Styles stylesheet = Page.getCurrent().getStyles();
// Inject some resources initially
- stylesheet.inject(new StreamResource(new StreamResource.StreamSource() {
+ stylesheet.add(new StreamResource(new StreamResource.StreamSource() {
@Override
public InputStream getStream() {
@Override
public void buttonClick(ClickEvent event) {
- stylesheet.inject(cssToInject.getValue());
+ stylesheet.add(cssToInject.getValue());
cssToInject.setValue("");
}
});
final String css = cssToInject.getValue();
- stylesheet.inject(new StreamResource(
+ stylesheet.add(new StreamResource(
new StreamResource.StreamSource() {
@Override
projects / vaadin-framework.git / commitdiff