diff --git a/Makefile b/Makefile index a6d7b3f3..f3a187fa 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,6 @@ +TSC=./node_modules/typescript/bin/tsc + all: src/cpu/z80fast.js src/cpu/z80.js: src/cpu/z80.coffee @@ -27,6 +29,6 @@ web: tsweb: ifconfig | grep inet - tsc -w & + $(TSC) -w & python2 -m SimpleHTTPServer 2>> http.out #node ../nodejs-typescript-webserver/bin/FileServer.js . diff --git a/index.html b/index.html index 22071b62..dd403a1d 100644 --- a/index.html +++ b/index.html @@ -108,6 +108,12 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
  • Williams Sound (Z80)
  • + diff --git a/package.json b/package.json index a8577f12..74f52ced 100644 --- a/package.json +++ b/package.json @@ -6,17 +6,16 @@ "devDependencies": { "@types/bootstrap": "^3.x", "@types/jquery": "^2.x", - "@types/w2ui": "^1.4.32", - "atob": "^2.1.2", - "btoa": "^1.2.1", - "clipboard": "^2.0.1", + "@types/w2ui": "^1.4.x", + "atob": "^2.1.x", + "btoa": "^1.2.x", + "clipboard": "^2.0.x", "jquery": "^2.x", - "jsdom": "^12.0.0", - "lzg": "^1.0.0", - "mocha": "^5.2.0", - "phantomjs": "^2.1.7", - "typescript": "^3.0.1", - "wavedrom-cli": "^0.5.0" + "jsdom": "^12.0.x", + "lzg": "^1.0.x", + "mocha": "^5.2.x", + "typescript": "^3.x", + "wavedrom-cli": "^0.5.x" }, "description": "8bitworkshop.com", "main": "main.js", diff --git a/src/pixed/pixeleditor.ts b/src/pixed/pixeleditor.ts index b3f4922e..b41ab56a 100644 --- a/src/pixed/pixeleditor.ts +++ b/src/pixed/pixeleditor.ts @@ -496,7 +496,7 @@ function pixelEditorReceiveMessage(e) { function createThumbnailForImage(parentdiv, i) { var span = $(''); - var thumb = new PixelEditor(span[0], currentFormat, palette, allimages[i]); + var thumb = new PixelEditor(span[0] as HTMLElement, currentFormat, palette, allimages[i]); // double size of canvas thumbnail thumb.canvas.style.height = currentFormat.h*2+"px"; thumb.canvas.style.width = currentFormat.w*2+"px"; diff --git a/src/platform/verilog.ts b/src/platform/verilog.ts index 16f17bad..5903a107 100644 --- a/src/platform/verilog.ts +++ b/src/platform/verilog.ts @@ -413,7 +413,7 @@ var VerilogPlatform = function(mainElement, options) { // create scope, if visible if (this.isScopeVisible()) { if (!this.waveview) { - this.waveview = new WaveformView(this.wavediv[0], this); + this.waveview = new WaveformView(this.wavediv[0] as HTMLElement, this); } else { this.waveview.refresh(); } diff --git a/src/ui.ts b/src/ui.ts index d3634957..f8398bd0 100644 --- a/src/ui.ts +++ b/src/ui.ts @@ -82,7 +82,7 @@ function setLastPreset(id:string) { function initProject() { current_project = new CodeProject(newWorker(), platform_id, platform, store); - projectWindows = new ProjectWindows($("#workspace")[0], current_project); + projectWindows = new ProjectWindows($("#workspace")[0] as HTMLElement, current_project); current_project.callbackGetRemote = $.get; current_project.callbackBuildResult = (result:WorkerResult) => { setCompileOutput(result); @@ -744,7 +744,7 @@ function updateDebugWindows() { function _recordVideo() { loadScript("gif.js/dist/gif.js", () => { - var canvas = $("#emulator").find("canvas")[0]; + var canvas = $("#emulator").find("canvas")[0] as HTMLElement; if (!canvas) { alert("Could not find canvas element to record video!"); return;