diff --git a/HISTORY.md b/HISTORY.md index d2a68323..4862b57b 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,13 +1,17 @@ # vis.js history http://visjs.org -## 2014-05-22, version 1.0.2 +## not yet released, version 1.0.2 + +### Timeline + +- Some tweaks in snapping dragged items to nice dates. ### Graph + - added zoomable and moveable options. - changes setOptions to avoid resetting view. - ## 2014-05-09, version 1.0.1 ### Timeline diff --git a/src/timeline/TimeStep.js b/src/timeline/TimeStep.js index 958a3a5f..febe04fc 100644 --- a/src/timeline/TimeStep.js +++ b/src/timeline/TimeStep.js @@ -314,8 +314,7 @@ TimeStep.prototype.snap = function(date) { clone.setSeconds(0); clone.setMilliseconds(0); } - else if (this.scale == TimeStep.SCALE.DAY || - this.scale == TimeStep.SCALE.WEEKDAY) { + else if (this.scale == TimeStep.SCALE.DAY) { //noinspection FallthroughInSwitchStatementJS switch (this.step) { case 5: @@ -328,6 +327,19 @@ TimeStep.prototype.snap = function(date) { clone.setSeconds(0); clone.setMilliseconds(0); } + else if (this.scale == TimeStep.SCALE.WEEKDAY) { + //noinspection FallthroughInSwitchStatementJS + switch (this.step) { + case 5: + case 2: + clone.setHours(Math.round(clone.getHours() / 12) * 12); break; + default: + clone.setHours(Math.round(clone.getHours() / 6) * 6); break; + } + clone.setMinutes(0); + clone.setSeconds(0); + clone.setMilliseconds(0); + } else if (this.scale == TimeStep.SCALE.HOUR) { switch (this.step) { case 4: