mirror
/
turtlestitch
kopia lustrzana https://github.com/backface/turtlestitch
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #1605 from brianharvey/run-flags 

Run flags
pull/29/head
Jens Mönig 2017-01-09 15:09:08 +01:00 zatwierdzone przez GitHub
rodzic 785aa4ad30 1b21d93345
commit 35cf8e7e4d
1 zmienionych plików z 25 dodań i 18 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

43
gui.js
Wyświetl plik

@ -329,6 +329,26 @@ IDE_Morph.prototype.openIn = function (world) {
*/ */
function interpretUrlAnchors() { function interpretUrlAnchors() {
var dict; var dict;
function doDictFlags() {
if (dict.editMode) {
myself.toggleAppMode(false);
} else {
myself.toggleAppMode(true);
}
if (!dict.noRun) {
myself.runScripts();
}
if (dict.hideControls) {
myself.controlBar.hide();
window.onbeforeunload = nop;
}
if (dict.noExitWarning) {
window.onbeforeunload = nop;
}
};
if (location.hash.substr(0, 6) === '#open:') { if (location.hash.substr(0, 6) === '#open:') {
hash = location.hash.substr(6); hash = location.hash.substr(6);
if (hash.charAt(0) === '%' if (hash.charAt(0) === '%'
@ -349,6 +369,8 @@ IDE_Morph.prototype.openIn = function (world) {
} }
} else if (location.hash.substr(0, 5) === '#run:') { } else if (location.hash.substr(0, 5) === '#run:') {
hash = location.hash.substr(5); hash = location.hash.substr(5);
idx = hash.indexOf("&");
if (idx > 0) {hash = hash.slice(0,idx);}
if (hash.charAt(0) === '%' if (hash.charAt(0) === '%'
|| hash.search(/\%(?:[0-9a-f]{2})/i) > -1) { || hash.search(/\%(?:[0-9a-f]{2})/i) > -1) {
hash = decodeURIComponent(hash); hash = decodeURIComponent(hash);
@ -359,7 +381,8 @@ IDE_Morph.prototype.openIn = function (world) {
this.rawOpenProjectString(getURL(hash)); this.rawOpenProjectString(getURL(hash));
} }
this.toggleAppMode(true); this.toggleAppMode(true);
this.runScripts(); dict = SnapCloud.parseDict(location.hash.substr(5));
doDictFlags();
} else if (location.hash.substr(0, 9) === '#present:') { } else if (location.hash.substr(0, 9) === '#present:') {
this.shield = new Morph(); this.shield = new Morph();
this.shield.color = this.color; this.shield.color = this.color;
@ -395,23 +418,7 @@ IDE_Morph.prototype.openIn = function (world) {
myself.shield = null; myself.shield = null;
msg.destroy(); msg.destroy();
if (dict.editMode) { doDictFlags();
myself.toggleAppMode(false);
} else {
myself.toggleAppMode(true);
}
if (!dict.noRun) {
myself.runScripts();
}
if (dict.hideControls) {
myself.controlBar.hide();
window.onbeforeunload = nop;
}
if (dict.noExitWarning) {
window.onbeforeunload = nop;
}
} }
]); ]);
}, },