From: Leif Åstrand <leif@vaadin.com>
Date: Wed, 4 Jan 2012 08:42:23 +0000 (+0200)
Subject: #8226 Don't throw exception when defaults are already defined
X-Git-Tag: 7.0.0.alpha2~541^2~11
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bfd26a62cf895585a81e6ff14e5e8ba6c8b1e29f;p=vaadin-framework.git

#8226 Don't throw exception when defaults are already defined
---

diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js
index 6adcb86c99..37cd037664 100644
--- a/WebContent/VAADIN/vaadinBootstrap.js
+++ b/WebContent/VAADIN/vaadinBootstrap.js
@@ -62,7 +62,7 @@
 	window.vaadin = window.vaadin || {
 		setDefaults: function(d) {
 			if (defaults) {
-				throw "Defaults already defined";
+				log("Ignoring new defaults as defaults have already been loaded");
 			}
 			log("Got defaults", d)
 			defaults = d;