Skip to content

Commit 9638aa7

Browse files
committed
revert ae3236f as it totally breaks module upload
1 parent b619193 commit 9638aa7

File tree

2 files changed

+20
-25
lines changed

2 files changed

+20
-25
lines changed

js/plugins/project.js

+19-24
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/**
2-
Copyright 2014-2016 Juergen Marsch ([email protected]),
3-
Roman Sorokin ([email protected])
2+
Copyright 2014,2015 Juergen Marsch ([email protected])
43
54
This Source Code is subject to the terms of the Mozilla Public
65
License, v2.0. If a copy of the MPL was not distributed with this
@@ -32,31 +31,27 @@
3231
});
3332

3433
Espruino.addProcessor("getModule", function (module, callback) {
35-
var getSubEntry = function(parentDirEntry, moduleName, callback) {
36-
var reader = parentDirEntry.createReader();
37-
reader.readEntries(function(entries){
38-
var moduleNameArr = moduleName.split('/');
39-
var moduleNameHead = moduleNameArr[0];
40-
var found = false;
41-
entries.forEach(function(entry){
42-
if (moduleNameArr.length === 1 && entry.name === moduleNameHead + '.js') {
43-
found = true;
44-
readFilefromEntry(entry, function(data) {
45-
module.moduleCode = data;
46-
callback(module);
47-
});
48-
} else if (moduleNameArr.length > 1 && entry.name === moduleNameHead && entry.isDirectory) {
49-
found = true;
50-
getSubEntry(entry, moduleName.substr(moduleNameHead.length + 1), callback);
34+
getProjectSubDir("modules",getModules);
35+
var t = setTimeout(function(){callback(module);},500);
36+
function getModules(subDirEntry){
37+
var fnd = false;
38+
var dirReader = subDirEntry.createReader();
39+
dirReader.readEntries(function(results){
40+
for(var i = 0; i < results.length; i++){
41+
if(results[i].name === module.moduleName + ".js"){
42+
fnd = true;
43+
readFilefromEntry(results[i],gotModule);
44+
break;
5145
}
52-
});
53-
if (!found) callback(module);
46+
}
47+
if(!fnd){callback(module);}
5448
});
55-
5649
}
57-
getProjectSubDir("modules", function(subDirEntry) {
58-
getSubEntry(subDirEntry, module.moduleName, callback);
59-
});
50+
function gotModule(data){
51+
clearTimeout(t);
52+
module.moduleCode = data;
53+
callback(module);
54+
}
6055
});
6156
Espruino.addProcessor("transformForEspruino", function(code, callback) {
6257
findBinary(code,callback);

manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "Espruino Web IDE",
33
"short_name": "Espruino IDE",
44
"description": "A Terminal and Graphical code Editor for Espruino JavaScript Microcontrollers",
5-
"version": "0.61.0",
5+
"version": "0.61.1",
66
"app": {
77
"background": {
88
"scripts": ["js/background.js"]

0 commit comments

Comments
 (0)