audio files now seem to load immediately

3 files changed, 6 insertions, 7 deletions

diff --git a/js/.#karma.js b/js/.#karma.js
deleted file mode 120000
index fb5da0d..0000000
--- a/js/.#karma.js
+++ /dev/null
@@ -1 +0,0 @@
-hitman@hitman.7230:1258577457
\ No newline at end of file
diff --git a/js/karma.js b/js/karma.js
index 3500e6c..4ac63cf 100755
--- a/js/karma.js
+++ b/js/karma.js
@@ -316,13 +316,15 @@ Karma.kMedia = {
 	}
 
 	//IMPORTANT: This one magic line loads the file
-	this.media.src = this.src = this.path + this.file;
-	if (this._type === "sound"){
-	    this.media.load();
-	}
+		this.media.src = this.src = this.path + this.file;
 	
 	//add event handlers
 	this.addEventHandlers();
+
+	if (this._type === "sound"){
+	    this.media.load();
+	}
+
 	
 	return this;
     },
@@ -332,7 +334,6 @@ Karma.kMedia = {
 	    "load", 
 	    function (e) { 
 		Karma.karma._counters.loaded++;
-		console.l
 		Karma.karma.updateStatus();
 		that.status = "loaded";}, false);
 	that.media.addEventListener(
diff --git a/tests/js/tests.js b/tests/js/tests.js
index 9307384..9b9c678 100755
--- a/tests/js/tests.js
+++ b/tests/js/tests.js
@@ -624,7 +624,6 @@
 			     "Counter of errors hasn't changed");
 			     ok(k._counters.total === 3, 
 			     "Counter of total assets properly incremented");
-			     k.reset();
 			     start();
 		     }, 100);
 	     });