Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
x3domlet
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Elphel
x3domlet
Commits
f47abc96
Commit
f47abc96
authored
7 years ago
by
Rurik Bugdanov
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
3be8d1f8
6d22b1ba
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
x3dom_init.js
js/x3dom_init.js
+12
-1
No files found.
js/x3dom_init.js
View file @
f47abc96
...
...
@@ -950,7 +950,18 @@ X3DOMObject.PointerMarker.prototype._registerEvents = function(){
var
self
=
this
;
var
Camera
=
Map
.
marker
;
self
.
_shape
.
on
(
"click"
,
function
(
e
){
// PointerMarker MouseEvent are not triggered when isPickable is false
$
(
window
).
on
(
'mousedown'
,
function
(
e
){
self
.
_shape
.
attr
(
'isPickable'
,
true
);
});
$
(
window
).
on
(
'mouseup'
,
function
(){
self
.
_shape
.
attr
(
'isPickable'
,
false
);
});
// window mousedown above is run after x3dom mousedown handler
// so we must listen to x3dom 'mouseup' instead of 'click' below
self
.
_shape
.
on
(
"mouseup"
,
function
(
e
){
X3DOMObject
.
Marker
.
dehighlight
(
self
.
_elem
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment