Skip to content
This repository was archived by the owner on Sep 22, 2020. It is now read-only.

Commit 51de293

Browse files
committed
Fixed some IE related bugs. It should work in IE9+
1 parent 42c4de4 commit 51de293

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ The plugin does not include a GUI/Form. It only handles the logic to draw marker
55

66
## Requirements
77

8-
* jQuery 1.7+
9-
* HTML2Canvas
8+
* jQuery 1.8.3+
9+
* HTML2Canvas v0.34
1010

1111
## Demos
1212

@@ -24,6 +24,7 @@ HTMLFeedback is tested in:
2424
* Safari 5+
2525
* Firefox 8+
2626
* iOS 5+
27+
* IE9+ (preferably IE10)
2728

2829
HTMLFeedback is Beta, so please help me find bugs!
2930

examples/advanced.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
4+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
55

66
<!-- Begin HTMLFeedback -->
77
<link rel="stylesheet" type="text/css" href="css/htmlfeedback.css">

examples/basic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
4+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
55

66
<!-- Begin HTMLFeedback -->
77
<link rel="stylesheet" type="text/css" href="css/htmlfeedback.css">

examples/upload.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
4+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
55

66
<!-- Begin HTMLFeedback -->
77
<link rel="stylesheet" type="text/css" href="css/htmlfeedback.css">

jquery.htmlfeedback.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,8 @@
144144

145145
// CSS for the rectangles container
146146
markers: {
147-
"z-index": 5000
147+
"z-index": 5000,
148+
"background-color": "rgba(0,0,0,0)"
148149
},
149150

150151
// CSS for the rectangles drawn
@@ -161,7 +162,7 @@
161162
"-moz-user-select": "-moz-none",
162163
"-khtml-user-select": "none",
163164
"-webkit-user-select": "none",
164-
"user-select": "none",
165+
"user-select": "none"
165166
}
166167
}
167168

@@ -260,7 +261,7 @@
260261
/**
261262
* @var callback Hide event
262263
*/
263-
onHide: function() {},
264+
onHide: function() {}
264265
}
265266

266267
/**
@@ -468,12 +469,13 @@
468469
markers.mousedown(function(e) {
469470
rectangle = $("<div />").css({
470471
"left" : e.pageX,
471-
"top" : e.pageY,
472+
"top" : e.pageY
472473
}).css($.extend(
473474
css.rectangle,
474475
css.unselectable,
475476
{ "background-color": instance.options.color }
476477
));
478+
//alert(instance.options.color);
477479

478480
var rectangleLeft = e.pageX;
479481
var rectangleTop = e.pageY;

0 commit comments

Comments
 (0)