added special checks to make imporing text-based files into vars easier in Windows

pull/89/head
jmoenig 2018-11-28 09:27:03 +01:00
rodzic 287764bfea
commit ac2b8e7745
3 zmienionych plików z 20 dodań i 6 usunięć

Wyświetl plik

@ -1,6 +1,9 @@
# Snap<em>!</em> (BYOB) History
## in development
### 2018-11-28
* Objects: added special checks to make imporing text-based files into vars easier in Windows
### 2018-11-27
* Objects: Cache stage>>penTrailsMorph to optimize collision detection
* Objects: Fixed a collision detection errror when objects are sub-pixel sized

Wyświetl plik

@ -8,7 +8,7 @@
<script type="text/javascript" src="src/widgets.js?version=2018-10-02"></script>
<script type="text/javascript" src="src/blocks.js?version=2018-11-13"></script>
<script type="text/javascript" src="src/threads.js?version=2018-10-26"></script>
<script type="text/javascript" src="src/objects.js?version=2018-11-27"></script>
<script type="text/javascript" src="src/objects.js?version=2018-11-28"></script>
<script type="text/javascript" src="src/gui.js?version=2018-11-27"></script>
<script type="text/javascript" src="src/paint.js?version=2018-10-02"></script>
<script type="text/javascript" src="src/lists.js?version=2018-10-02"></script>

Wyświetl plik

@ -83,7 +83,7 @@ BlockEditorMorph, BlockDialogMorph, PrototypeHatBlockMorph, localize,
TableMorph, TableFrameMorph, normalizeCanvas, BooleanSlotMorph, HandleMorph,
AlignmentMorph, Process, XML_Element, VectorPaintEditorMorph*/
modules.objects = '2018-November-27';
modules.objects = '2018-November-28';
var SpriteMorph;
var StageMorph;
@ -9639,10 +9639,21 @@ WatcherMorph.prototype.userMenu = function () {
};
if (aFile.type.indexOf("text") === -1) {
txtOnlyMsg(
aFile.type,
function () {frd.readAsText(aFile); }
);
// special cases for Windows
// check the file extension for text-like-ness
if (contains(
['txt', 'csv', 'xml', 'json', 'tsv'],
aFile.name.split('.').pop().toLowerCase()
)) {
frd.readAsText(aFile);
} else {
// show a warning and an option
// letting the user load the file anyway
txtOnlyMsg(
aFile.type,
function () {frd.readAsText(aFile); }
);
}
} else {
frd.readAsText(aFile);
}