Removed function loadFromUrl and added loadFromUrls (gnab#573)

Author: kbens

src/remark/models/slideshow.js

@@ -22,7 +22,7 @@ function Slideshow (events, dom, options, callback) {
   Navigation.call(self, events);
 
   self.loadFromString = loadFromString;
-  self.loadFromUrl = loadFromUrl;
+  self.loadFromUrls = loadFromUrls;
   self.update = update;
   self.getLinks = getLinks;
   self.getSlides = getSlides;
@@ -61,7 +61,10 @@ function Slideshow (events, dom, options, callback) {
   });
 
   if (options.sourceUrl) {
-    loadFromUrl(options.sourceUrl, callback);
+    loadFromUrls([ options.sourceUrl ], callback);
+  }
+  else if (options.sourceUrls){
+    loadFromUrls(options.sourceUrls, callback);
   }
   else {
     loadFromString(options.source);
@@ -88,27 +91,57 @@ function Slideshow (events, dom, options, callback) {
     events.emit('slidesChanged');
   }
 
-  function loadFromUrl (url, callback) {
-    var xhr = new dom.XMLHttpRequest();
-    xhr.open('GET', options.sourceUrl, true);
-    xhr.onload = function (e) {
-      if (xhr.readyState === 4) {
-        if (xhr.status === 200) {
-          options.source = xhr.responseText.replace(/\r\n/g, '\n');
-          loadFromString(options.source);
-          if (typeof callback === 'function') {
-            callback(self);
-          }
+  function loadFromUrls(urls, callback) {
+
+    function xhrOnload(e) {
+      if (this.readyState === 4) {
+        if (this.status === 200) {
+          options.sources[this.index] = this.responseText.replace(/\r\n/g, '\n') ;
+          options.loadingCompleted++;
+          if(options.loadingCompleted === urls.length)
+            xhrLoadSlides();
         } else {
-          throw Error(xhr.statusText);
+          throw Error(this.statusText);
         }
       }
-    };
-    xhr.onerror = function (e) {
-      throw Error(xhr.statusText);
-    };
-    xhr.send(null);
-    return xhr;
+    }
+
+    function xhrOnerror(e) {
+      options.loadingCompleted++;
+      throw Error(this.statusText);
+    }
+
+    function xhrLoadSlides() {
+      for (var j = 0; j < urls.length; j++) {        
+        if (j === 0) {
+          options.source = options.sources[j];
+        } 
+        else {
+          options.source += '\n---\n' + options.sources[j];
+        }
+      }
+
+      loadFromString(options.source);
+      if (typeof callback === 'function') {
+        callback(self);
+      }
+    }
+
+    var xhrs = [];
+    options.loadingCompleted = 0;
+    options.sources = [];
+
+    for (var i =0 ; i < urls.length; i++) {
+      var url = urls[i];
+      xhrs[i] = new dom.XMLHttpRequest();
+      xhrs[i].index = i;
+      xhrs[i].open('GET', url, true);
+      xhrs[i].onload = xhrOnload;
+      xhrs[i].onerror = xhrOnerror;
+      xhrs[i].send(null);
+    }
+
+    return xhrs;
   }
 
   function update () {