summaryrefslogtreecommitdiffstats
path: root/WebContent
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-08-31 12:02:51 +0300
committerLeif Åstrand <leif@vaadin.com>2012-08-31 19:00:00 +0300
commit8679f49c5e036d39d34a9fca8a907c4d19df21c9 (patch)
tree9979d5cf330043523e7d68221133bbcd5b3300f5 /WebContent
parentcf9ab5aea84d2be1686c5f46edd9522cd0750baf (diff)
downloadvaadin-framework-8679f49c5e036d39d34a9fca8a907c4d19df21c9.tar.gz
vaadin-framework-8679f49c5e036d39d34a9fca8a907c4d19df21c9.zip
Refactor UI bootstrap (#9443)
Diffstat (limited to 'WebContent')
-rw-r--r--WebContent/VAADIN/vaadinBootstrap.js8
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) {