Skip to content

Commit ba6e0ad

Browse files
committed
revert jquery UI to 1.10.2 to avoid IE draggable offset error
1 parent 15f1c56 commit ba6e0ad

File tree

7 files changed

+33
-6
lines changed

7 files changed

+33
-6
lines changed

css/rc_calendar.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
.clearfix {
1010
display: inline-block; }
1111

12+
.rc_day_target {
13+
overflow: auto; }
14+
1215
.rc_event {
1316
width: 99%;
1417
max-width: 118px;

css/test.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
body {
2+
overflow: auto; }
3+
14
.header {
25
margin-left: 180px;
36
width: 640px; }

js/jquery-ui.min.js

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/rc_calendar.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,11 +273,12 @@ function Calendar( element, options )
273273

274274
if( !evt.attr.locked ){
275275
newev.draggable({
276+
scroll : true,
276277
appendTo : 'body',
277278
helper : 'clone',
278279
zIndex : 9999,
279280
drag : function( event, ui ){
280-
281+
281282
var target = findDroppable( ui );
282283

283284
if( target ){
@@ -288,7 +289,6 @@ function Calendar( element, options )
288289
}
289290

290291
}
291-
292292
}).resizable({
293293
handles: 's',
294294

sass/rc_calendar.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ $col_7days_width : 595/7 - 1px;
2121
display: inline-block;
2222
}
2323

24+
.rc_day_target {
25+
overflow:auto;
26+
}
27+
28+
2429
.rc_event {
2530
width: 99%;
2631
max-width:$col_5days_width;

sass/test.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
body{
2+
overflow:auto;
3+
}
4+
15
.header{ margin-left:180px; width:640px;}
26

37
.rc_bodyweek{
@@ -105,4 +109,4 @@
105109
position:absolute;
106110
left:230px;
107111

108-
}
112+
}

test.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ <h3>Resource Calendar</h3>
190190

191191
<!-- END TEMPLATES - - - - - - - - - - - - - - - - - - - - - - - - - - -->
192192

193-
<script src="http://code.jquery.com/jquery-1.9.1.js" type="text/javascript"></script>
194-
<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js" type="text/javascript"></script>
193+
<script src="http://code.jquery.com/jquery-1.10.2.js" type="text/javascript"></script>
194+
<script src="http://code.jquery.com/ui/1.10.2/jquery-ui.js" type="text/javascript"></script>
195195
<script src="js/jquery.pnotify.js" type="text/javascript"></script>
196196
<script src="js/moment.min.js" type="text/javascript"></script>
197197
<script src="js/doT.min.js" type="text/javascript"></script>
@@ -285,4 +285,4 @@ <h3>Resource Calendar</h3>
285285

286286
</script>
287287
</body>
288-
</html>
288+
</html>

0 commit comments

Comments
 (0)