Don't minify

README.md

@@ -6,9 +6,6 @@ An Apple II emulator written in Javascript
 Things are a little rought around the edges right now, hopefully I will have
 time to clean things up in a bit.
 
-Expects compiler.jar from https://developers.google.com/closure/compiler/ to
+To run, open apple2js.html
-be in $(HOME)/bin
-
-To build, run "make"
 
 To add additional disk images, use scripts/dsk2json.pl, then "make index"

apple2js.html

@@ -42,12 +42,24 @@
 </script>
 
 <!-- Emulator Scripts -->
-<script type="text/javascript" src="js/all.min.js?rel=2013-10-09">
+<script type="text/javascript" src="js/util.js"></script>
-</script>
+<script type="text/javascript" src="js/prefs.js"></script>
-<script type="text/javascript" src="js/ui/ui-all.min.js?rel=2013-10-09">
+<script type="text/javascript" src="js/ram.js"></script>
-</script>
+<script type="text/javascript" src="js/langcard.js"></script>
-<script type="text/javascript" src="json/disks/index.js">
+<script type="text/javascript" src="js/fpbasic.js"></script>
-</script>
+<script type="text/javascript" src="js/apple2char.js"></script>
+<script type="text/javascript" src="js/canvas2.js"></script>
+<script type="text/javascript" src="js/apple2io.js"></script>
+<script type="text/javascript" src="js/parallel.js"></script>
+<script type="text/javascript" src="js/disk2.js"></script>
+<script type="text/javascript" src="js/ramfactor.js"></script>
+<script type="text/javascript" src="js/cpu6502.js"></script>
+<script type="text/javascript" src="js/base64.js"></script>
+<script type="text/javascript" src="js/ui/keyboard2.js"></script>
+<script type="text/javascript" src="js/ui/printer.js"></script>
+
+<!-- Disk Index -->
+<script type="text/javascript" src="json/disks/index.js"></script>
 
 <script type="text/javascript">
 

js/Makefile

@@ -1,4 +1,3 @@
-COMPRESS = java -jar $(HOME)/bin/compiler.jar --warning_level QUIET
 JSLINT = jshint
 
 JSFILES = copyright.js util.js prefs.js ram.js langcard.js fpbasic.js apple2char.js canvas2.js apple2io.js parallel.js ramfactor.js disk2.js cpu6502.js base64.js
@@ -8,23 +7,11 @@ JSFILES2E = copyright.js util.js prefs.js ram.js mmu.js apple2e.js apple2e-enhan
 ALLJS = ${JSFILES} ${JSFILES2E}
 CHECKEDJS := $(patsubst %.js,.checked-%.js,${ALLJS})
 
-default: all.min.js all2e.min.js
+default:
 	$(MAKE) -C ui
 
-all.min.js: all.js
-	$(COMPRESS) < all.js > all.min.js
-
-all2e.min.js: all2e.js
-	$(COMPRESS) < all2e.js > all2e.min.js
-
-all.js: $(JSFILES) Makefile
-	cat $(JSFILES) > all.js
-
-all2e.js: $(JSFILES2E) Makefile
-	cat $(JSFILES2E) > all2e.js
-
 clean:
-	$(RM) -f all.js all.min.js all2e.js all2e.min.js .checked-*
+	$(RM) -f .checked-*
 	$(MAKE) -C ui clean
 
 lint: $(CHECKEDJS)

js/ui/Makefile

@@ -1,4 +1,3 @@
-COMPRESS = java -jar $(HOME)/bin/compiler.jar --warning_level QUIET
 JSLINT = jshint
 
 JSFILES = copyright.js keyboard2.js printer.js
@@ -8,22 +7,10 @@ JSFILES2E = copyright.js keyboard2e.js printer.js
 ALLJS = ${JSFILES} ${JSFILES2E}
 CHECKEDJS := $(patsubst %.js,.checked-%.js,${ALLJS})
 
-default: ui-all.min.js ui-all2e.min.js
+default:
-
-ui-all.min.js: ui-all.js
-	$(COMPRESS) < ui-all.js > ui-all.min.js
-
-ui-all2e.min.js: ui-all2e.js
-	$(COMPRESS) < ui-all2e.js > ui-all2e.min.js
-
-ui-all.js: $(JSFILES) Makefile
-	cat $(JSFILES) > ui-all.js
-
-ui-all2e.js: $(JSFILES2E) Makefile
-	cat $(JSFILES2E) > ui-all2e.js
 
 clean:
-	$(RM) -f ui-all.js ui-all.min.js ui-all2e.js ui-all2e.min.js .checked-*
+	$(RM) -f .checked-*
 
 lint: $(CHECKEDJS)
 

js/ui/keyboard2.js

@@ -196,15 +196,12 @@ function KeyBoard(io) {
                 return span;
             }
 
-            function _mousedown(ev) {
-                $(ev.currentTarget).addClass("pressed");
-            }
-
             function _mouseup(ev) {
                 $(ev.currentTarget).removeClass("pressed");
             }
 
-            function _click(ev) {
+            function _mousedown(ev) {
+                $(ev.currentTarget).addClass("pressed");
                 var key = $(ev.currentTarget).data(shifted ? "key2" : "key1");
                 switch (key) {
                 case "BELL":
@@ -285,16 +282,10 @@ function KeyBoard(io) {
                     key.data({"key1": key1, "key2": key2});
 
                     if (window.ontouchstart === undefined) {
-                        key.bind("mousedown", function(event) {
+                        key.bind("mousedown", _mousedown);
-                            _mousedown(event);
-                            _click(event);
-                        });
                         key.bind("mouseup mouseout", _mouseup);
                     } else {
-                        key.bind("touchstart", function(event) {
+                        key.bind("touchstart", _mousedown);
-                            _mousedown(event);
-                            _click(event);
-                        });
                         key.bind("touchend touchleave", _mouseup);
                     }
                     row.append(key);

js/ui/keyboard2e.js

@@ -253,15 +253,12 @@ function KeyBoard(io) {
                 return span;
             }
 
-            function _mousedown() {
-                $(this).addClass("pressed");
-            }
-
             function _mouseup() {
                 $(this).removeClass("pressed");
             }
 
-            function _click(ev) {
+            function _mousedown() {
+                $(this).addClass("pressed");
                 var key = $(ev.currentTarget).data(shifted ? "key2" : "key1");
                 switch (key) {
                 case "BELL":
@@ -368,16 +365,10 @@ function KeyBoard(io) {
                     key.data({"key1": key1, "key2": key2});
 
                     if (window.ontouchstart === undefined) {
-                        key.bind("mousedown", function(event) {
+                        key.bind("mousedown", _mousedown);
-                            _mousedown(event);
-                            _click(event);
-                        });
                         key.bind("mouseup mouseout", _mouseup);
                     } else {
-                        key.bind("touchstart", function(event) {
+                        key.bind("touchstart", _mousedown);
-                            _mousedown(event);
-                            _click(event);
-                        });
                         key.bind("touchend touchleave", _mouseup);
                     }