mirror/spacedeck-open
1
0
Fork 0
mirror of https://github.com/spacedeck/spacedeck-open.git synced 2026-01-31 07:15:25 +01:00
Code Issues Projects Releases Wiki Activity

touch (tablet): fix deselect when tapping space; add edit text button

Browse Source
This commit is contained in:
Lukas F. Hartmann
2020-12-18 17:07:32 +01:00
parent 16e926b76a
commit 82515e3a8e
5 changed files with 46 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
locales/en.js
View File

@@ -322,6 +322,7 @@
"follow_present": "Follow", "follow_present": "Follow",
"mute_present": "Unfollow", "mute_present": "Unfollow",
"follow_present_help": "If someone else is presenting this Space, the other members automatically follow the presentation. Switch following on or off with this button.", "follow_present_help": "If someone else is presenting this Space, the other members automatically follow the presentation. Switch following on or off with this button.",
"export": "export", "export": "Export",
"media": "Media" "media": "Media",
"tool_edit_text": "Edit Text"
} }

7
public/javascripts/spacedeck_sections.js
View File

@@ -1923,10 +1923,7 @@ var SpacedeckSections = {
}.bind(this)); }.bind(this));
}, },
delayed_edit_artifact: function(evt) { delayed_edit_artifact: function() {
evt.stopPropagation();
evt.preventDefault();
var a = this.selected_artifacts()[0]; var a = this.selected_artifacts()[0];
var el = $("#ios-focuser-"+a._id); var el = $("#ios-focuser-"+a._id);
@@ -2087,8 +2084,6 @@ var SpacedeckSections = {
if (a.description!=dom.innerHTML) { if (a.description!=dom.innerHTML) {
a.description = dom.innerHTML; a.description = dom.innerHTML;
console.log("new DOM:",dom.innerHTML);
this.update_board_artifact_viewmodel(a); this.update_board_artifact_viewmodel(a);
this.queue_artifact_for_save(a); this.queue_artifact_for_save(a);

1
public/javascripts/spacedeck_whiteboard.js
View File

@@ -285,6 +285,7 @@ function setup_whiteboard_directives() {
$scope.start_adding_placeholder(evt); $scope.start_adding_placeholder(evt);
return; return;
} else if ($scope.active_tool=="pan") { } else if ($scope.active_tool=="pan") {
this.deselect();
this.start_pan(evt); this.start_pan(evt);
return; return;
} }

2
views/partials/space.html
View File

@@ -85,13 +85,13 @@
v-bind:class="{text-editing:(editing_artifact_id==a._id && (a.view.major_type=='text' || a.view.major_type=='shape'))}" v-bind:class="{text-editing:(editing_artifact_id==a._id && (a.view.major_type=='text' || a.view.major_type=='shape'))}"
id="artifact-{{a._id}}"> id="artifact-{{a._id}}">
<div v-if="a.view && a.view.major_type" style="height:100%; width:100%" v-bind:title="(a.editor_name || (a.user && a.user.nickname) || '')"> <div v-if="a.view && a.view.major_type" style="height:100%; width:100%" v-bind:title="(a.editor_name || (a.user && a.user.nickname) || '')">
<span v-if="a.locked && is_selected(a)" class="link-wrapper"> <span v-if="a.locked && is_selected(a)" class="link-wrapper">
<span class="btn btn-sm btn-icon btn-round btn-primary"> <span class="btn btn-sm btn-icon btn-round btn-primary">
<span class="icon icon-lock-closed"></span> <span class="icon icon-lock-closed"></span>
</span> </span>
</span> </span>
<!-- text --> <!-- text -->
<div v-if="a.view.major_type == 'text'" class="text" v-bind:style="a.view.inner_style"> <div v-if="a.view.major_type == 'text'" class="text" v-bind:style="a.view.inner_style">
<div class="text-table"> <div class="text-table">

11
views/partials/tool/toolbar-object.html
View File

@@ -97,6 +97,17 @@
<button class="btn btn-divider"></button> <button class="btn btn-divider"></button>
<div class="dropdown bottom light center">
<div class="btn-collapse" v-bind:class="{in:selection_metrics.contains_text}">
<button
class="btn btn-icon-labeled btn-transparent"
v-on:click="delayed_edit_artifact()">
<span class="icon icon-pencil"></span>
<span class="icon-label"><%=__("tool_edit_text")%></span>
</button>
</div>
</div>
<div class="dropdown top light right" v-bind:class="{open:opened_dialog=='object-options'}"> <div class="dropdown top light right" v-bind:class="{open:opened_dialog=='object-options'}">
<button class="btn btn-transparent btn-icon-labeled" v-on:click="open_dialog('object-options')" v-bind:class="{open : opened_dialog=='object-options'}"> <button class="btn btn-transparent btn-icon-labeled" v-on:click="open_dialog('object-options')" v-bind:class="{open : opened_dialog=='object-options'}">
<span class="icon icon-cogwheel"></span> <span class="icon icon-cogwheel"></span>