diff options
| author | John Ahlroos <john@vaadin.com> | 2012-09-03 11:41:06 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2012-09-03 11:41:06 +0300 |
| commit | 971b0684482dd3b7eb4efac09b9c24e1ea2b305d (patch) | |
| tree | 6d6a4be640837500cfaa2f805a8602a9f4803871 /WebContent | |
| parent | 340cd7899812b444941584d383d930fe8155159b (diff) | |
| parent | f85c152a48686a8a0dca38ca12b4f3509cac056f (diff) | |
| download | vaadin-framework-971b0684482dd3b7eb4efac09b9c24e1ea2b305d.tar.gz vaadin-framework-971b0684482dd3b7eb4efac09b9c24e1ea2b305d.zip | |
Merge branch 'master' into layoutgraph
Conflicts:
shared/src/com/vaadin/shared/ComponentState.java
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/vaadinBootstrap.js | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js index 1f5f3fa973..36cf2ec8eb 100644 --- a/WebContent/VAADIN/vaadinBootstrap.js +++ b/WebContent/VAADIN/vaadinBootstrap.js @@ -153,15 +153,11 @@ var bootstrapApp = function(mayDefer) { var themeUri = getConfig('themeUri'); - if (themeUri) { - loadTheme(themeUri); - } + loadTheme(themeUri); var widgetsetBase = getConfig('widgetsetBase'); var widgetset = getConfig('widgetset'); - if (widgetset && widgetsetBase) { - loadWidgetset(widgetsetBase, widgetset); - } + loadWidgetset(widgetsetBase, widgetset); if (getConfig('uidl') === undefined) { if (mayDefer) { |