-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Some fixes for resize. It becomes to work more stability. (#200)
- Loading branch information
Showing
2 changed files
with
43 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
From 5eeb1092c64865c555671ed585da18f974c9c10c Mon Sep 17 00:00:00 2001 | ||
From d44089dfc96b56d427d5631442d6587f876f43b6 Mon Sep 17 00:00:00 2001 | ||
From: Boris Sekachev <[email protected]> | ||
Date: Tue, 18 Sep 2018 15:58:20 +0300 | ||
Date: Mon, 19 Nov 2018 12:09:48 +0300 | ||
Subject: [PATCH] tmp | ||
|
||
--- | ||
.../engine/static/engine/js/3rdparty/svg.draggable.js | 1 + | ||
cvat/apps/engine/static/engine/js/3rdparty/svg.draw.js | 17 +++++++++++++++-- | ||
.../apps/engine/static/engine/js/3rdparty/svg.resize.js | 5 +++-- | ||
.../apps/engine/static/engine/js/3rdparty/svg.resize.js | 6 ++++-- | ||
.../apps/engine/static/engine/js/3rdparty/svg.select.js | 5 ++++- | ||
4 files changed, 23 insertions(+), 5 deletions(-) | ||
4 files changed, 24 insertions(+), 5 deletions(-) | ||
|
||
diff --git a/cvat/apps/engine/static/engine/js/3rdparty/svg.draggable.js b/cvat/apps/engine/static/engine/js/3rdparty/svg.draggable.js | ||
index d88abf5..aba474c 100644 | ||
|
@@ -78,7 +78,7 @@ index 68dbf2a..20a6917 100644 | |
} | ||
|
||
diff --git a/cvat/apps/engine/static/engine/js/3rdparty/svg.resize.js b/cvat/apps/engine/static/engine/js/3rdparty/svg.resize.js | ||
index 0c3b63d..fb5dc26 100644 | ||
index 0c3b63d..dceede5 100644 | ||
--- a/cvat/apps/engine/static/engine/js/3rdparty/svg.resize.js | ||
+++ b/cvat/apps/engine/static/engine/js/3rdparty/svg.resize.js | ||
@@ -34,8 +34,8 @@ | ||
|
@@ -92,7 +92,15 @@ index 0c3b63d..fb5dc26 100644 | |
}; | ||
}; | ||
|
||
@@ -343,6 +343,7 @@ | ||
@@ -98,6 +98,7 @@ | ||
}; | ||
|
||
ResizeHandler.prototype.resize = function (event) { | ||
+ if (event.detail.event.button) return; // only left mouse button | ||
|
||
var _this = this; | ||
|
||
@@ -343,6 +344,7 @@ | ||
} | ||
return; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters