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

Use heatshrink/imageconverter from webtools - see https://github.com/espruino/BangleApps/pull/2299

pull/2303/head
Gordon Williams 2022-11-21 12:16:27 +00:00
parent 22db965863
commit bf6e0ed5ca
10 changed files with 161 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android.html
View File

@ -170,10 +170,10 @@
</div> </div>
</footer> </footer>
<script src="https://www.puck-js.com/puck.js"></script> <script src="webtools/puck.js"></script>
<script src="webtools/heatshrink.js"></script>
<script src="core/lib/marked.min.js"></script> <script src="core/lib/marked.min.js"></script>
<script src="core/lib/espruinotools.js"></script> <script src="core/lib/espruinotools.js"></script>
<script src="core/lib/heatshrink.js"></script>
<script src="core/js/utils.js"></script> <script src="core/js/utils.js"></script>
<script src="loader.js"></script> <script src="loader.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.7.1/jszip.min.js"></script> <!-- for backup.js --> <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.7.1/jszip.min.js"></script> <!-- for backup.js -->

4
apps/imageclock/custom.html
View File

@ -4,8 +4,8 @@
</head> </head>
<body> <body>
<script src="../../core/lib/heatshrink.js"></script> <script src="../../webtools/heatshrink.js"></script>
<script src="../../core/lib/imageconverter.js"></script> <script src="../../webtools/imageconverter.js"></script>
<script src="../../core/lib/customize.js"></script> <script src="../../core/lib/customize.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.7.1/jszip.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.7.1/jszip.js"></script>

2
apps/imgclock/custom.html
View File

@ -10,7 +10,7 @@
</div> </div>
<script src="../../core/lib/customize.js"></script> <script src="../../core/lib/customize.js"></script>
<script src="../../core/lib/imageconverter.js"></script> <script src="../../webtools/imageconverter.js"></script>
<script> <script>
var faces = []; var faces = [];

4
apps/mylocation/custom.html
View File

@ -39,8 +39,8 @@
<script src="../../core/lib/customize.js"></script> <script src="../../core/lib/customize.js"></script>
<script src="https://unpkg.com/leaflet@1.0.3/dist/leaflet.js"></script> <script src="https://unpkg.com/leaflet@1.0.3/dist/leaflet.js"></script>
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script> <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<script src="../../core/lib/heatshrink.js"></script> <script src="../../webtools/heatshrink.js"></script>
<script src="../../core/lib/imageconverter.js"></script> <script src="../../webtools/imageconverter.js"></script>
<script src="https://unpkg.com/leaflet-geosearch@3.6.0/dist/bundle.min.js"></script> <script src="https://unpkg.com/leaflet-geosearch@3.6.0/dist/bundle.min.js"></script>
<script> <script>

4
apps/openstmap/custom.html
View File

@ -43,8 +43,8 @@
<script src="../../core/lib/customize.js"></script> <script src="../../core/lib/customize.js"></script>
<script src="https://unpkg.com/leaflet@1.0.3/dist/leaflet.js"></script> <script src="https://unpkg.com/leaflet@1.0.3/dist/leaflet.js"></script>
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script> <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<script src="../../core/lib/heatshrink.js"></script> <script src="../../webtools/heatshrink.js"></script>
<script src="../../core/lib/imageconverter.js"></script> <script src="../../webtools/imageconverter.js"></script>
<script src="https://unpkg.com/leaflet-geosearch@3.6.0/dist/bundle.min.js"></script> <script src="https://unpkg.com/leaflet-geosearch@3.6.0/dist/bundle.min.js"></script>
<script> <script>

4
apps/qrcode/custom.html
View File

@ -106,8 +106,8 @@
<script src="../../core/lib/customize.js"></script> <script src="../../core/lib/customize.js"></script>
<script src="../../core/lib/qrcode.min.js"></script><!-- https://davidshimjs.github.io/qrcodejs/ --> <script src="../../core/lib/qrcode.min.js"></script><!-- https://davidshimjs.github.io/qrcodejs/ -->
<script src="../../core/lib/heatshrink.js"></script> <script src="../../webtools/heatshrink.js"></script>
<script src="../../core/lib/imageconverter.js"></script> <script src="../../webtools/imageconverter.js"></script>
<script src="./qr-scanner.umd.min.js"></script><!-- https://github.com/nimiq/qr-scanner --> <script src="./qr-scanner.umd.min.js"></script><!-- https://github.com/nimiq/qr-scanner -->
<script> <script>
var targetSize = 200; var targetSize = 200;

2
bin/firmwaremaker_c.js
View File

@ -114,7 +114,7 @@ function evaluateFile(file) {
var hsStart = 'require("heatshrink").decompress(atob("'; var hsStart = 'require("heatshrink").decompress(atob("';
var hsEnd = '"))'; var hsEnd = '"))';
if (file.content.startsWith(hsStart) && file.content.endsWith(hsEnd)) { if (file.content.startsWith(hsStart) && file.content.endsWith(hsEnd)) {
var heatshrink = require(ROOTDIR+"/core/lib/heatshrink.js"); var heatshrink = require(ROOTDIR+"/webtools/heatshrink.js");
var b64 = file.content.slice(hsStart.length, -hsEnd.length); var b64 = file.content.slice(hsStart.length, -hsEnd.length);
var decompressed = heatshrink.decompress(atob(b64)); var decompressed = heatshrink.decompress(atob(b64));
file.content = ""; file.content = "";

2
bin/sanitycheck.js
View File

@ -3,7 +3,7 @@
*/ */
var fs = require("fs"); var fs = require("fs");
var heatshrink = require("../core/lib/heatshrink"); var heatshrink = require("../webtools/heatshrink");
var acorn; var acorn;
try { try {
acorn = require("acorn"); acorn = require("acorn");

2
core

@ -1 +1 @@
Subproject commit aae64595cf0b42e9c72003921ffd2e0bde5e8f88 Subproject commit 052b072fb745934cceff568c743717330b7e5b32

2
index.html
View File

@ -186,9 +186,9 @@
</footer> </footer>
<script src="webtools/puck.js"></script> <script src="webtools/puck.js"></script>
<script src="webtools/heatshrink.js"></script>
<script src="core/lib/marked.min.js"></script> <script src="core/lib/marked.min.js"></script>
<script src="core/lib/espruinotools.js"></script> <script src="core/lib/espruinotools.js"></script>
<script src="core/lib/heatshrink.js"></script>
<script src="core/js/utils.js"></script> <script src="core/js/utils.js"></script>
<script src="loader.js"></script> <script src="loader.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.7.1/jszip.min.js"></script> <!-- for backup.js --> <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.7.1/jszip.min.js"></script> <!-- for backup.js -->