haskal
/
asciiflow2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compile issues for missing/brokebn imports

This commit is contained in:
Lewis Hemens 2018-03-16 11:48:25 -07:00
parent 8277399c61
commit c50eaf5daa
4 changed files with 496 additions and 462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
closure-compiler.jar Normal file → Executable file
View File

773
js-compiled.js
View File

File diff suppressed because it is too large Load Diff

162
js-lib/controller.js
View File

@ -1,18 +1,9 @@
import * as c from './constants'; import * as c from "./constants";
import Vector from './vector'; import Vector from "./vector";
import View from './view'; import View from "./view";
import State from './state'; import State from "./state";
import { import { DrawFunction, DrawBox, DrawLine, DrawFreeform, DrawErase, DrawMove, DrawText, DrawSelect } from "./draw/index";
DrawFunction, import DrawFunction from "./function";
DrawBox,
DrawLine,
DrawFreeform,
DrawErase,
DrawMove,
DrawText,
DrawSelect,
} from './draw/index';
/** /**
* Different modes of control. * Different modes of control.
@ -86,10 +77,7 @@ export default class Controller {
// Drag in progress, update the view origin. // Drag in progress, update the view origin.
if (this.mode == Mode.DRAG) { if (this.mode == Mode.DRAG) {
this.view.setOffset(this.dragOriginCell.add( this.view.setOffset(this.dragOriginCell.add(this.dragOrigin.subtract(position).scale(1 / this.view.zoom)));
this.dragOrigin
.subtract(position)
.scale(1 / this.view.zoom)));
} }
this.lastMoveCell = moveCell; this.lastMoveCell = moveCell;
} }
@ -112,41 +100,42 @@ export default class Controller {
* Installs input bindings for common use cases devices. * Installs input bindings for common use cases devices.
*/ */
installBindings() { installBindings() {
$(window).resize(e => { this.view.resizeCanvas() }); $(window).resize(e => {
this.view.resizeCanvas();
});
$('#draw-tools > button.tool').click(e => { $("#draw-tools > button.tool").click(e => {
$('#text-tool-widget').hide(0); $("#text-tool-widget").hide(0);
this.handleDrawButton(e.target.id); this.handleDrawButton(e.target.id);
}); });
$('#file-tools > button.tool').click(e => { $("#file-tools > button.tool").click(e => {
this.handleFileButton(e.target.id); this.handleFileButton(e.target.id);
}); });
$('button.close-dialog-button').click(e => { $("button.close-dialog-button").click(e => {
$('.dialog').removeClass('visible'); $(".dialog").removeClass("visible");
}); });
$('#import-submit-button').click(e => { $("#import-submit-button").click(e => {
this.state.clear(); this.state.clear();
this.state.fromText( this.state.fromText(
/** @type {string} */ /** @type {string} */
($('#import-area').val()), ($("#import-area").val()),
this.view.screenToCell(new Vector( this.view.screenToCell(new Vector(this.view.canvas.width / 2, this.view.canvas.height / 2))
this.view.canvas.width / 2, );
this.view.canvas.height / 2)));
this.state.commitDraw(); this.state.commitDraw();
$('#import-area').val(''); $("#import-area").val("");
$('.dialog').removeClass('visible'); $(".dialog").removeClass("visible");
}); });
$('#use-lines-button').click(e => { $("#use-lines-button").click(e => {
$('.dialog').removeClass('visible'); $(".dialog").removeClass("visible");
this.view.setUseLines(true); this.view.setUseLines(true);
}); });
$('#use-ascii-button').click(e => { $("#use-ascii-button").click(e => {
$('.dialog').removeClass('visible'); $(".dialog").removeClass("visible");
this.view.setUseLines(false); this.view.setUseLines(false);
}); });
@ -159,14 +148,14 @@ export default class Controller {
}); });
// Bit of a hack, just triggers the text tool to get a new value. // Bit of a hack, just triggers the text tool to get a new value.
$('#text-tool-input, #freeform-tool-input').keyup(() => { $("#text-tool-input, #freeform-tool-input").keyup(() => {
this.drawFunction.handleKey(''); this.drawFunction.handleKey("");
}); });
$('#text-tool-input, #freeform-tool-input').change(() => { $("#text-tool-input, #freeform-tool-input").change(() => {
this.drawFunction.handleKey(''); this.drawFunction.handleKey("");
}); });
$('#text-tool-close').click(() => { $("#text-tool-close").click(() => {
$('#text-tool-widget').hide(); $("#text-tool-widget").hide();
this.state.commitDraw(); this.state.commitDraw();
}); });
} }
@ -176,33 +165,33 @@ export default class Controller {
* @param {string} id The ID of the element clicked. * @param {string} id The ID of the element clicked.
*/ */
handleDrawButton(id) { handleDrawButton(id) {
$('#draw-tools > button.tool').removeClass('active'); $("#draw-tools > button.tool").removeClass("active");
$('#' + id).toggleClass('active'); $("#" + id).toggleClass("active");
$('.dialog').removeClass('visible'); $(".dialog").removeClass("visible");
// Install the right draw tool based on button pressed. // Install the right draw tool based on button pressed.
if (id == 'box-button') { if (id == "box-button") {
this.drawFunction = new DrawBox(this.state); this.drawFunction = new DrawBox(this.state);
} }
if (id == 'line-button') { if (id == "line-button") {
this.drawFunction = new DrawLine(this.state, false); this.drawFunction = new DrawLine(this.state, false);
} }
if (id == 'arrow-button') { if (id == "arrow-button") {
this.drawFunction = new DrawLine(this.state, true); this.drawFunction = new DrawLine(this.state, true);
} }
if (id == 'freeform-button') { if (id == "freeform-button") {
this.drawFunction = new DrawFreeform(this.state, "X"); this.drawFunction = new DrawFreeform(this.state, "X");
} }
if (id == 'erase-button') { if (id == "erase-button") {
this.drawFunction = new DrawErase(this.state); this.drawFunction = new DrawErase(this.state);
} }
if (id == 'move-button') { if (id == "move-button") {
this.drawFunction = new DrawMove(this.state); this.drawFunction = new DrawMove(this.state);
} }
if (id == 'text-button') { if (id == "text-button") {
this.drawFunction = new DrawText(this.state, this.view); this.drawFunction = new DrawText(this.state, this.view);
} }
if (id == 'select-button') { if (id == "select-button") {
this.drawFunction = new DrawSelect(this.state); this.drawFunction = new DrawSelect(this.state);
} }
this.state.commitDraw(); this.state.commitDraw();
@ -214,25 +203,25 @@ export default class Controller {
* @param {string} id The ID of the element clicked. * @param {string} id The ID of the element clicked.
*/ */
handleFileButton(id) { handleFileButton(id) {
$('.dialog').removeClass('visible'); $(".dialog").removeClass("visible");
$('#' + id + '-dialog').toggleClass('visible'); $("#" + id + "-dialog").toggleClass("visible");
if (id == 'import-button') { if (id == "import-button") {
$('#import-area').val(''); $("#import-area").val("");
$('#import-area').focus(); $("#import-area").focus();
} }
if (id == 'export-button') { if (id == "export-button") {
$('#export-area').val(this.state.outputText()); $("#export-area").val(this.state.outputText());
$('#export-area').select(); $("#export-area").select();
} }
if (id == 'clear-button') { if (id == "clear-button") {
this.state.clear(); this.state.clear();
} }
if (id == 'undo-button') { if (id == "undo-button") {
this.state.undo(); this.state.undo();
} }
if (id == 'redo-button') { if (id == "redo-button") {
this.state.redo(); this.state.redo();
} }
} }
@ -256,19 +245,41 @@ export default class Controller {
var specialKeyCode = null; var specialKeyCode = null;
if (event.ctrlKey || event.metaKey) { if (event.ctrlKey || event.metaKey) {
if (event.keyCode == 67) { specialKeyCode = c.KEY_COPY; } if (event.keyCode == 67) {
if (event.keyCode == 86) { specialKeyCode = c.KEY_PASTE; } specialKeyCode = c.KEY_COPY;
if (event.keyCode == 90) { this.state.undo(); } }
if (event.keyCode == 89) { this.state.redo(); } if (event.keyCode == 86) {
if (event.keyCode == 88) { specialKeyCode = c.KEY_CUT; } specialKeyCode = c.KEY_PASTE;
}
if (event.keyCode == 90) {
this.state.undo();
}
if (event.keyCode == 89) {
this.state.redo();
}
if (event.keyCode == 88) {
specialKeyCode = c.KEY_CUT;
}
} }
if (event.keyCode == 8) { specialKeyCode = c.KEY_BACKSPACE; } if (event.keyCode == 8) {
if (event.keyCode == 13) { specialKeyCode = c.KEY_RETURN; } specialKeyCode = c.KEY_BACKSPACE;
if (event.keyCode == 38) { specialKeyCode = c.KEY_UP; } }
if (event.keyCode == 40) { specialKeyCode = c.KEY_DOWN; } if (event.keyCode == 13) {
if (event.keyCode == 37) { specialKeyCode = c.KEY_LEFT; } specialKeyCode = c.KEY_RETURN;
if (event.keyCode == 39) { specialKeyCode = c.KEY_RIGHT; } }
if (event.keyCode == 38) {
specialKeyCode = c.KEY_UP;
}
if (event.keyCode == 40) {
specialKeyCode = c.KEY_DOWN;
}
if (event.keyCode == 37) {
specialKeyCode = c.KEY_LEFT;
}
if (event.keyCode == 39) {
specialKeyCode = c.KEY_RIGHT;
}
if (specialKeyCode != null) { if (specialKeyCode != null) {
//event.preventDefault(); //event.preventDefault();
@ -277,4 +288,3 @@ export default class Controller {
} }
} }
} }

17
js-lib/draw/index.js
View File

@ -1,9 +1,8 @@
export { default as DrawFunction } from './function'; export { default as DrawFunction } from "./function";
export { default as DrawBox } from './box'; export { default as DrawBox } from "./box";
export { default as DrawBoxText } from './boxtext'; export { default as DrawErase } from "./erase";
export { default as DrawErase } from './erase'; export { default as DrawLine } from "./line";
export { default as DrawLine } from './line'; export { default as DrawSelect } from "./select";
export { default as DrawSelect } from './select'; export { default as DrawText } from "./text";
export { default as DrawText } from './text'; export { default as DrawMove } from "./move";
export { default as DrawMove } from './move'; export { default as DrawFreeform } from "./freeform";
export { default as DrawFreeform } from './freeform';