diff options
| author | Gubolin <gubolin@fantasymail.de> | 2014-12-07 11:48:45 +0100 |
|---|---|---|
| committer | Gubolin <gubolin@fantasymail.de> | 2014-12-07 11:48:45 +0100 |
| commit | 368daaeb7d9cebf8589df30267508fcbef1d7392 (patch) | |
| tree | 519e26d99aa43f87e93877ed9c622b42fd22eb9a | |
| parent | 8338384bf572beb06ebd12a0c9af18029e99262a (diff) | |
| parent | e5eaea8d5887a12e07898b5a6aa29468a2652ae3 (diff) | |
| download | snap-368daaeb7d9cebf8589df30267508fcbef1d7392.tar.gz snap-368daaeb7d9cebf8589df30267508fcbef1d7392.zip | |
Merge branch 'issue_204' into development
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | Snapin8r | 0 | ||||
| -rw-r--r-- | gui.js | 7 | ||||
| -rwxr-xr-x | snap.html | 1 |
4 files changed, 10 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..27b70f2 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "Snapin8r"] + path = Snapin8r + url = https://github.com/Hardmath123/Snapin8r diff --git a/Snapin8r b/Snapin8r new file mode 160000 +Subproject c9cebaa147c2c53520212a221efd4061a5dcb19 @@ -1571,7 +1571,12 @@ IDE_Morph.prototype.droppedBinary = function (anArrayBuffer, name) { myself = this, suffix = name.substring(name.length - 3); - if (suffix.toLowerCase() !== 'ypr') {return; } + if (suffix.toLowerCase() !== 'ypr') { + var zip = new JSZip(anArrayBuffer); + myself.droppedText(Snapin8r(zip)); + + return; + } function loadYPR(buffer, lbl) { var reader = new sb.Reader(), @@ -18,6 +18,7 @@ <script type="text/javascript" src="locale.js"></script> <script type="text/javascript" src="cloud.js"></script> <script type="text/javascript" src="sha512.js"></script> + <script type="text/javascript" src="Snapin8r/snapin8r.min.js"></script> <script type="text/javascript"> var world; window.onload = function () { |
