diff options
| -rw-r--r-- | src/intertyper.js | 4 | ||||
| -rw-r--r-- | tools/file_packager.py | 2 | ||||
| -rw-r--r-- | tools/shared.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/intertyper.js b/src/intertyper.js index 4c35db34..96db6966 100644 --- a/src/intertyper.js +++ b/src/intertyper.js @@ -471,8 +471,8 @@ function intertyper(lines, sidePass, baseLineNums) { item.tokens[1] = item.tokens[1].tokens[0]; } var subTokens = item.tokens[1].tokens; - if (subTokens) { - subTokens.push({text:','}); + if (subTokens && subTokens.length > 0) { + subTokens.push({text:','}); // XXX we should avoid altering tokens like that while (subTokens[0]) { var stop = 1; while ([','].indexOf(subTokens[stop].text) == -1) stop ++; diff --git a/tools/file_packager.py b/tools/file_packager.py index 8efa85f4..a2349a57 100644 --- a/tools/file_packager.py +++ b/tools/file_packager.py @@ -359,7 +359,7 @@ if has_preloaded: if (that.audio) { Module['removeRunDependency']('fp ' + that.name); // workaround for chromium bug 124926 (still no audio with this, but at least we don't hang) } else { - Runtime.warn('Preloading file ' + that.name + ' failed'); + Module.printErr('Preloading file ' + that.name + ' failed'); } }, false, true); // canOwn this data in the filesystem, it is a slide into the heap that will never change this.requests[this.name] = null; diff --git a/tools/shared.py b/tools/shared.py index 755cd699..108a48a4 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -314,7 +314,7 @@ def find_temp_directory(): # we re-check sanity when the settings are changed) # We also re-check sanity and clear the cache when the version changes -EMSCRIPTEN_VERSION = '1.7.0' +EMSCRIPTEN_VERSION = '1.7.1' def generate_sanity(): return EMSCRIPTEN_VERSION + '|' + get_llvm_target() + '|' + LLVM_ROOT |