From 32833ddd13a5b26b0cb375ab6d3923de9659b50b Mon Sep 17 00:00:00 2001 From: Collin T Miller Date: Sun, 10 Jun 2012 00:20:12 -0500 Subject: [PATCH 1/3] skip setup if minispade has already been setup Also added a warning if there is a console on the window. Helps prevent blowing off one's own foot and not knowing what's up. --- lib/main.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/main.js b/lib/main.js index e500dbd..78fe387 100644 --- a/lib/main.js +++ b/lib/main.js @@ -1,7 +1,15 @@ /*jshint evil:true*/ -if (typeof document !== "undefined") { +if (typeof document !== "undefined"") { (function() { + + if (typeof minispade !== "undefined") { + if (window.console && window.console.warn) { + console.warn("Minispade included multiple times. Skipping extra setup."); + return; + } + } + minispade = { root: null, modules: {}, From 3b25c0d023ecd2e4412b6f9f6e3b4363bed7faf6 Mon Sep 17 00:00:00 2001 From: Collin T Miller Date: Sun, 10 Jun 2012 00:21:59 -0500 Subject: [PATCH 2/3] removed an errant " foolishly used github www to make pull request :( --- lib/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/main.js b/lib/main.js index 78fe387..dd485e9 100644 --- a/lib/main.js +++ b/lib/main.js @@ -1,6 +1,6 @@ /*jshint evil:true*/ -if (typeof document !== "undefined"") { +if (typeof document !== "undefined") { (function() { if (typeof minispade !== "undefined") { From a7b0fcd25c9864747ef8d832dc1d26c0aa3ebbad Mon Sep 17 00:00:00 2001 From: Collin T Miller Date: Sun, 10 Jun 2012 00:28:43 -0500 Subject: [PATCH 3/3] removed some whitespace and move return statement other wise behavior depended on existence of console.warn --- lib/main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/main.js b/lib/main.js index dd485e9..e0702c6 100644 --- a/lib/main.js +++ b/lib/main.js @@ -2,14 +2,14 @@ if (typeof document !== "undefined") { (function() { - + if (typeof minispade !== "undefined") { if (window.console && window.console.warn) { console.warn("Minispade included multiple times. Skipping extra setup."); - return; } + return; } - + minispade = { root: null, modules: {},