From a6ff4161e8c1f8afc65bfbd10457d88fc4d5fe24 Mon Sep 17 00:00:00 2001 From: barsdeveloper Date: Wed, 5 Jan 2022 22:26:56 +0100 Subject: [PATCH] Organizing input actions in device folders --- dist/ueblueprint.js | 20 +++++++++---------- js/Blueprint.js | 18 ++++++++--------- js/action/Actions.js | 2 +- js/graph/GraphPin.js | 4 ++-- js/graph/SelectableDraggable.js | 4 ++-- js/input/{ => common}/Copy.js | 4 ++-- js/input/{ => common}/Paste.js | 6 +++--- js/input/{ => keybaord}/KeyboardCanc.js | 4 ++-- js/input/{ => keybaord}/KeyboardShortcut.js | 2 +- js/input/{ => mouse}/MouseClickDrag.js | 0 .../{DragLink.js => mouse/MouseCreateLink.js} | 6 +++--- .../{DragMove.js => mouse/MouseMoveNodes.js} | 2 +- .../MouseScrollGraph.js} | 2 +- js/input/{ => mouse}/MouseTracking.js | 0 js/input/{ => mouse}/MouseWheel.js | 2 +- js/input/{ => mouse}/Pointing.js | 4 ++-- js/input/{ => mouse}/Select.js | 0 js/input/{ => mouse}/Unfocus.js | 2 +- js/input/{ => mouse}/Zoom.js | 0 19 files changed, 41 insertions(+), 41 deletions(-) rename js/input/{ => common}/Copy.js (84%) rename js/input/{ => common}/Paste.js (87%) rename js/input/{ => keybaord}/KeyboardCanc.js (79%) rename js/input/{ => keybaord}/KeyboardShortcut.js (93%) rename js/input/{ => mouse}/MouseClickDrag.js (100%) rename js/input/{DragLink.js => mouse/MouseCreateLink.js} (70%) rename js/input/{DragMove.js => mouse/MouseMoveNodes.js} (92%) rename js/input/{DragScroll.js => mouse/MouseScrollGraph.js} (81%) rename js/input/{ => mouse}/MouseTracking.js (100%) rename js/input/{ => mouse}/MouseWheel.js (92%) rename js/input/{ => mouse}/Pointing.js (88%) rename js/input/{ => mouse}/Select.js (100%) rename js/input/{ => mouse}/Unfocus.js (92%) rename js/input/{ => mouse}/Zoom.js (100%) diff --git a/dist/ueblueprint.js b/dist/ueblueprint.js index 7e49c7b..77f247e 100755 --- a/dist/ueblueprint.js +++ b/dist/ueblueprint.js @@ -1479,7 +1479,7 @@ class MouseClickDrag extends Pointing { } } -class DragScroll extends MouseClickDrag { +class MouseScrollGraph extends MouseClickDrag { startDrag() { this.blueprint.template.applyStartDragScrolling(this.blueprint); @@ -1576,13 +1576,13 @@ class PinTemplate extends Template { } } -class DragLink extends MouseClickDrag { +class MouseCreateLink extends MouseClickDrag { constructor(target, blueprint, options) { super(target, blueprint, options); - /** @type {import("../graph/GraphPin").default} */ + /** @type {import("../../graph/GraphPin").default} */ this.target; - /** @type {import("../graph/GraphLink").default} */ + /** @type {import("../../graph/GraphLink").default} */ this.link; } @@ -1612,7 +1612,7 @@ class GraphPin extends GraphElement { createInputObjects() { return [ - new DragLink(this.clickableElement, this.blueprint, { + new MouseCreateLink(this.clickableElement, this.blueprint, { moveEverywhere: true }), ] @@ -1825,7 +1825,7 @@ class NodeTemplate extends SelectableDraggableTemplate { } } -class DragMove extends MouseClickDrag { +class MouseMoveNodes extends MouseClickDrag { constructor(target, blueprint, options) { super(target, blueprint, options); @@ -1881,7 +1881,7 @@ class SelectableDraggable extends GraphElement { createInputObjects() { return [ - new DragMove(this, this.blueprint, { + new MouseMoveNodes(this, this.blueprint, { looseTarget: true }), ] @@ -2034,7 +2034,7 @@ class KeyvoardCanc extends KeyboardShortcut { /** * * @param {HTMLElement} target - * @param {import("../Blueprint").default} blueprint + * @param {import("../../Blueprint").default} blueprint * @param {OBject} options */ constructor(target, blueprint, options = {}) { @@ -2178,7 +2178,7 @@ class MouseWheel extends Pointing { /** * * @param {HTMLElement} target - * @param {import("../Blueprint").default} blueprint + * @param {import("../../Blueprint").default} blueprint * @param {Object} options */ constructor(target, blueprint, options) { @@ -2315,7 +2315,7 @@ class Blueprint extends GraphElement { exitAnyButton: true, moveEverywhere: true, }), - new DragScroll(this.getGridDOMElement(), this, { + new MouseScrollGraph(this.getGridDOMElement(), this, { clickButton: 2, exitAnyButton: false, looseTarget: true, diff --git a/js/Blueprint.js b/js/Blueprint.js index 01e508a..e5293d8 100755 --- a/js/Blueprint.js +++ b/js/Blueprint.js @@ -1,18 +1,18 @@ import BlueprintTemplate from "./template/BlueprintTemplate" import Configuration from "./Configuration" -import Copy from "./input/Copy" -import DragScroll from "./input/DragScroll" +import Copy from "./input/common/Copy" +import MouseScrollGraph from "./input/mouse/MouseScrollGraph" import GraphElement from "./graph/GraphElement" import GraphLink from "./graph/GraphLink" import GraphNode from "./graph/GraphNode" import GraphSelector from "./graph/GraphSelector" -import KeyboardCanc from "./input/KeyboardCanc" -import MouseTracking from "./input/MouseTracking" -import Paste from "./input/Paste" -import Select from "./input/Select" -import Unfocus from "./input/Unfocus" +import KeyboardCanc from "./input/keybaord/KeyboardCanc" +import MouseTracking from "./input/mouse/MouseTracking" +import Paste from "./input/common/Paste" +import Select from "./input/mouse/Select" +import Unfocus from "./input/mouse/Unfocus" import Utility from "./Utility" -import Zoom from "./input/Zoom" +import Zoom from "./input/mouse/Zoom" export default class Blueprint extends GraphElement { @@ -106,7 +106,7 @@ export default class Blueprint extends GraphElement { exitAnyButton: true, moveEverywhere: true, }), - new DragScroll(this.getGridDOMElement(), this, { + new MouseScrollGraph(this.getGridDOMElement(), this, { clickButton: 2, exitAnyButton: false, looseTarget: true, diff --git a/js/action/Actions.js b/js/action/Actions.js index 8b35a67..b9fd5bb 100755 --- a/js/action/Actions.js +++ b/js/action/Actions.js @@ -5,4 +5,4 @@ export default class Action { revert() { } -} \ No newline at end of file +} diff --git a/js/graph/GraphPin.js b/js/graph/GraphPin.js index 3e95f3d..ab8a255 100755 --- a/js/graph/GraphPin.js +++ b/js/graph/GraphPin.js @@ -1,6 +1,6 @@ import GraphElement from "./GraphElement" import PinTemplate from "../template/PinTemplate" -import DragLink from "../input/DragLink" +import MouseCreateLink from "../input/mouse/MouseCreateLink" import GraphLink from "./GraphLink" export default class GraphPin extends GraphElement { @@ -15,7 +15,7 @@ export default class GraphPin extends GraphElement { createInputObjects() { return [ - new DragLink(this.clickableElement, this.blueprint, { + new MouseCreateLink(this.clickableElement, this.blueprint, { moveEverywhere: true }), ] diff --git a/js/graph/SelectableDraggable.js b/js/graph/SelectableDraggable.js index b065a0f..9dcf0b5 100755 --- a/js/graph/SelectableDraggable.js +++ b/js/graph/SelectableDraggable.js @@ -1,4 +1,4 @@ -import DragMove from "../input/DragMove" +import MouseMoveNodes from "../input/mouse/MouseMoveNodes" import GraphElement from "./GraphElement" export default class SelectableDraggable extends GraphElement { @@ -19,7 +19,7 @@ export default class SelectableDraggable extends GraphElement { createInputObjects() { return [ - new DragMove(this, this.blueprint, { + new MouseMoveNodes(this, this.blueprint, { looseTarget: true }), ] diff --git a/js/input/Copy.js b/js/input/common/Copy.js similarity index 84% rename from js/input/Copy.js rename to js/input/common/Copy.js index 862ff7d..a520d3b 100755 --- a/js/input/Copy.js +++ b/js/input/common/Copy.js @@ -1,5 +1,5 @@ -import Context from "./Context" -import ObjectSerializer from "../serialization/ObjectSerializer" +import Context from "../Context" +import ObjectSerializer from "../../serialization/ObjectSerializer" export default class Copy extends Context { diff --git a/js/input/Paste.js b/js/input/common/Paste.js similarity index 87% rename from js/input/Paste.js rename to js/input/common/Paste.js index 4198f99..0f7b981 100755 --- a/js/input/Paste.js +++ b/js/input/common/Paste.js @@ -1,6 +1,6 @@ -import GraphNode from "../graph/GraphNode" -import ObjectSerializer from "../serialization/ObjectSerializer" -import Context from "./Context" +import GraphNode from "../../graph/GraphNode" +import ObjectSerializer from "../../serialization/ObjectSerializer" +import Context from "../Context" export default class Paste extends Context { diff --git a/js/input/KeyboardCanc.js b/js/input/keybaord/KeyboardCanc.js similarity index 79% rename from js/input/KeyboardCanc.js rename to js/input/keybaord/KeyboardCanc.js index 0c90d9d..bb86f4b 100755 --- a/js/input/KeyboardCanc.js +++ b/js/input/keybaord/KeyboardCanc.js @@ -1,5 +1,5 @@ import KeyboardShortcut from "./KeyboardShortcut" -import Configuration from "../Configuration" +import Configuration from "../../Configuration" export default class KeyvoardCanc extends KeyboardShortcut { @@ -7,7 +7,7 @@ export default class KeyvoardCanc extends KeyboardShortcut { /** * * @param {HTMLElement} target - * @param {import("../Blueprint").default} blueprint + * @param {import("../../Blueprint").default} blueprint * @param {OBject} options */ constructor(target, blueprint, options = {}) { diff --git a/js/input/KeyboardShortcut.js b/js/input/keybaord/KeyboardShortcut.js similarity index 93% rename from js/input/KeyboardShortcut.js rename to js/input/keybaord/KeyboardShortcut.js index f621cff..d9e7911 100755 --- a/js/input/KeyboardShortcut.js +++ b/js/input/keybaord/KeyboardShortcut.js @@ -1,4 +1,4 @@ -import Context from "./Context" +import Context from "../Context" export default class KeyboardShortcut extends Context { diff --git a/js/input/MouseClickDrag.js b/js/input/mouse/MouseClickDrag.js similarity index 100% rename from js/input/MouseClickDrag.js rename to js/input/mouse/MouseClickDrag.js diff --git a/js/input/DragLink.js b/js/input/mouse/MouseCreateLink.js similarity index 70% rename from js/input/DragLink.js rename to js/input/mouse/MouseCreateLink.js index e2384fb..bd25764 100755 --- a/js/input/DragLink.js +++ b/js/input/mouse/MouseCreateLink.js @@ -1,12 +1,12 @@ import MouseClickDrag from "./MouseClickDrag" -export default class DragLink extends MouseClickDrag { +export default class MouseCreateLink extends MouseClickDrag { constructor(target, blueprint, options) { super(target, blueprint, options) - /** @type {import("../graph/GraphPin").default} */ + /** @type {import("../../graph/GraphPin").default} */ this.target - /** @type {import("../graph/GraphLink").default} */ + /** @type {import("../../graph/GraphLink").default} */ this.link } diff --git a/js/input/DragMove.js b/js/input/mouse/MouseMoveNodes.js similarity index 92% rename from js/input/DragMove.js rename to js/input/mouse/MouseMoveNodes.js index a66cc62..da872e6 100755 --- a/js/input/DragMove.js +++ b/js/input/mouse/MouseMoveNodes.js @@ -1,6 +1,6 @@ import MouseClickDrag from "./MouseClickDrag" -export default class DragMove extends MouseClickDrag { +export default class MouseMoveNodes extends MouseClickDrag { constructor(target, blueprint, options) { super(target, blueprint, options) diff --git a/js/input/DragScroll.js b/js/input/mouse/MouseScrollGraph.js similarity index 81% rename from js/input/DragScroll.js rename to js/input/mouse/MouseScrollGraph.js index 8811e66..90ded72 100755 --- a/js/input/DragScroll.js +++ b/js/input/mouse/MouseScrollGraph.js @@ -1,6 +1,6 @@ import MouseClickDrag from "./MouseClickDrag" -export default class DragScroll extends MouseClickDrag { +export default class MouseScrollGraph extends MouseClickDrag { startDrag() { this.blueprint.template.applyStartDragScrolling(this.blueprint) diff --git a/js/input/MouseTracking.js b/js/input/mouse/MouseTracking.js similarity index 100% rename from js/input/MouseTracking.js rename to js/input/mouse/MouseTracking.js diff --git a/js/input/MouseWheel.js b/js/input/mouse/MouseWheel.js similarity index 92% rename from js/input/MouseWheel.js rename to js/input/mouse/MouseWheel.js index 460b060..a511288 100755 --- a/js/input/MouseWheel.js +++ b/js/input/mouse/MouseWheel.js @@ -5,7 +5,7 @@ export default class MouseWheel extends Pointing { /** * * @param {HTMLElement} target - * @param {import("../Blueprint").default} blueprint + * @param {import("../../Blueprint").default} blueprint * @param {Object} options */ constructor(target, blueprint, options) { diff --git a/js/input/Pointing.js b/js/input/mouse/Pointing.js similarity index 88% rename from js/input/Pointing.js rename to js/input/mouse/Pointing.js index f7d851b..81e6626 100755 --- a/js/input/Pointing.js +++ b/js/input/mouse/Pointing.js @@ -1,5 +1,5 @@ -import Context from "./Context" -import Utility from "../Utility" +import Context from "../Context" +import Utility from "../../Utility" export default class Pointing extends Context { diff --git a/js/input/Select.js b/js/input/mouse/Select.js similarity index 100% rename from js/input/Select.js rename to js/input/mouse/Select.js diff --git a/js/input/Unfocus.js b/js/input/mouse/Unfocus.js similarity index 92% rename from js/input/Unfocus.js rename to js/input/mouse/Unfocus.js index 6dd8234..36af19b 100755 --- a/js/input/Unfocus.js +++ b/js/input/mouse/Unfocus.js @@ -1,4 +1,4 @@ -import Context from "./Context" +import Context from "../Context" export default class Unfocus extends Context { diff --git a/js/input/Zoom.js b/js/input/mouse/Zoom.js similarity index 100% rename from js/input/Zoom.js rename to js/input/mouse/Zoom.js