Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ehasa-frontend
Manage
Activity
Members
Labels
Plan
Issues
2
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
WIMMA Lab 2019
Overflow
ehasa-frontend
Merge requests
!20
Add tracked players to map
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Add tracked players to map
49-seurattavien-pelaajien-piirtaminen-karttaan
into
development
Overview
0
Commits
4
Pipelines
0
Changes
5
Merged
L4929
requested to merge
49-seurattavien-pelaajien-piirtaminen-karttaan
into
development
5 years ago
Overview
0
Commits
4
Pipelines
0
Changes
5
Expand
added new component: Player.js
get current player locations from back-end, which returns only the most recent entries for each player
currently only checks locations once; need to update when websocket is implemented and can be tested
also fixed rectangle and circle dragging bug
Edited
5 years ago
by
L4929
👍
0
👎
0
Merge request reports
Compare
development
development (base)
and
latest version
latest version
7989e90c
4 commits,
5 years ago
5 files
+
128
−
29
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
5
Search (e.g. *.vue) (Ctrl+P)
src/components/DrawTools.js
+
2
−
2
Options
@@ -252,14 +252,14 @@ class DrawTools extends Component {
onDeleteStop
=
{
this
.
_onEditDeleteStop
}
draw
=
{{
circle
:
{
repeatMode
:
tru
e
,
// allows using the tool again after finishing the previous shape
repeatMode
:
fals
e
,
// allows using the tool again after finishing the previous shape
shapeOptions
:
{
color
:
"
#f9f10c
"
,
opacity
:
1
// affects the outline only. for some reason it wasn't at full opacity, so this is needed for more clarity
}
},
rectangle
:
{
repeatMode
:
tru
e
repeatMode
:
fals
e
},
polygon
:
{
repeatMode
:
true
,
Loading