From 8dc79c0fa76ad05a2dd3403f5b5a3fb7f2d3c5b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=9F=E9=85=8C=20=E9=B5=AC=E5=85=84?= <tgckpg@gmail.com>
Date: Tue, 23 Feb 2016 11:26:52 +0800
Subject: [PATCH] Prevent reloading the same class

---
 botanjs/src/System/Net/ClassLoader.js | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/botanjs/src/System/Net/ClassLoader.js b/botanjs/src/System/Net/ClassLoader.js
index 06223ae..16adf6e 100644
--- a/botanjs/src/System/Net/ClassLoader.js
+++ b/botanjs/src/System/Net/ClassLoader.js
@@ -47,21 +47,39 @@
 			if( !classes.join ) classes = [ classes ];
 
 			var excludes = BotanJS.getDef();
-			// Excludes
-			utils.objMap( excludes , function( v ) { return "-" + v; } );
 
-			var loadc = null;
 			var onLoad = function( e )
 			{
 				if( classes.indexOf( e.data.name ) < 0 ) return;
 				handler( e.data.name );
 			};
 
+			// Handle the already loaded classes
+			var needed = [];
+			for( var i in classes )
+			{
+				var c = classes[i];
+				if( excludes.indexOf( c ) == -1 )
+				{
+					needed.push( c );
+				}
+				else
+				{
+					handler( c );
+				}
+			}
+
+			if( !needed.length ) return;
+
+			// Excludes
+			utils.objMap( excludes , function( v ) { return "-" + v; } );
+			var loadc = null;
+
 			var sp = mode ? { 'o': '/', 'r': '/' }[ mode ] : ',';
 
 			loadFile(
 				sapi
-				, classes.join( sp ) + sp + excludes.join( sp )
+				, needed.join( sp ) + sp + excludes.join( sp )
 				, mode
 			);