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
94c70f40
Commit
94c70f40
authored
Jun 29, 2017
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed trailing spaces
parent
ef1c7c6f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
x3dom_init.js
js/x3dom_init.js
+6
-6
No files found.
js/x3dom_init.js
View file @
94c70f40
...
@@ -734,7 +734,7 @@ X3DOMObject.Marker.prototype._registerEvents = function(){
...
@@ -734,7 +734,7 @@ X3DOMObject.Marker.prototype._registerEvents = function(){
X3DOMObject
.
Marker
.
mouseUp
.
apply
(
self
,[
event
]);
X3DOMObject
.
Marker
.
mouseUp
.
apply
(
self
,[
event
]);
}
}
});
});
});
});
marker
.
on
(
'mouseup'
,
function
(
e
){
marker
.
on
(
'mouseup'
,
function
(
e
){
...
@@ -759,12 +759,12 @@ X3DOMObject.Marker.mouseUp = function(){
...
@@ -759,12 +759,12 @@ X3DOMObject.Marker.mouseUp = function(){
X3DOMObject.Marker.toggle(elem);
X3DOMObject.Marker.toggle(elem);
}
}
*/
*/
Scene
.
markerToDrag
=
null
;
Scene
.
markerToDrag
=
null
;
Scene
.
element
.
removeEventListener
(
'mouseup'
,
X3DOMObject
.
Marker
.
mouseUp
,
true
);
Scene
.
element
.
removeEventListener
(
'mouseup'
,
X3DOMObject
.
Marker
.
mouseUp
,
true
);
Scene
.
element
.
removeEventListener
(
'mousemove'
,
X3DOMObject
.
Marker
.
mouseMove
,
true
);
Scene
.
element
.
removeEventListener
(
'mousemove'
,
X3DOMObject
.
Marker
.
mouseMove
,
true
);
$
(
window
).
off
(
'.drag_marker'
);
$
(
window
).
off
(
'.drag_marker'
);
Scene
.
draggedTransformNode
=
null
;
Scene
.
draggedTransformNode
=
null
;
Scene
.
draggingUpVec
=
null
;
Scene
.
draggingUpVec
=
null
;
Scene
.
draggingRightVec
=
null
;
Scene
.
draggingRightVec
=
null
;
...
@@ -976,7 +976,7 @@ X3DOMObject.PointerMarker.prototype._registerEvents = function(){
...
@@ -976,7 +976,7 @@ X3DOMObject.PointerMarker.prototype._registerEvents = function(){
// window mousedown above is run after x3dom mousedown handler
// window mousedown above is run after x3dom mousedown handler
// so we must listen to x3dom 'mouseup' instead of 'click' below
// so we must listen to x3dom 'mouseup' instead of 'click' below
self
.
_shape
.
on
(
"mouseup"
,
function
(
e
){
self
.
_shape
.
on
(
"mouseup"
,
function
(
e
){
X3DOMObject
.
Marker
.
dehighlight
(
self
.
_elem
);
X3DOMObject
.
Marker
.
dehighlight
(
self
.
_elem
);
var
xyz
=
$
(
this
).
parent
().
attr
(
"translation"
);
var
xyz
=
$
(
this
).
parent
().
attr
(
"translation"
);
...
@@ -1317,5 +1317,5 @@ X3DOMObject.displayMarkInfo = function(index){
...
@@ -1317,5 +1317,5 @@ X3DOMObject.displayMarkInfo = function(index){
}
else
{
}
else
{
ui_showMessage
(
"window-markinfo"
,
msg
);
ui_showMessage
(
"window-markinfo"
,
msg
);
}
}
}
}
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