Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
drawing-app
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
hlgr
drawing-app
Commits
57946746
Commit
57946746
authored
5 years ago
by
Yuriy Maksymets
Browse files
Options
Downloads
Patches
Plain Diff
Using namespace import for html elements
parent
a30e4dc6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app.js
+23
-38
23 additions, 38 deletions
src/app.js
src/elements.js
+13
-13
13 additions, 13 deletions
src/elements.js
with
36 additions
and
51 deletions
src/app.js
+
23
−
38
View file @
57946746
import
{
line
,
curveLinear
}
from
"
d3-shape
"
import
{
line
,
curveLinear
}
from
"
d3-shape
"
import
{
HTML
}
from
"
./elements.js
"
import
*
as
HTML
from
"
./elements.js
"
import
{
connect
}
from
"
./room.js
"
import
{
connect
}
from
"
./room.js
"
const
{
canvas
,
connectedPeers
,
peerButton
,
peerIDElem
,
userIDElem
,
roomIDElem
,
penButton
,
eraserButton
,
}
=
HTML
const
TEST_ROOM
=
"
imperial
"
const
TEST_ROOM
=
"
imperial
"
// TODO: switch to curve interpolation that respects mouse points based on velocity
// TODO: switch to curve interpolation that respects mouse points based on velocity
...
@@ -46,7 +35,7 @@ const addOrUpdatePathElem = (id, points) => {
...
@@ -46,7 +35,7 @@ const addOrUpdatePathElem = (id, points) => {
pathElem
.
setAttribute
(
"
marker-start
"
,
"
url(#dot)
"
)
pathElem
.
setAttribute
(
"
marker-start
"
,
"
url(#dot)
"
)
pathElem
.
setAttribute
(
"
marker-end
"
,
"
url(#dot)
"
)
pathElem
.
setAttribute
(
"
marker-end
"
,
"
url(#dot)
"
)
canvas
.
appendChild
(
pathElem
)
HTML
.
canvas
.
appendChild
(
pathElem
)
pathElems
.
set
(
id
,
pathElem
)
pathElems
.
set
(
id
,
pathElem
)
}
}
...
@@ -113,10 +102,6 @@ function setElemVisible(elem, visible = true) {
...
@@ -113,10 +102,6 @@ function setElemVisible(elem, visible = true) {
elem
.
style
.
display
=
visible
?
"
block
"
:
"
none
"
elem
.
style
.
display
=
visible
?
"
block
"
:
"
none
"
}
}
// function hideConnectedRoom() {
// setElemVisible(HTML.connectedRoomInfoContainer, false)
// }
function
showConnectedRoom
(
roomID
)
{
function
showConnectedRoom
(
roomID
)
{
HTML
.
connectedRoomID
.
textContent
=
roomID
HTML
.
connectedRoomID
.
textContent
=
roomID
setElemVisible
(
HTML
.
connectedRoomInfoContainer
)
setElemVisible
(
HTML
.
connectedRoomInfoContainer
)
...
@@ -134,7 +119,7 @@ function setBlankUIState() {
...
@@ -134,7 +119,7 @@ function setBlankUIState() {
}
}
function
handleRoomConnectClick
()
{
function
handleRoomConnectClick
()
{
const
selectedRoomID
=
roomIDElem
.
value
const
selectedRoomID
=
HTML
.
roomIDElem
.
value
if
(
!
selectedRoomID
)
return
if
(
!
selectedRoomID
)
return
setBlankUIState
()
setBlankUIState
()
...
@@ -149,21 +134,21 @@ function handleRoomConnectionEstablished(room) {
...
@@ -149,21 +134,21 @@ function handleRoomConnectionEstablished(room) {
let
currentTool
=
tools
.
PEN
let
currentTool
=
tools
.
PEN
let
currentPathID
=
null
let
currentPathID
=
null
userIDElem
.
value
=
room
.
ownID
||
""
HTML
.
userIDElem
.
value
=
room
.
ownID
||
""
room
.
addEventListener
(
"
allocateOwnID
"
,
({
detail
:
id
})
=>
{
room
.
addEventListener
(
"
allocateOwnID
"
,
({
detail
:
id
})
=>
{
userIDElem
.
value
=
id
HTML
.
userIDElem
.
value
=
id
})
})
room
.
addEventListener
(
"
userJoin
"
,
({
detail
:
id
})
=>
{
room
.
addEventListener
(
"
userJoin
"
,
({
detail
:
id
})
=>
{
const
peerElem
=
document
.
createElement
(
"
li
"
)
const
peerElem
=
document
.
createElement
(
"
li
"
)
peerElem
.
innerHTML
=
id
peerElem
.
innerHTML
=
id
connectedPeers
.
appendChild
(
peerElem
)
HTML
.
connectedPeers
.
appendChild
(
peerElem
)
})
})
room
.
addEventListener
(
"
userLeave
"
,
({
detail
:
id
})
=>
{
room
.
addEventListener
(
"
userLeave
"
,
({
detail
:
id
})
=>
{
for
(
const
peerElem
of
connectedPeers
.
children
)
{
for
(
const
peerElem
of
HTML
.
connectedPeers
.
children
)
{
if
(
peerElem
.
innerHTML
==
id
)
{
if
(
peerElem
.
innerHTML
==
id
)
{
connectedPeers
.
removeChild
(
peerElem
)
HTML
.
connectedPeers
.
removeChild
(
peerElem
)
}
}
}
}
})
})
...
@@ -172,7 +157,7 @@ function handleRoomConnectionEstablished(room) {
...
@@ -172,7 +157,7 @@ function handleRoomConnectionEstablished(room) {
addOrUpdatePathElem
(
id
,
points
)
addOrUpdatePathElem
(
id
,
points
)
})
})
canvas
.
addEventListener
(
"
mousedown
"
,
(
e
)
=>
{
HTML
.
canvas
.
addEventListener
(
"
mousedown
"
,
(
e
)
=>
{
userInput
=
true
userInput
=
true
let
mouse
=
[
e
.
offsetX
,
e
.
offsetY
]
let
mouse
=
[
e
.
offsetX
,
e
.
offsetY
]
...
@@ -190,15 +175,15 @@ function handleRoomConnectionEstablished(room) {
...
@@ -190,15 +175,15 @@ function handleRoomConnectionEstablished(room) {
}
}
})
})
canvas
.
addEventListener
(
"
mouseleave
"
,
()
=>
{
HTML
.
canvas
.
addEventListener
(
"
mouseleave
"
,
()
=>
{
userInput
=
false
userInput
=
false
})
})
canvas
.
addEventListener
(
"
mouseup
"
,
()
=>
{
HTML
.
canvas
.
addEventListener
(
"
mouseup
"
,
()
=>
{
userInput
=
false
userInput
=
false
})
})
canvas
.
addEventListener
(
"
mousemove
"
,
(
e
)
=>
{
HTML
.
canvas
.
addEventListener
(
"
mousemove
"
,
(
e
)
=>
{
if
(
!
userInput
)
{
if
(
!
userInput
)
{
return
return
}
}
...
@@ -218,32 +203,32 @@ function handleRoomConnectionEstablished(room) {
...
@@ -218,32 +203,32 @@ function handleRoomConnectionEstablished(room) {
}
}
})
})
peerButton
.
addEventListener
(
"
click
"
,
()
=>
{
HTML
.
peerButton
.
addEventListener
(
"
click
"
,
()
=>
{
const
peerID
=
peerIDElem
.
value
const
peerID
=
HTML
.
peerIDElem
.
value
if
(
peerID
==
""
)
{
if
(
peerID
==
""
)
{
return
return
}
}
room
.
inviteUser
(
peerID
)
room
.
inviteUser
(
peerID
)
peerIDElem
.
value
=
""
HTML
.
peerIDElem
.
value
=
""
})
})
penButton
.
addEventListener
(
"
click
"
,
()
=>
{
HTML
.
penButton
.
addEventListener
(
"
click
"
,
()
=>
{
currentTool
=
tools
.
PEN
currentTool
=
tools
.
PEN
penButton
.
classList
.
add
(
"
selected
"
)
HTML
.
penButton
.
classList
.
add
(
"
selected
"
)
eraserButton
.
classList
.
remove
(
"
selected
"
)
HTML
.
eraserButton
.
classList
.
remove
(
"
selected
"
)
})
})
eraserButton
.
addEventListener
(
"
click
"
,
()
=>
{
HTML
.
eraserButton
.
addEventListener
(
"
click
"
,
()
=>
{
currentTool
=
tools
.
ERASER
currentTool
=
tools
.
ERASER
penButton
.
classList
.
remove
(
"
selected
"
)
HTML
.
penButton
.
classList
.
remove
(
"
selected
"
)
eraserButton
.
classList
.
add
(
"
selected
"
)
HTML
.
eraserButton
.
classList
.
add
(
"
selected
"
)
})
})
HTML
.
roomConnectButton
.
addEventListener
(
"
click
"
,
()
=>
{
HTML
.
roomConnectButton
.
addEventListener
(
"
click
"
,
()
=>
{
room
=
undefined
room
=
undefined
handleRoomConnectClick
(
room
)
handleRoomConnectClick
()
})
})
}
}
...
@@ -258,7 +243,7 @@ function connectToARoom(roomID) {
...
@@ -258,7 +243,7 @@ function connectToARoom(roomID) {
}
}
HTML
.
roomConnectButton
.
addEventListener
(
"
click
"
,
()
=>
{
HTML
.
roomConnectButton
.
addEventListener
(
"
click
"
,
()
=>
{
//
handleRoomConnectClick()
handleRoomConnectClick
()
})
})
connectToARoom
(
TEST_ROOM
)
connectToARoom
(
TEST_ROOM
)
This diff is collapsed.
Click to expand it.
src/elements.js
+
13
−
13
View file @
57946746
export
const
HTML
=
{
export
const
userIDElem
=
document
.
getElementById
(
"
user-id
"
)
userIDElem
:
document
.
getElementById
(
"
user-id
"
),
peerIDElem
:
document
.
getElementById
(
"
peer-id
"
)
,
export
const
peerIDElem
=
document
.
getElementById
(
"
peer-id
"
)
peerButton
:
document
.
getElementById
(
"
peer-connect
"
)
,
export
const
peerButton
=
document
.
getElementById
(
"
peer-connect
"
)
connectedPeers
:
document
.
getElementById
(
"
connected-peers
"
)
,
export
const
connectedPeers
=
document
.
getElementById
(
"
connected-peers
"
)
canvas
:
document
.
getElementById
(
"
canvas
"
)
,
export
const
canvas
=
document
.
getElementById
(
"
canvas
"
)
penButton
:
document
.
getElementById
(
"
pen-tool
"
)
,
export
const
penButton
=
document
.
getElementById
(
"
pen-tool
"
)
eraserButton
:
document
.
getElementById
(
"
eraser-tool
"
)
,
export
const
eraserButton
=
document
.
getElementById
(
"
eraser-tool
"
)
roomIDElem
:
document
.
getElementById
(
"
room-id
"
),
export
const
roomIDElem
=
document
.
getElementById
(
"
room-id
"
)
roomConnectButton
:
document
.
getElementById
(
"
room-connect
"
),
export
const
roomConnectButton
=
document
.
getElementById
(
"
room-connect
"
)
connectedRoomID
:
document
.
getElementById
(
"
connected-room-id
"
),
export
const
connectedRoomID
=
document
.
getElementById
(
"
connected-room-id
"
)
connectedRoomInfoContainer
:
document
.
getElementById
(
"
connected-room-info
"
),
export
const
connectedRoomInfoContainer
=
document
.
getElementById
(
}
"
connected-room-info
"
,
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment