load sync (update to 0.0.4)

README.md

@@ -46,8 +46,8 @@ loads as non-blocking too, however Nautilus.js doesn't care if it's an anonymous
 <script>
 	nautilus.config({
 		paths: {
-			'jquery': 'libs/jquery',
-			'jquery.nanoscroller': 'libs/jquery-nanoscroller',
+			'jquery': 'libs/jquery.js',
+			'jquery.nanoscroller': 'libs/jquery-nanoscroller.js',
 			'waterfall': 'http://cdnjs.cloudflare.com/ajax/libs/waterfall.js/1.0.2/waterfall.min.js'
 		}
 	});
@@ -86,7 +86,7 @@ To define specified paths, you must use the config method:
 ```js
 nautilus.config({
     paths: {
-        'jquery': 'libs/jquery',
+        'jquery': 'libs/jquery.js',
         'waterfall': 'http://cdnjs.cloudflare.com/ajax/libs/waterfall.js/1.0.2/waterfall.min.js'
     }
 });

nautilus.js

@@ -57,7 +57,7 @@ var queue = {
 function loadScript(path, currentQueue) {
 	var scr = document.createElement('script');
 
-	scr.type = "text/javascript";
+	scr.type = 'text/javascript';
 	scr.onload = handleLoad;
 	scr.async = true;
 	scr.onreadystatechange = handleReadyStateChange;
@@ -70,7 +70,7 @@ function loadScript(path, currentQueue) {
 	}
 
 	function handleReadyStateChange() {
-		if (scr.readyState === "complete") {
+		if (scr.readyState === 'complete') {
 			handleLoad();
 		}
 	}
@@ -83,12 +83,16 @@ function loadScript(path, currentQueue) {
 	}
 }
 
-function fetch(paths, fn) {
+function fetch(paths, depsOrFn, fn) {
 	if (typeof(paths) === 'string') {
 		paths = [paths];
 	}
 
-	var q = queue.push(paths.length, fn);
+	if (Object.prototype.toString.call(depsOrFn) === '[object Array]') {
+		depsOrFn = fetch.bind(this, depsOrFn, fn);
+	}
+
+	var q = queue.push(paths.length, depsOrFn);
 	for (var i = 0; i < paths.length; i++) {
 		var path = paths[i];
 		loadScript(uPaths[path] || path, q);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nautilusjs",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Async JavaScript loader & dependency manager",
   "main": "nautilus.js",
   "scripts": {

src/main.js

@@ -1,7 +1,7 @@
 function loadScript(path, currentQueue) {
 	var scr = document.createElement('script');
 
-	scr.type = "text/javascript";
+	scr.type = 'text/javascript';
 	scr.onload = handleLoad;
 	scr.async = true;
 	scr.onreadystatechange = handleReadyStateChange;
@@ -14,7 +14,7 @@ function loadScript(path, currentQueue) {
 	}
 
 	function handleReadyStateChange() {
-		if (scr.readyState === "complete") {
+		if (scr.readyState === 'complete') {
 			handleLoad();
 		}
 	}
@@ -27,12 +27,16 @@ function loadScript(path, currentQueue) {
 	}
 }
 
-function fetch(paths, fn) {
+function fetch(paths, depsOrFn, fn) {
 	if (typeof(paths) === 'string') {
 		paths = [paths];
 	}
 
-	var q = queue.push(paths.length, fn);
+	if (Object.prototype.toString.call(depsOrFn) === '[object Array]') {
+		depsOrFn = fetch.bind(this, depsOrFn, fn);
+	}
+
+	var q = queue.push(paths.length, depsOrFn);
 	for (var i = 0; i < paths.length; i++) {
 		var path = paths[i];
 		loadScript(uPaths[path] || path, q);

test/test-fetch.js

@@ -43,4 +43,18 @@ describe('Fetch', function() {
             });
         });
     });
+    describe('synchronous queue load', function() {
+        context('testing one synchronous request in order', function() {
+            it('should execute callback on success and the scripts on head end', function(done) {
+                window.dep0 = undefined;
+                window.dep1 = undefined;
+                expect(window.dep0).to.be.equal(undefined);
+                nautilus(['fixtures/dep0.js'], ['fixtures/subdep0.js'], function() {
+                    expect(window.dep0).to.be.equal("dep0");
+                    expect(window.subdep0).to.be.equal("dep0");
+                    done();
+                });
+            });
+        });
+    });
 });