scratchfoundation/scratchx
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the string sent by data-action="load-url" links

Browse source
This commit is contained in:
Ray Schamp 2015-05-08 10:09:55 -04:00
parent e261eb0cdf
commit fa65c81b39
1 changed files with 4 additions and 4 deletions

8
js/scratchx.js
View file

@ -170,8 +170,8 @@ $(document).on('click', "[data-action='load-url']", function(e) {
* <a href="?url=urlToLoad" data-action="load-url">Load this</a> * <a href="?url=urlToLoad" data-action="load-url">Load this</a>
*/ */
e.preventDefault(); e.preventDefault();
sendURLtoFlash($(this).attr("href"));
showPage(editorId); showPage(editorId);
loadFromURLParameter($(this).attr("href"));
}); });
$(document).on('submit', ".url-load-form", function(e) { $(document).on('submit', ".url-load-form", function(e) {
@ -181,13 +181,13 @@ $(document).on('submit', ".url-load-form", function(e) {
sendURLtoFlash($('input[type="text"]', this).val()); sendURLtoFlash($('input[type="text"]', this).val());
}); });
function loadFromURLParameter() { function loadFromURLParameter(queryString) {
/* /*
* Get all url=urlToLoad from the querystring and send to Flash * Get all url=urlToLoad from the querystring and send to Flash
* Use like... * Use like...
* http://scratchx.org/?url=urlToLoad1&url=urlToLoad2 * http://scratchx.org/?url=urlToLoad1&url=urlToLoad2
*/ */
var paramString = window.location.search.replace(/^\?|\/$/g, ''); var paramString = queryString.replace(/^\?|\/$/g, '');
var vars = paramString.split("&"); var vars = paramString.split("&");
var showedEditor = false; var showedEditor = false;
for (var i=0; i<vars.length; i++) { for (var i=0; i<vars.length; i++) {
@ -351,6 +351,6 @@ function initPage() {
} }
} }
showPage(initialID); showPage(initialID);
loadFromURLParameter(); loadFromURLParameter(window.location.search);
} }
$(initPage); $(initPage);