projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #715 from simonkwesi/patch-1
[dygraphs.git]
/
tests
/
drawing.html
diff --git
a/tests/drawing.html
b/tests/drawing.html
index
fceab6a
..
270b44e
100644
(file)
--- a/
tests/drawing.html
+++ b/
tests/drawing.html
@@
-1,16
+1,12
@@
<!DOCTYPE html>
<html>
<head>
<!DOCTYPE html>
<html>
<head>
- <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7; IE=EmulateIE9">
<title>Dygraphs Drawing Demo</title>
<title>Dygraphs Drawing Demo</title>
- <!--[if IE]>
- <script type="text/javascript" src="../excanvas.js"></script>
- <![endif]-->
<!--
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
<!--
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../d
ygraph-dev
.js"></script>
+ <script type="text/javascript" src="../d
ist/dygraph
.js"></script>
<script>
var start_date = new Date("2002/12/29").getTime();
<script>
var start_date = new Date("2002/12/29").getTime();
@@
-151,13
+147,7
@@
if (tool == 'zoom') {
Dygraph.defaultInteractionModel.mousedown(event, g, context);
} else {
if (tool == 'zoom') {
Dygraph.defaultInteractionModel.mousedown(event, g, context);
} else {
- // prevents mouse drags from selecting page text.
- if (event.preventDefault) {
- event.preventDefault(); // Firefox, Chrome, etc.
- } else {
- event.returnValue = false; // IE
- event.cancelBubble = true;
- }
+ event.preventDefault(); // Firefox, Chrome, etc.
isDrawing = true;
setPoint(event, g, context);
}
isDrawing = true;
setPoint(event, g, context);
}
@@
-199,7
+189,7
@@
g.updateOptions({
dateWindow: dateWindow
});
g.updateOptions({
dateWindow: dateWindow
});
-
Dygraph.cancelEvent(event
);
+
event.preventDefault(
);
}
},
strokeWidth: 1.5,
}
},
strokeWidth: 1.5,