patch $$ not being defined

Xenko · Mar 23, 2014 · fcdfce2 · fcdfce2
1 parent 29e4e65
commit fcdfce2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 15 deletions.
diff --git a/BBReload.js b/BBReload.js
@@ -1,10 +1,14 @@
 function BBLoadScript() {
-    var jA = document.createElement('script');
-			jA.setAttribute('id', 'BeachBallSource');
-            jA.setAttribute('type', 'text/javascript');
-            jA.setAttribute('src', 'https://raw.github.com/Xenko/BeachBall/beta/BeachBall.js');
 
-    setTimeout(function() {document.body.appendChild(jA);}, 1000);
+	if (typeof($$) != 'undefined') {
+		var jA = document.createElement('script');
+		jA.setAttribute('id', 'BeachBallSource');
+		jA.setAttribute('type', 'text/javascript');
+		jA.setAttribute('src', 'https://raw.github.com/Xenko/BeachBall/beta/BeachBall.js');
+
+		document.body.appendChild(jA);
+		return;
+	} else setTimeout(BBLoadScript,1000);
 }
 
 function BBDoReload() {
@@ -16,4 +20,5 @@ function BBDoReload() {
     BBLoadScript();
 }
 
+
 $('#optionsItems').append('<br> <div class="minifloatbox"> <a onclick="BBDoReload()"> <h4>Reload BeachBall</h4> </a></div>');
diff --git a/BeachBall.js b/BeachBall.js
@@ -1253,16 +1253,20 @@ function BeachBallMainProgram() {
 }
 
 BeachBall.StartLoop = function () {
-	BeachBall.Timeout = setTimeout(BeachBallMainProgram, BeachBall.Settings['RefreshRate'].setting);
+	BeachBall.Timeout = setTimeout(typeof($$) == 'undefined' ? BeachBall.StartLoop : BeachBallMainProgram, BeachBall.Settings['RefreshRate'].setting);
 }
 
-//Program Startup
-BeachBall.LoadSettings();
-BeachBall.LoadAutoclickFav();
-BeachBall.CreateMenu();
-BeachBall.SpyRefresh();
-Molpy.Notify('BeachBall version ' + BeachBall.version + ' loaded for SandCastle Builder version ' + BeachBall.SCBversion, 1);
-if (BeachBall.storage == 0) {
-	Molpy.Notify('No Local Storage Available. BeachBall settings will NOT be saved.',1);
+BeachBall.StartProgram = function() {
+	//Program Startup
+	BeachBall.LoadSettings();
+	BeachBall.LoadAutoclickFav();
+	BeachBall.CreateMenu();
+	BeachBall.SpyRefresh();
+	Molpy.Notify('BeachBall version ' + BeachBall.version + ' loaded for SandCastle Builder version ' + BeachBall.SCBversion, 1);
+	if (BeachBall.storage == 0) {
+		Molpy.Notify('No Local Storage Available. BeachBall settings will NOT be saved.',1);
+	}
+	BeachBall.StartLoop();
 }
-BeachBall.StartLoop();
+
+BeachBall.StartProgram();