Merge branch 'develop' of https://github.com/almende/vis into develop

Conflicts:
	HISTORY.md

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

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: