Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature - load multiple sources #573

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Feature - load multiple sources #573

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26b7d10
feat() : add sourceUrls options
valvin1 Jun 8, 2019
ba7123d
fix(): linter issue
valvin1 Jun 8, 2019
327acf3
fix(): load slides when upload finished without tricks
valvin1 Jun 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 53 additions & 0 deletions src/remark/models/slideshow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ function Slideshow (events, dom, options, callback) {
if (options.sourceUrl) {
loadFromUrl(options.sourceUrl, callback);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactor loadFromUrls and use it here -- (that way we can remove the loadFromUrl function and only have one.

}
else if (options.sourceUrls){
loadFromUrls(options.sourceUrls, callback);
}
else {
loadFromString(options.source);
if (typeof callback === 'function') {
Expand Down Expand Up @@ -111,6 +114,56 @@ function Slideshow (events, dom, options, callback) {
return xhr;
}

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(this.statusText);
}
}
}

function xhrOnerror(e) {
options.loadingCompleted++;
throw Error(this.statusText);
}

function xhrLoadSlides() {
for (var j = 0; j < urls.length; j++) {
if (j !== 0)
options.source += '---\n';
options.source += 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);
}

}

function update () {
events.emit('resize');
}
Expand Down