From: Leif Åstrand <leif@vaadin.com>
Date: Wed, 4 Jan 2012 08:46:28 +0000 (+0200)
Subject: Actually ignore subsequent defaults (#8226)
X-Git-Tag: 7.0.0.alpha2~541^2~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f473865edcdef5bc4a50ad559dca02d2385a9a81;p=vaadin-framework.git

Actually ignore subsequent defaults (#8226)
---

diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js
index 37cd037664..1de61917b8 100644
--- a/WebContent/VAADIN/vaadinBootstrap.js
+++ b/WebContent/VAADIN/vaadinBootstrap.js
@@ -63,6 +63,7 @@
 		setDefaults: function(d) {
 			if (defaults) {
 				log("Ignoring new defaults as defaults have already been loaded");
+				return;
 			}
 			log("Got defaults", d)
 			defaults = d;