Skip to content

Commit

Permalink
fixing jquery ui css link in methods.html
Browse files Browse the repository at this point in the history
  • Loading branch information
timeglider committed Oct 19, 2012
1 parent 3bc1eae commit 3c03e1b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion js/timeglider/TG_TimelineView.js
Original file line number Diff line number Diff line change
Expand Up @@ -2895,7 +2895,7 @@ tg.TG_TimelinePlayer.prototype = {

// TODO: make 56 below part of layout constants collection
if (options.event_overflow == "scroll") {
ceiling = 0;
ceiling = 10000;
} else {
ceiling = (tl.hasImageLane) ? (tl_top - MED.image_lane_height) - me.singleTitleHeight : tl_top;
}
Expand Down
14 changes: 6 additions & 8 deletions methods.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@
<title>Timeglider jQuery Plugin</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">

<link rel="stylesheet" href="/_src/css/aristo/jquery-ui-1.8.5.custom.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="css/aristo/jquery-ui-1.8.5.custom.css" type="text/css" media="screen" title="no title" charset="utf-8">

<link rel="stylesheet" href="js/timeglider/Timeglider.css" type="text/css" media="screen" title="no title" charset="utf-8">

<link rel="stylesheet" href="js/plugins/select2/select2.css" type="text/css" media="screen" title="no title" charset="utf-8">




Expand Down Expand Up @@ -147,7 +145,7 @@ <h4>loading</h4>
<script src="js/jquery.tmpl.js" type="text/javascript" charset="utf-8"></script>
<script src="js/ba-debug.min.js" type="text/javascript" charset="utf-8"></script>
<script src="js/ba-tinyPubSub.js" type="text/javascript" charset="utf-8"></script>
<script src="js/plugins/jquery.mousewheel.js" type="text/javascript" charset="utf-8"></script>
<script src="js/jquery.mousewheel.min.js" type="text/javascript" charset="utf-8"></script>
<script src="js/jquery.ui.ipad.js" type="text/javascript" charset="utf-8"></script>
<script src="js/jquery.global.js" type="text/javascript" charset="utf-8"></script>

Expand Down Expand Up @@ -191,9 +189,9 @@ <h4>loading</h4>
"display_zoom_level":true,
"constrain_to_data":false,
"image_lane_height":100,
"loaded":function (args, data) { /* alert("loaded!"); */ }
"loaded":function (args, data) { /* alert("loaded!"); */ },
// "tick_top":0
// "event_overflow":"scroll"
"event_overflow":"scroll"
}).resizable({
stop:function(){
$(this).data("timeline").resize();
Expand Down Expand Up @@ -243,11 +241,11 @@ <h4>loading</h4>


$("#scrolldown").bind("click", function() {
$(".timeglider-timeline-event").animate({top:"+=100"})
$(".timeglider-timeline-envelope").animate({top:"+=100"})
})

$("#scrollup").bind("click", function() {
$(".timeglider-timeline-event").animate({top:"-=100"})
$(".timeglider-timeline-envelope").animate({top:"-=100"})
})


Expand Down

0 comments on commit 3c03e1b

Please sign in to comment.