diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/dist/html/editor.html | 34 | ||||
| -rw-r--r-- | misc/dist/html/full-size.html | 8 | ||||
| -rw-r--r-- | misc/extension_api_validation/4.3-stable.expected | 37 | ||||
| -rw-r--r-- | misc/utility/.clang-format-glsl | 5 |
4 files changed, 67 insertions, 17 deletions
diff --git a/misc/dist/html/editor.html b/misc/dist/html/editor.html index ef19c0032e..3fc24e6b76 100644 --- a/misc/dist/html/editor.html +++ b/misc/dist/html/editor.html @@ -363,24 +363,28 @@ window.addEventListener('load', () => { btn.style.display = ''; } if ('serviceWorker' in navigator) { - navigator.serviceWorker.register('service.worker.js').then(function (reg) { - if (reg.waiting) { - notifyUpdate(reg.waiting); - } - reg.addEventListener('updatefound', function () { - const update = reg.installing; - update.addEventListener('statechange', function () { - if (update.state === 'installed') { - // It's a new install, claim and perform aggressive caching. - if (!reg.active) { - update.postMessage('claim'); - } else { - notifyUpdate(update); + try { + navigator.serviceWorker.register('service.worker.js').then(function (reg) { + if (reg.waiting) { + notifyUpdate(reg.waiting); + } + reg.addEventListener('updatefound', function () { + const update = reg.installing; + update.addEventListener('statechange', function () { + if (update.state === 'installed') { + // It's a new install, claim and perform aggressive caching. + if (!reg.active) { + update.postMessage('claim'); + } else { + notifyUpdate(update); + } } - } + }); }); }); - }); + } catch (e) { + console.error('Error while registering service worker:', e); + } } const missing = Engine.getMissingFeatures({ diff --git a/misc/dist/html/full-size.html b/misc/dist/html/full-size.html index cda7a5fa89..e3e8ae19b8 100644 --- a/misc/dist/html/full-size.html +++ b/misc/dist/html/full-size.html @@ -152,9 +152,15 @@ const engine = new Engine(GODOT_CONFIG); if (missing.length !== 0) { if (GODOT_CONFIG['serviceWorker'] && GODOT_CONFIG['ensureCrossOriginIsolationHeaders'] && 'serviceWorker' in navigator) { + let serviceWorkerRegistrationPromise; + try { + serviceWorkerRegistrationPromise = navigator.serviceWorker.getRegistration(); + } catch (err) { + serviceWorkerRegistrationPromise = Promise.reject(new Error('Service worker registration failed.')); + } // There's a chance that installing the service worker would fix the issue Promise.race([ - navigator.serviceWorker.getRegistration().then((registration) => { + serviceWorkerRegistrationPromise.then((registration) => { if (registration != null) { return Promise.reject(new Error('Service worker already exists.')); } diff --git a/misc/extension_api_validation/4.3-stable.expected b/misc/extension_api_validation/4.3-stable.expected index 75e81b5ff4..506844e6d6 100644 --- a/misc/extension_api_validation/4.3-stable.expected +++ b/misc/extension_api_validation/4.3-stable.expected @@ -122,3 +122,40 @@ GH-98918 Validate extension JSON: Error: Field 'classes/FileAccess/methods/open_encrypted/arguments': size changed value in new API, from 3 to 4. Optional argument added to allow setting initialization vector. Compatibility method registered. + + +GH-98972 +-------- +Validate extension JSON: Error: Field 'classes/TranslationServer/methods/standardize_locale/arguments': size changed value in new API, from 1 to 2. + +Optional argument added. Compatibility method registered. + + +GH-99424 +-------- +Validate extension JSON: API was removed: builtin_classes/Projection/constants/PLANE_BOTTOM +Validate extension JSON: API was removed: builtin_classes/Projection/constants/PLANE_FAR +Validate extension JSON: API was removed: builtin_classes/Projection/constants/PLANE_LEFT +Validate extension JSON: API was removed: builtin_classes/Projection/constants/PLANE_NEAR +Validate extension JSON: API was removed: builtin_classes/Projection/constants/PLANE_RIGHT +Validate extension JSON: API was removed: builtin_classes/Projection/constants/PLANE_TOP +Validate extension JSON: API was removed: builtin_classes/Vector2/constants/AXIS_X +Validate extension JSON: API was removed: builtin_classes/Vector2/constants/AXIS_Y +Validate extension JSON: API was removed: builtin_classes/Vector2i/constants/AXIS_X +Validate extension JSON: API was removed: builtin_classes/Vector2i/constants/AXIS_Y +Validate extension JSON: API was removed: builtin_classes/Vector3/constants/AXIS_X +Validate extension JSON: API was removed: builtin_classes/Vector3/constants/AXIS_Y +Validate extension JSON: API was removed: builtin_classes/Vector3/constants/AXIS_Z +Validate extension JSON: API was removed: builtin_classes/Vector3i/constants/AXIS_X +Validate extension JSON: API was removed: builtin_classes/Vector3i/constants/AXIS_Y +Validate extension JSON: API was removed: builtin_classes/Vector3i/constants/AXIS_Z +Validate extension JSON: API was removed: builtin_classes/Vector4/constants/AXIS_W +Validate extension JSON: API was removed: builtin_classes/Vector4/constants/AXIS_X +Validate extension JSON: API was removed: builtin_classes/Vector4/constants/AXIS_Y +Validate extension JSON: API was removed: builtin_classes/Vector4/constants/AXIS_Z +Validate extension JSON: API was removed: builtin_classes/Vector4i/constants/AXIS_W +Validate extension JSON: API was removed: builtin_classes/Vector4i/constants/AXIS_X +Validate extension JSON: API was removed: builtin_classes/Vector4i/constants/AXIS_Y +Validate extension JSON: API was removed: builtin_classes/Vector4i/constants/AXIS_Z + +These constants have been replaced with corresponding enum constants. diff --git a/misc/utility/.clang-format-glsl b/misc/utility/.clang-format-glsl index 59efa8fa35..c588df0236 100644 --- a/misc/utility/.clang-format-glsl +++ b/misc/utility/.clang-format-glsl @@ -30,7 +30,10 @@ JavaImportGroups: - com.google - java - javax -KeepEmptyLinesAtTheStartOfBlocks: false +KeepEmptyLines: + AtEndOfFile: false + AtStartOfBlock: false + AtStartOfFile: false ObjCBlockIndentWidth: 4 PackConstructorInitializers: NextLine RemoveSemicolon: false # Differs from base .clang-format |