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
3be8d1f8
Commit
3be8d1f8
authored
7 years ago
by
Rurik Bugdanov
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
465465ee
1443208a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
x3dom_init.js
js/x3dom_init.js
+2
-1
No files found.
js/x3dom_init.js
View file @
3be8d1f8
...
@@ -938,6 +938,7 @@ X3DOMObject.PointerMarker.prototype._init = function(){
...
@@ -938,6 +938,7 @@ X3DOMObject.PointerMarker.prototype._init = function(){
this
.
_elem
=
Scene
.
createMarker
(
0
,
0
,
0
,
"sliding_sphere"
);
this
.
_elem
=
Scene
.
createMarker
(
0
,
0
,
0
,
"sliding_sphere"
);
this
.
_shape
=
this
.
_elem
.
find
(
"shape"
);
this
.
_shape
=
this
.
_elem
.
find
(
"shape"
);
this
.
_shape
.
attr
(
'isPickable'
,
false
);
this
.
_registerEvents
();
this
.
_registerEvents
();
this
.
_elem
.
find
(
"switch"
).
attr
(
"whichChoice"
,
-
1
);
this
.
_elem
.
find
(
"switch"
).
attr
(
"whichChoice"
,
-
1
);
...
@@ -1291,5 +1292,5 @@ X3DOMObject.displayMarkInfo = function(index){
...
@@ -1291,5 +1292,5 @@ X3DOMObject.displayMarkInfo = function(index){
}
else
{
}
else
{
ui_showMessage
(
"window-markinfo"
,
msg
);
ui_showMessage
(
"window-markinfo"
,
msg
);
}
}
}
}
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