Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
freecad_x3d
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
freecad_x3d
Commits
7d3b3d7b
Commit
7d3b3d7b
authored
Dec 24, 2015
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.touch-click - rolled back to x3om 1.7.0
parent
129e141c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
viewmodel.js
x3d_web_viewer/viewmodel.js
+3
-2
No files found.
x3d_web_viewer/viewmodel.js
View file @
7d3b3d7b
...
@@ -108,7 +108,8 @@ function prerun(){
...
@@ -108,7 +108,8 @@ function prerun(){
//load x3dom.js
//load x3dom.js
//$.getScript("x3dom-1.7.0/x3dom.js");
//$.getScript("x3dom-1.7.0/x3dom.js");
$
.
getScript
(
"http://x3dom.org/download/1.7.1/x3dom.js"
);
//$.getScript("http://x3dom.org/download/1.7.1/x3dom.js");
$
.
getScript
(
"http://x3dom.org/download/1.7/x3dom.js"
);
var
settings
=
$
(
"<div>"
).
load
(
settings_file
,
function
(
response
,
status
,
xhr
){
var
settings
=
$
(
"<div>"
).
load
(
settings_file
,
function
(
response
,
status
,
xhr
){
if
(
xhr
.
status
==
200
){
if
(
xhr
.
status
==
200
){
...
@@ -666,8 +667,8 @@ function touchmoved(){
...
@@ -666,8 +667,8 @@ function touchmoved(){
//blockclick = true;
//blockclick = true;
if
((
getTimeStamp
()
-
moveTimeStamp
)
>
100
){
if
((
getTimeStamp
()
-
moveTimeStamp
)
>
100
){
blockclick
=
true
;
blockclick
=
true
;
dragging
=
true
;
}
}
dragging
=
true
;
move_history
.
push
(
getMoveState
(
event
));
move_history
.
push
(
getMoveState
(
event
));
console
.
log
(
"touchmoved()"
);
console
.
log
(
"touchmoved()"
);
}
}
...
...
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