diff --git a/_docs/api.md b/_docs/api.md index 8513751f..b4723ae5 100644 --- a/_docs/api.md +++ b/_docs/api.md @@ -56,7 +56,6 @@ core.platform core.platform.isPC (是否是电脑端) core.platform.isAndroid (是否是安卓端) core.platform.isIOS (是否是iOS端) -core.platform.useLocalForage (是否开启了新版存档) core.domStyle diff --git a/_server/CodeMirror/defs.js b/_server/CodeMirror/defs.js index 0f4a426c..1a5f1c57 100644 --- a/_server/CodeMirror/defs.js +++ b/_server/CodeMirror/defs.js @@ -1824,7 +1824,6 @@ var terndefs_f6783a0a_522d_417e_8407_94c67b692e50 = [ "isPC": "bool", "isAndroid": "bool", "isIOS": "bool", - "useLocalForage": "bool" }, "domStyle": { "!doc": "界面样式", diff --git a/libs/actions.js b/libs/actions.js index b8762467..31f66487 100644 --- a/libs/actions.js +++ b/libs/actions.js @@ -2817,14 +2817,8 @@ actions.prototype._clickStorageRemove_all = function () { core.removeLocalStorage('saveIndex'); core.drawText("\t[操作成功]你的所有存档已被清空。"); }; - if (core.platform.useLocalForage) { - core.ui.drawWaiting("正在清空,请稍候..."); - localforage.clear(done); - } - else { - localStorage.clear(); - done(); - } + core.ui.drawWaiting("正在清空,请稍候..."); + localforage.clear(done); }); } @@ -2843,20 +2837,11 @@ actions.prototype._clickStorageRemove_current = function () { core.removeLocalStorage('saveIndex'); core.drawText("\t[操作成功]当前塔的存档已被清空。"); } - if (core.platform.useLocalForage) { - core.ui.drawWaiting("正在清空,请稍候..."); - Object.keys(core.saves.ids).forEach(function (v) { - core.removeLocalForage("save" + v); - }); - core.removeLocalForage("autoSave", done); - } - else { - Object.keys(core.saves.ids).forEach(function (v) { - core.removeLocalStorage("save" + v); - }); - core.removeLocalStorage("autoSave"); - done(); - } + core.ui.drawWaiting("正在清空,请稍候..."); + Object.keys(core.saves.ids).forEach(function (v) { + core.removeLocalForage("save" + v); + }); + core.removeLocalForage("autoSave", done); }); } diff --git a/libs/control.js b/libs/control.js index c3460ad0..dc58a8e1 100644 --- a/libs/control.js +++ b/libs/control.js @@ -1989,12 +1989,7 @@ control.prototype._doSL_save = function (id) { core.drawTip('存档成功!'); }, function(err) { main.log(err); - if (core.platform.useLocalForage) { - alert("存档失败,错误信息:\n"+err); - } - else { - alert("存档失败,错误信息:\n"+err+"\n建议使用垃圾存档清理工具进行清理!"); - } + alert("存档失败,错误信息:\n"+err); }); core.removeFlag("__events__"); return; @@ -2290,19 +2285,16 @@ control.prototype.getAllSaves = function (callback) { ////// 获得所有存在存档的存档位 ////// control.prototype.getSaveIndexes = function (callback) { var indexes = {}; - if (core.platform.useLocalForage) { - localforage.iterate(function (value, key, n) { + localforage.keys(function (err, keys) { + if (err) { + main.log(err); + return callback(indexes); + } + keys.forEach(function (key) { core.control._getSaveIndexes_getIndex(indexes, key); - }, function () { - callback(indexes); - }); - } - else { - Object.keys(localStorage).forEach(function (key) { - core.control._getSaveIndexes_getIndex(indexes, key); - }); - callback(indexes); - } + }); + callback(indexes); + }); } control.prototype._getSaveIndexes_getIndex = function (indexes, name) { diff --git a/libs/core.js b/libs/core.js index abe42f11..5be2e626 100644 --- a/libs/core.js +++ b/libs/core.js @@ -82,7 +82,6 @@ function core() { 'isQQ': false, // 是否是QQ 'isChrome': false, // 是否是Chrome 'supportCopy': false, // 是否支持复制到剪切板 - 'useLocalForage': true, 'fileInput': null, // FileInput 'fileReader': null, // 是否支持FileReader @@ -402,7 +401,6 @@ core.prototype._init_platform = function () { core.platform.isSafari = /Safari/i.test(navigator.userAgent) && !/Chrome/i.test(navigator.userAgent); core.platform.isQQ = /QQ/i.test(navigator.userAgent); core.platform.isWeChat = /MicroMessenger/i.test(navigator.userAgent); - this._init_checkLocalForage(); if (window.FileReader) { core.platform.fileReader = new FileReader(); core.platform.fileReader.onload = function () { @@ -421,37 +419,6 @@ core.prototype._init_platform = function () { } } -core.prototype._init_checkLocalForage = function () { - core.platform.useLocalForage = core.getLocalStorage('useLocalForage', true); - var _error = function (e) { - main.log(e); - core.platform.useLocalForage = false; - }; - if (core.platform.useLocalForage) { - try { - core.setLocalForage("__test__", lzw_encode("__test__"), function () { - try { - core.getLocalForage("__test__", null, function (data) { - try { - if (lzw_decode(data) != "__test__") { - console.log("localForage unsupported!"); - core.platform.useLocalForage = false; - } - else { - console.log("localForage supported!"); - core.removeLocalForage("__test__"); - } - } - catch (e) {_error(e);} - }, _error) - } - catch (e) {_error(e);} - }, _error) - } - catch (e) {_error(e);} - } -} - core.prototype._init_others = function () { // 一些额外的东西 core.material.groundCanvas = document.createElement('canvas').getContext('2d'); diff --git a/libs/utils.js b/libs/utils.js index 7e04871e..800b2384 100644 --- a/libs/utils.js +++ b/libs/utils.js @@ -252,17 +252,6 @@ utils.prototype.removeLocalStorage = function (key) { } utils.prototype.setLocalForage = function (key, value, successCallback, errorCallback) { - - if (!core.platform.useLocalForage) { - if (this.setLocalStorage(key, value)) { - if (successCallback) successCallback(); - } - else { - if (errorCallback) errorCallback(); - } - return; - } - if (value == null) { this.removeLocalForage(key); return; @@ -286,13 +275,6 @@ utils.prototype.setLocalForage = function (key, value, successCallback, errorCal } utils.prototype.getLocalForage = function (key, defaultValue, successCallback, errorCallback) { - - if (!core.platform.useLocalForage) { - var value = this.getLocalStorage(key, defaultValue); - if (successCallback) successCallback(value); - return; - } - localforage.getItem(core.firstData.name + "_" + key, function (err, value) { if (err) { if (errorCallback) errorCallback(err); @@ -310,13 +292,6 @@ utils.prototype.getLocalForage = function (key, defaultValue, successCallback, e } utils.prototype.removeLocalForage = function (key, successCallback, errorCallback) { - - if (!core.platform.useLocalForage) { - this.removeLocalStorage(key); - if (successCallback) successCallback(); - return; - } - localforage.removeItem(core.firstData.name + "_" + key, function (err) { if (err) { if (errorCallback) errorCallback(err); diff --git a/runtime.d.ts b/runtime.d.ts index 9b411e29..d1cf7de3 100644 --- a/runtime.d.ts +++ b/runtime.d.ts @@ -2774,7 +2774,6 @@ type core = { /** 是否是QQ */isQQ: boolean /** 是否是Chrome */isChrome: boolean /** 是否支持复制到剪切板 */supportCopy: boolean - useLocalForage: boolean, fileInput: null /** 是否支持FileReader */fileReader: null