Merge commit '36a3b0af4a4409d7773063e9d55195a6d4ef3755' into jitopt3

Conflicts:
	midp/midp.js
This commit is contained in:
Michael Bebenita 2015-01-29 10:49:45 -08:00
Родитель 4e6bc9c462 36a3b0af4a
Коммит 85188342bc
9 изменённых файлов: 13 добавлений и 10 удалений

Просмотреть файл

@ -176,7 +176,7 @@ var fs = (function() {
if (DEBUG_FS) { console.log("getAll initiated"); }
var objectStore = transaction.objectStore(Store.DBSTORENAME);
var then = performance.now();
objectStore.mozGetAll().onsuccess = (function(event) {
objectStore.getAll().onsuccess = (function(event) {
var records = event.target.result;
for (var i = 0; i < records.length; ++i) {
this.map.set(records[i].pathname, records[i]);

Просмотреть файл

@ -21,6 +21,7 @@
<script type="text/javascript" src="libs/promise-6.0.0.js" defer></script>
<script type="text/javascript" src="polyfill/fromcodepoint.js" defer></script>
<script type="text/javascript" src="polyfill/codepointat.js" defer></script>
<script type="text/javascript" src="polyfill/IndexedDB-getAll-shim.js" defer></script>
<script type="text/javascript" src="legacy.js" defer></script>
<script type="text/javascript" src="blackBox.js" defer></script>
<script type="text/javascript" src="timer.js" defer></script>
@ -32,7 +33,6 @@
<script type="text/javascript" src="native.js" defer></script>
<script type="text/javascript" src="string.js" defer></script>
<script type="text/javascript" src="instrument.js" defer></script>
<script type="text/javascript" src="libs/IndexedDB-getAll-shim.js" defer></script>
<script type="text/javascript" src="libs/compiled-method-cache.js" defer></script>
<script type="text/javascript" src="libs/load.js" defer></script>
<script type="text/javascript" src="libs/zipfile.js" defer></script>

Просмотреть файл

@ -168,11 +168,6 @@ function toggle(button) {
var bigBang = 0;
function start() {
if (MIDP.manifest["MIDlet-Version"] && MIDP.manifest["MIDlet-Version"] !== localStorage.getItem("lastMidletVersion")) {
CompiledMethodCache.clear().catch(console.error.bind(console));
localStorage.setItem("lastMidletVersion", MIDP.manifest["MIDlet-Version"]);
}
J2ME.Context.setWriters(new J2ME.IndentingWriter());
CLASSES.initializeBuiltinClasses();
profiler && profiler.start(2000, false);

Просмотреть файл

@ -1295,3 +1295,5 @@ Native["com/sun/amms/directcontrol/DirectVolumeControl.nGetLevel.()I"] = functio
console.warn("com/sun/amms/directcontrol/DirectVolumeControl.nGetLevel.()I not implemented.");
return 100;
};
addUnimplementedNative("com/sun/amms/directcontrol/DirectVolumeControl.nIsMuted.()Z", 0);

Просмотреть файл

@ -862,9 +862,12 @@ Native["com/sun/cldc/isolate/Isolate.stop.(II)V"] = function(code, reason) {
fs.remove("/midlet.jar");
fs.create("/midlet.jar", new Blob([ data.jarData ]));
new Promise(function(resolve, reject) {
fs.syncStore(resolve);
}).then(function() {
Promise.all([
new Promise(function(resolve, reject) {
fs.syncStore(resolve);
}),
CompiledMethodCache.clear(),
]).then(function() {
MIDP.pendingMIDletUpdate = null;
DumbPipe.close(DumbPipe.open("alert", "Update completed!"));
DumbPipe.close(DumbPipe.open("reload", {}));

Просмотреть файл

Просмотреть файл

@ -4,6 +4,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="initial-scale=1.0">
<script type="text/javascript" src="../../polyfill/IndexedDB-getAll-shim.js" defer></script>
<script type="text/javascript" src="../../libs/fs.js" defer></script>
<script type="text/javascript" src="../../libs/promise-6.0.0.js" defer></script>
<script type="text/javascript" src="../../timer.js" defer></script>

Просмотреть файл

@ -4,6 +4,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="initial-scale=1.0">
<script type="text/javascript" src="../../polyfill/IndexedDB-getAll-shim.js" defer></script>
<script type="text/javascript" src="../../libs/fs.js" defer></script>
<script type="text/javascript" src="../../libs/promise-6.0.0.js" defer></script>
<script type="text/javascript" src="../../timer.js" defer></script>

Просмотреть файл

@ -3,6 +3,7 @@
<head>
<meta charset="UTF-8">
<script type="text/javascript" src="../../polyfill/IndexedDB-getAll-shim.js" defer></script>
<script type="text/javascript" src="../../libs/promise-6.0.0.js" defer></script>
<script type="text/javascript" src="../../timer.js" defer></script>
<script type="text/javascript" src="../../libs/fs.js" defer></script>