minor fixes

css/ui.css

@@ -168,7 +168,7 @@ a.dropdown-toggle {
   color:#66ee66;
   padding:3px;
 }
-// http://stackoverflow.com/questions/18023493/bootstrap-3-dropdown-sub-menu-missing
+/* http://stackoverflow.com/questions/18023493/bootstrap-3-dropdown-sub-menu-missing */
 .dropdown-submenu {
     position:relative;
 }

doc/notes.txt

@@ -69,12 +69,10 @@ TODO:
 - C/asm formatter
 - fix WebAudio (https://news.ycombinator.com/item?id=18066474)
 - Safari: verilog scope doesn't work
-<<<<<<< HEAD
 - share playable link w/ verilog?
 - pixedit Sprite Rotation bitmap wrong (bpw?)
-=======
-- no errors for verilog inline asm
->>>>>>> 951088dd3b2f4cea5bb8ef5dfc8ea728fee3bbd7
+- no errors for verilog inline asm?
+- allow download of JSASM output
 
 
 WEB WORKER FORMAT

src/waveform.ts

@@ -65,7 +65,7 @@ export class WaveformView {
         var s = this.meta[row].label;
         var linediv = document.createElement("div");
         var canvas = document.createElement("canvas");
-        canvas.width = width - 4;
+        canvas.width = width - 12;
         canvas.height = rowHeight;
         linediv.appendChild(canvas); //document.createTextNode(s));
         linediv.classList.add('waverow');

src/worker/assembler.ts

@@ -365,14 +365,14 @@ var Assembler = function(spec : AssemblerSpec) {
   }
 }
 
-/*
 // Main
-declare var module;
+/*
+declare var module, require;
 if (typeof module !== 'undefined' && require.main === module) {
   var fs = require('fs');
   var stdinBuffer = fs.readFileSync(0);
   var code = stdinBuffer.toString();
-  var asm = new Assembler();
+  var asm = new (Assembler as any)();
   asm.loadJSON = function(filename) {
     return JSON.parse(fs.readFileSync(filename, 'utf8'));
   };
@@ -386,4 +386,4 @@ if (typeof module !== 'undefined' && require.main === module) {
   var out = asm.assembleFile(code);
   console.log(out);
 }
-*/
+*/