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: fix artifact z-stacking tool

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

9
public/javascripts/spacedeck_board_artifacts.js
View File

@@ -233,7 +233,7 @@ var SpacedeckBoardArtifacts = {
}, },
artifact_thumbnail_uri: function(a) { artifact_thumbnail_uri: function(a) {
if (a.payload_thumbnail_big_uri && a.board) { if (a.payload_thumbnail_big_uri) {
if (a.w>800) { if (a.w>800) {
return a.payload_thumbnail_big_uri; return a.payload_thumbnail_big_uri;
} }
@@ -360,7 +360,8 @@ var SpacedeckBoardArtifacts = {
var overlapping = _.filter(this.artifacts_in_rect(rect), function(a){return !this.is_selected(a)}.bind(this)); var overlapping = _.filter(this.artifacts_in_rect(rect), function(a){return !this.is_selected(a)}.bind(this));
var max_z = _.max(overlapping,function(a){ return a.z; }); var max_z = _.max(overlapping,function(a){ return a.z; });
if (max_z.board) {
if (max_z.z) {
max_z = max_z.z + 1; max_z = max_z.z + 1;
} else { } else {
max_z = 1; max_z = 1;
@@ -378,13 +379,13 @@ var SpacedeckBoardArtifacts = {
var overlapping = _.filter(this.artifacts_in_rect(rect), function(a){return !this.is_selected(a);}.bind(this)); var overlapping = _.filter(this.artifacts_in_rect(rect), function(a){return !this.is_selected(a);}.bind(this));
var min_z = _.min(overlapping,function(a){ return a.z; }); var min_z = _.min(overlapping,function(a){ return a.z; });
if (min_z.board) { if (min_z.z) {
min_z = min_z.z - 1; min_z = min_z.z - 1;
} else { } else {
min_z = 0; min_z = 0;
} }
var my_z = _.max(this.selected_artifacts(),function(a){ return a.z; }); var my_z = _.max(this.selected_artifacts(),function(a){ return a.z; });
if (my_z.board) { if (my_z.z) {
my_z = my_z.z - 1; my_z = my_z.z - 1;
} else { } else {
my_z = 0; my_z = 0;