removing runtime script imports

ihqs · Dec 10, 2010 · 7100bad · 7100bad
1 parent bda77a0
commit 7100bad
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 24 deletions.
diff --git a/demo.htm b/demo.htm
@@ -13,6 +13,11 @@
       font-size: 12px;
     }
   </style>
+  <script type="text/javascript" src="src/lemmings/lemmings.js"></script>
+  <script type="text/javascript" src="src/lemmings/exceptions.js"></script>
+  <script type="text/javascript" src="src/lemmings/lib.js"></script>
+  <script type="text/javascript" src="src/lemmings/master.js"></script>
+  <script type="text/javascript" src="src/lemmings/messages.js"></script>
  </head>
  <body>
   <h1>The Lemmings Theory</h1>
@@ -28,7 +33,6 @@ <h2>Elapsed time</h2>
   <h2>Logs</h2>
   <pre id="log"></pre>
 
-  <script type="text/javascript" src="src/lemmings/lemmings.js"></script>
   <script type="text/javascript" src="demos/pi/main.js"></script>
  </body>
 </html>
diff --git a/demos/pi/main.js b/demos/pi/main.js
@@ -41,9 +41,7 @@ pi.master.prototype.onResultMessage = function(data)
 	var now = new Date();
 	document.getElementById('elapsed').textContent = now.getTime() - this.date_start.getTime();
 
-
-	this.log('worker closed');
-	this.terminate();
+	this.doLog('worker closed');
 }
 
 pi.master.prototype.outputResult = function(message)

diff --git a/src/lemmings/lemmings.js b/src/lemmings/lemmings.js
@@ -6,20 +6,4 @@ lemmings = {
 	launchedLemmings: 0
 }
 
-lemmings.importScripts = function()
-{
-	for(var i = 0; i < arguments.length; i++)
-	{	
-	    var tag = document.createElement("script");
-	    with(tag)
-	    {
-	    	type = "text/javascript";
-	    	src	 = this.path + '/' + arguments[i] + '.js';
-	    }
-
-	    document.body.appendChild(tag);
-	}
-}
-
-lemmings.importScripts('exceptions', 'lib', 'messages', 'master');
 lemmings.worker = Worker;
diff --git a/src/lemmings/master.js b/src/lemmings/master.js
@@ -32,10 +32,6 @@ lemmings.master.prototype.createWorker = function()
 	{
 		var worker = new lemmings.worker(lemmings.path + '/worker.js');
 
-		if(this.workersBehaviour)
-		{
-			this.postAction(this.ACTION_ADD_BEHAVIOUR, { })
-		}
 
 		var closure = lemmings.lib.closure(this, this.onmessage);
 		worker.onmessage = closure;