Skip to content

Commit

Permalink
Merge branch 'hotfix-3.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Fernando González committed Apr 4, 2014
2 parents e47b4c1 + c5333af commit f0c15a7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.fao.unredd</groupId>
<artifactId>portal</artifactId>
<version>3.0</version>
<version>3.0.1</version>
<packaging>war</packaging>
<name>UNREDD Portal</name>
<url>http://maven.apache.org</url>
Expand Down
10 changes: 6 additions & 4 deletions src/main/webapp/modules/time-slider.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@ define([ "jquery", "message-bus", "layout", "jquery-ui", "i18n" ], function($, b
div.append(divTimeSlider);
divTimeSlider.slider({
change : function(event, ui) {
var d = new Date();
d.setISO8601(timestamps[ui.value]);
divTimeSliderLabel.text(getLocalizedDate(timestamps[ui.value]));
bus.send("time-slider.selection", d);
if (timestamps.length > 0) {
var d = new Date();
d.setISO8601(timestamps[ui.value]);
divTimeSliderLabel.text(getLocalizedDate(timestamps[ui.value]));
bus.send("time-slider.selection", d);
}
}
});
divTimeSlider.slider("option", "min", 0);
Expand Down

0 comments on commit f0c15a7

Please sign in to comment.