Fix VTX table read from clipboard

betaflight · Apr 13, 2024 · 0fa12c3 · 0fa12c3
1 parent 8786553
commit 0fa12c3
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/src/js/Clipboard.js b/src/js/Clipboard.js
@@ -95,7 +95,7 @@ Clipboard._configureClipboardAsWeb = function() {
     this.readText = function(onSuccess, onError) {
 
         navigator.clipboard.readText().then(
-            () => onSuccess?.(text),
+            (text) => onSuccess?.(text),
             onError,
         );
     };

diff --git a/src/js/tabs/vtx.js b/src/js/tabs/vtx.js
@@ -14,6 +14,7 @@ import { API_VERSION_1_42, API_VERSION_1_44 } from '../data_storage';
 import UI_PHONES from "../phones_ui";
 import { gui_log } from "../gui_log";
 import { checkChromeRuntimeError } from "../utils/common";
+import { isWeb } from "../utils/isWeb";
 import $ from 'jquery';
 
 const vtx = {
@@ -171,30 +172,30 @@ vtx.initialize = function (callback) {
             callback_error();
         }
 
-        // Load schema
-        const urlVtxSchema = chrome.runtime.getURL(`resources/jsonschema/vtxconfig_schema-${vtxConfig.version}.json`);
+        function validateAgainstSchema(schemaJson, vtxConfig) {
+            let valid = false;
+            if (schemaJson !== undefined) {
+                // Validate
+                valid = (TABS.vtx.env.validate(schemaJson, vtxConfig) === undefined);
+            }
+
+            console.log("Validation against schema result:", valid);
+            valid ? callback_valid() : callback_error();
+        }
 
+        const vtxJsonSchemaUrl = `../../resources/jsonschema/vtxconfig_schema-${vtxConfig.version}.json`;
+
+        // Load schema depending on the system
         if (GUI.isCordova()) {
             // FIXME On android : Fetch API cannot load : URL scheme "file" is not supported
             callback_valid();
         } else {
-            fetch(urlVtxSchema)
+            let vtxJsonSchemaUrl2Fetch = isWeb() ? vtxJsonSchemaUrl : chrome.runtime.getURL(vtxJsonSchemaUrl);
+            fetch(vtxJsonSchemaUrl2Fetch)
                 .then(response => response.json())
                 .catch(error => console.error('Error fetching VTX Schema:', error))
-                .then(schemaJson => {
-
-                    let valid = false;
-                    if (schemaJson !== undefined) {
-                        // Validate
-                        valid = (TABS.vtx.env.validate(schemaJson, vtxConfig) === undefined);
-                    }
-
-                    console.log("Validation against schema result:", valid);
-                    valid ? callback_valid() : callback_error();
-                },
-            );
+                .then(schemaJson => validateAgainstSchema(schemaJson, vtxConfig));
         }
-
     }
 
     // Emulates the MSP read from a vtxConfig object (JSON)

diff --git a/src/resources/jsonschema/vtxconfig_schema-1.0.json b/src/resources/jsonschema/vtxconfig_schema-1.0.json
@@ -1,9 +1,9 @@
 {
   "definitions": {},
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "http://example.com/root.json",
+  "$id": "http://betaflight.com/vtxconfig_schema-1.0.json",
   "type": "object",
-  "title": "The Root Schema",
+  "title": "Betaflight VTX Table JSON Schema",
   "required": [
     "description",
     "version",

diff --git a/vite.config.js b/vite.config.js
@@ -70,7 +70,7 @@ export default defineConfig({
         serveLocalesPlugin(),
         copy({
             targets: [
-                { src: ["locales", "resources", "src/tabs", "src/images"], dest: "src/dist" },
+                { src: ["locales", "resources", "src/tabs", "src/images", "src/resources"], dest: "src/dist" },
             ],
             hook: "writeBundle",
         }),