mirror/spacedeck-open
1
0
Fork 0
mirror of https://github.com/spacedeck/spacedeck-open.git synced 2025-12-15 17:37:30 +01:00
Code Issues Projects Releases Wiki Activity

space: deselect when using tools; normalize note tool behavior

Browse Source
This commit is contained in:
mntmn
2020-09-28 00:04:18 +02:00
parent 2a2c7011c0
commit 7c6d5c83db
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/javascripts/spacedeck_sections.js
View File

@@ -2555,7 +2555,18 @@ var SpacedeckSections = {
evt = fixup_touches(evt);
},
start_adding_note: function(evt) {
this.deselect();
if (this.active_tool == "note") {
this.active_tool = "pointer";
} else {
this.active_tool = "note";
}
this.opened_dialog = "none";
},
start_drawing_scribble: function(evt) {
this.deselect();
if (this.active_tool == "scribble") {
this.active_tool = "pointer";
} else {
@@ -2565,11 +2576,13 @@ var SpacedeckSections = {
},
start_drawing_arrow: function(evt) {
this.deselect();
this.active_tool = "arrow";
this.opened_dialog = "none";
},
start_drawing_line: function(evt) {
this.deselect();
this.active_tool = "line";
this.opened_dialog = "none";
},

2
views/partials/tool/toolbar-elements.html
View File

@@ -52,7 +52,7 @@
<div class="dropdown bottom light center">
<div class="btn-collapse in">
<button class="btn btn-transparent btn-icon-labeled" v-on:click="active_tool='note'" v-bind:class="{active:active_tool=='note'}">
<button class="btn btn-transparent btn-icon-labeled" v-on:click="start_adding_note()" v-bind:class="{active:active_tool=='note'}">
<span class="icon icon-tool-text"></span>
<span class="icon-label"><%=__("tool_text")%></span>
</button>