scratchfoundation/scratchx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchx.git synced 2025-03-14 07:19:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reset editor when entering it unless already shown

Browse source
This commit is contained in:
Ray Schamp 2015-05-12 10:09:03 -04:00
parent 61771f51e6
commit c07409ab54
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
js/scratchx.js
View file

@ -207,11 +207,6 @@ function loadFromURLParameter(queryString) {
for (var i=0; i<vars.length; i++) {
var pair = vars[i].split("=");
if (pair.length > 1 && pair[0]=="url") {
if (!showedEditor) {
// Only try to switch to the editor once
showPage(editorId);
showedEditor = true;
}
urls.push(pair[1]);
}
}
@ -316,7 +311,7 @@ $(window).bind('hashchange', function(e) {
if (document.location.hash == '') showPage('home');
});
function showPage(path) {
function showPage(path, force) {
/*
* Show a part of the page. The site is set up like
* body
@ -342,23 +337,24 @@ function showPage(path) {
var toHide = "body > main, body > main > article";
var toShow = "#" + path;
var $toShow = $(toShow);
var showEditor = $toShow.is(Scratch.FlashApp.$ASobj);
var editorShown = parseInt(Scratch.FlashApp.$ASobj.css("top")) == 0;
if (!$toShow.length) return;
if (!$toShow.length || (!showEditor && $toShow.filter(":visible").length > 0) || (showEditor && editorShown)) return;
if (editorShown && !force) {
Scratch.FlashApp.ASobj.AScreateNewProject(["showPage", path, true]);
return;
}
$(toHide).filter(":visible").hide();
if (!$toShow.is(Scratch.FlashApp.$ASobj)) $(document.getElementById(editorId)).css({top: "-9999px"});
if (!showEditor && editorShown) $(document.getElementById(editorId)).css({top: "-9999px"});
$("body > main, body > main > article").has($toShow).show();
$toShow.show();
if ($toShow.is(Scratch.FlashApp.$ASobj)) {
$toShow.css({top: 0});
}
if (document.location.hash.substr(1) != path) {
if (path != "home") {
document.location.hash = '#' + path;
} else {
document.location.hash = '';
}
}
if (showEditor) $toShow.css({top: 0});
if (document.location.hash.substr(1) != path) document.location.hash = path;
}
@ -446,7 +442,7 @@ function initPage() {
initialPage = window.location.hash.substr(1);
}
}
showPage(initialPage);
loadFromURLParameter(window.location.search);
showPage(initialPage, true);
loadFromURLParameter(window.location.search, true);
}
$(initPage);