FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fix issue with code uploader where it'd silently refuse to upload code with warnings in

pull/1551/head^2
Gordon Williams 2022-03-08 13:00:31 +00:00
parent 401f197d1e
commit eca4079828
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
apps/custom/custom.html
View File

@ -16,12 +16,12 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/jshint/2.11.0/jshint.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jshint/2.11.0/jshint.min.js"></script>
<p>Type your javascript code here</p> <p>Type your javascript code here</p>
<p><textarea id="custom-js"></textarea></p> <p><textarea id="custom-js"></textarea></p>
<p>Then click <button id="upload" class="btn btn-primary">Upload</button></p> <p>Then click <button id="upload" class="btn btn-primary">Upload</button>&nbsp;<span id="btninfo" style="color:orange"></span></p>
<script> <script>
const item = "custom.boot.js"; const item = "custom.boot.js";
const id = "custom-js"; const id = "custom-js";
const sample = "//Bangle.setOptions({wakeOnBTN2:false});"; const sample = "//Bangle.setOptions({wakeOnBTN2:false});";
var localeModule = null; var customBootCode = null;
var editor = {}; var editor = {};
if (localStorage.getItem(item) === null) { if (localStorage.getItem(item) === null) {
@ -48,15 +48,30 @@
gutters: ["CodeMirror-linenumbers", "CodeMirror-lint-markers"], gutters: ["CodeMirror-linenumbers", "CodeMirror-lint-markers"],
lineNumbers: true lineNumbers: true
}); });
function hasWarnings() {
return editor.state.lint.marked.length!=0;
}
editor.on("change", function() {
setTimeout(function() {
if (hasWarnings()) {
document.getElementById("btninfo").innerHTML = "There are warnings in the code to be uploaded";
document.getElementById("upload").classList.add("disabled");
} else {
document.getElementById("btninfo").innerHTML = "";
document.getElementById("upload").classList.remove("disabled");
}
}, 500);
})
document.getElementById("upload").addEventListener("click", function() { document.getElementById("upload").addEventListener("click", function() {
if (!editor.state.lint.marked.length) { if (!hasWarnings()) {
localeModule = editor.getValue(); customBootCode = editor.getValue();
localStorage.setItem(item, localeModule); localStorage.setItem(item, customBootCode);
sendCustomizedApp({ sendCustomizedApp({
storage: [{ name: item, content: localeModule }] storage: [{ name: item, content: customBootCode }]
}); });
} }
}); });
</script> </script>
</body> </body>