From: stephan Date: Sat, 28 May 2022 11:59:46 +0000 (+0000) Subject: fiddle: changed the internal key of the session/local storage to avoid conflicts... X-Git-Tag: version-3.39.0~82 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a66ff359f769656e8adaaf83e8a3973dd5a6911;p=thirdparty%2Fsqlite.git fiddle: changed the internal key of the session/local storage to avoid conflicts with the pikchr fiddle app (which is derived from this one) when running from the same HTTP origin as an instance of that app in a dev environment. FossilOrigin-Name: fd668da5ccf037c2ad8e61e381dd1eb398a8deab42a00593e551c30bd176890d --- diff --git a/ext/fiddle/fiddle.js b/ext/fiddle/fiddle.js index 98caa6b3c2..c03a09af11 100644 --- a/ext/fiddle/fiddle.js +++ b/ext/fiddle/fiddle.js @@ -192,7 +192,7 @@ /** Name of the stored copy of SqliteFiddle.config. */ - const configStorageKey = 'fiddle-config'; + const configStorageKey = 'sqlite3-fiddle-config'; /** The SqliteFiddle object is intended to be the primary @@ -305,12 +305,13 @@ } return this; }, + /** Stores this object's config in the browser's storage. */ storeConfig: function(){ storage.setJSON(configStorageKey,this.config); } }; - if(1){ /* set up SF.config */ + if(1){ /* Restore SF.config */ const storedConfig = storage.getJSON(configStorageKey); if(storedConfig){ /* Copy all properties to SF.config which are currently in diff --git a/manifest b/manifest index f2d22cea59..6702b91ddd 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C fiddle:\scorrected\sa\spiece\sof\sfar-corner-case\serror\shandling\sand\smade\sthe\svarious\scheckbox\sconfig\soptions\spersistent. -D 2022-05-28T11:29:00.497 +C fiddle:\schanged\sthe\sinternal\skey\sof\sthe\ssession/local\sstorage\sto\savoid\sconflicts\swith\sthe\spikchr\sfiddle\sapp\s(which\sis\sderived\sfrom\sthis\sone)\swhen\srunning\sfrom\sthe\ssame\sHTTP\sorigin\sas\san\sinstance\sof\sthat\sapp\sin\sa\sdev\senvironment. +D 2022-05-28T11:59:46.787 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -63,7 +63,7 @@ F ext/fiddle/SqliteTestUtil.js 559731c3e8e0de330ec7d292e6c1846566408caee6637acc8 F ext/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f F ext/fiddle/fiddle-worker.js 3a19253dc026d1ad9064ee853f3c4da3385223ce4434dab1838837525d817371 F ext/fiddle/fiddle.html 724f1cd4126616bc87f5871f78d3f7aaaf41e45c9728724627baab87e6af35f0 -F ext/fiddle/fiddle.js 503524eb132716c6c4777a1a2352a9bfc6d391b38de8d050f22f73a5df5993b1 +F ext/fiddle/fiddle.js 5b456ed7085830cda2fc75a0801476174a978521949335f24bc4154d076dcd4d F ext/fiddle/index.md d9c1c308d8074341bc3b11d1d39073cd77754cb3ca9aeb949f23fdd8323d81cf F ext/fiddle/sqlite3-api.js 8500698d2163f4a25f8e5e6810ad826487342579d6a321d82b244dbc8e6f6db6 F ext/fiddle/testing.css 750572dded671d2cf142bbcb27af5542522ac08db128245d0b9fe410aa1d7f2a @@ -1970,8 +1970,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 3492fe8a212cbe02b9016866e2499b99c3b566a4b0bc91fba267e6e1fe1b8943 -R a18f2e003119227b8304b945c745c3c1 +P 2ba429a4f8300b981b23d54c2bdb54bd4863522c1c18bf9a67a82e3dce845b10 +R 5eae1a2cd35849ef58a6f996836c910f U stephan -Z aed9dc05a3c9ef7bf20957969efcb8af +Z 2e6b37323598d8726fccb322e129ee85 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3cb0668914..3fc3330fe9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2ba429a4f8300b981b23d54c2bdb54bd4863522c1c18bf9a67a82e3dce845b10 \ No newline at end of file +fd668da5ccf037c2ad8e61e381dd1eb398a8deab42a00593e551c30bd176890d \ No newline at end of file