Release 0.5.0

CHANGELOG.md

@@ -1,4 +1,11 @@
 
+0.5.0 / 2014-12-16 
+==================
+
+  * Added event preview on hover.
+  * Added dateformat to bower
+  * Added minDuration
+
 0.4.1 / 2014-10-10 
 ==================
 

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "weekly",
   "description": "jQuery Weekly Calendar Plugin",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "homepage": "https://github.com/firstandthird/weekly",
   "license": "MIT",
   "copyright": "First + Third",

dist/weekly-mobile.full.js

@@ -1,7 +1,7 @@
 
 /*!
  * weekly - jQuery Weekly Calendar Plugin
- * v0.4.1
+ * v0.5.0
  * https://github.com/firstandthird/weekly
  * copyright First + Third 2014
  * MIT License

dist/weekly-mobile.js

@@ -1,7 +1,7 @@
 
 /*!
  * weekly - jQuery Weekly Calendar Plugin
- * v0.4.1
+ * v0.5.0
  * https://github.com/firstandthird/weekly
  * copyright First + Third 2014
  * MIT License

dist/weekly.css

@@ -85,6 +85,7 @@
 .weekly .weekly-grid .weekly-day .weekly-event {
   position: absolute;
   padding: 5px;
+  z-index: 2;
 }
 .weekly .weekly-grid .weekly-day .weekly-event .weekly-event-time {
   font-size: 10px;
@@ -118,11 +119,15 @@
 .weekly .weekly-grid .weekly-day .weekly-event:hover .weekly-dragger {
   display: block;
 }
-.weekly .weekly-grid .weekly-day .weekly-event-pending {
+.weekly .weekly-grid .weekly-day .weekly-event-pending,
+.weekly .weekly-grid .weekly-day .weekly-event-preview {
   position: absolute;
   left: 5px;
   right: 5px;
 }
+.weekly .weekly-grid .weekly-day .weekly-event-preview {
+  z-index: 0;
+}
 .weekly .weekly-time-navigation {
   margin: 15px 0;
   line-height: 22px;
@@ -209,6 +214,10 @@
   background-color: #34495e;
   border-radius: 3px;
 }
+.weekly .weekly-grid .weekly-event-preview {
+  background-color: rgba(52, 73, 94, 0.8);
+  border-radius: 3px;
+}
 .weekly .weekly-today {
   background-color: rgba(241, 196, 15, 0.4);
 }

dist/weekly.full.js

@@ -1,7 +1,7 @@
 
 /*!
  * weekly - jQuery Weekly Calendar Plugin
- * v0.4.1
+ * v0.5.0
  * https://github.com/firstandthird/weekly
  * copyright First + Third 2014
  * MIT License
@@ -550,9 +550,11 @@
       todayFirst: false,
       dayOffset: 0,
       allowOverlap: true,
+      hoverPreviewDelay: 250,
 
       // How many minutes to draw a divider line
-      interval: 30
+      interval: 30,
+      minDuration: 30
     },
 
     events: {
@@ -579,6 +581,17 @@
         this.emit('weekChange', data);
       }
 
+      this.hoverPreviewTimer = null;
+      if(this.hoverPreviewDelay !== false) {
+        this.el.on('mousemove', '.weekly-day', this.proxy(function(e) {
+          this.removePreviewEvent();
+          this.hoverPreviewTimer = setTimeout(this.proxy(function() {
+            this.showPreviewEvent(e);
+          }), this.hoverPreviewDelay);
+        })).on('mouseleave', '.weekly-day', this.proxy(function() {
+          this.removePreviewEvent();
+        }));
+      }
 
     },
 
@@ -736,7 +749,7 @@
           return;
         }
 
-        if($(event.target).is('.weekly-time,.weekly-day')) {
+        if($(event.target).is('.weekly-time,.weekly-day,.weekly-event-preview')) {
           this.mouseDown = true;
           this.createEvent(event);
           gridDays.trigger('mouseup');
@@ -826,6 +839,10 @@
       var startTime = ((this.pendingEventStart / hourHeight) || 0) + this.startTime;
       var endTime = ((this.pendingEventEnd / hourHeight) || 1) + this.startTime;
 
+      if(endTime - startTime < this.minDuration / 60) {
+        endTime = startTime + (this.minDuration / 60);
+      }
+
       var start = new Date(dateSplit[0], dateSplit[1]-1, dateSplit[2], startTime - this.timezoneOffset, this.fromDecimal(startTime));
       var end = new Date(dateSplit[0], dateSplit[1]-1, dateSplit[2], endTime - this.timezoneOffset, this.fromDecimal(endTime));
 
@@ -1199,6 +1216,34 @@
       if (!skipUpdate) {
         this.update();
       }
+    },
+
+    showPreviewEvent: function(event) {
+      var previewEvent;
+
+      var target = $(event.currentTarget);
+      var targetOffset = target.parent().offset();
+      var mouseOffsetTop = event.pageY - targetOffset.top;
+      var dayHeight = $(event.currentTarget).height();
+      var hourHeight = Math.round(dayHeight / this.timeDifference);
+      var intervalHeight = hourHeight / (60 / this.interval);
+      var minHeight = hourHeight / (60 / this.minDuration);
+
+      var tempStart = Math.floor(mouseOffsetTop / intervalHeight) * intervalHeight;
+      var tempEnd = tempStart + minHeight;
+
+      target.append('<div class="weekly-event-preview"></div>');
+      previewEvent = target.find('.weekly-event-preview');
+
+      previewEvent.css({
+        top: tempStart,
+        bottom: dayHeight - tempEnd
+      });
+    },
+
+    removePreviewEvent: function() {
+      clearTimeout(this.hoverPreviewTimer);
+      this.el.find('.weekly-event-preview').remove();
     }
   });
 

dist/weekly.js

@@ -1,7 +1,7 @@
 
 /*!
  * weekly - jQuery Weekly Calendar Plugin
- * v0.4.1
+ * v0.5.0
  * https://github.com/firstandthird/weekly
  * copyright First + Third 2014
  * MIT License
@@ -141,9 +141,11 @@
       todayFirst: false,
       dayOffset: 0,
       allowOverlap: true,
+      hoverPreviewDelay: 250,
 
       // How many minutes to draw a divider line
-      interval: 30
+      interval: 30,
+      minDuration: 30
     },
 
     events: {
@@ -170,6 +172,17 @@
         this.emit('weekChange', data);
       }
 
+      this.hoverPreviewTimer = null;
+      if(this.hoverPreviewDelay !== false) {
+        this.el.on('mousemove', '.weekly-day', this.proxy(function(e) {
+          this.removePreviewEvent();
+          this.hoverPreviewTimer = setTimeout(this.proxy(function() {
+            this.showPreviewEvent(e);
+          }), this.hoverPreviewDelay);
+        })).on('mouseleave', '.weekly-day', this.proxy(function() {
+          this.removePreviewEvent();
+        }));
+      }
 
     },
 
@@ -327,7 +340,7 @@
           return;
         }
 
-        if($(event.target).is('.weekly-time,.weekly-day')) {
+        if($(event.target).is('.weekly-time,.weekly-day,.weekly-event-preview')) {
           this.mouseDown = true;
           this.createEvent(event);
           gridDays.trigger('mouseup');
@@ -417,6 +430,10 @@
       var startTime = ((this.pendingEventStart / hourHeight) || 0) + this.startTime;
       var endTime = ((this.pendingEventEnd / hourHeight) || 1) + this.startTime;
 
+      if(endTime - startTime < this.minDuration / 60) {
+        endTime = startTime + (this.minDuration / 60);
+      }
+
       var start = new Date(dateSplit[0], dateSplit[1]-1, dateSplit[2], startTime - this.timezoneOffset, this.fromDecimal(startTime));
       var end = new Date(dateSplit[0], dateSplit[1]-1, dateSplit[2], endTime - this.timezoneOffset, this.fromDecimal(endTime));
 
@@ -790,6 +807,34 @@
       if (!skipUpdate) {
         this.update();
       }
+    },
+
+    showPreviewEvent: function(event) {
+      var previewEvent;
+
+      var target = $(event.currentTarget);
+      var targetOffset = target.parent().offset();
+      var mouseOffsetTop = event.pageY - targetOffset.top;
+      var dayHeight = $(event.currentTarget).height();
+      var hourHeight = Math.round(dayHeight / this.timeDifference);
+      var intervalHeight = hourHeight / (60 / this.interval);
+      var minHeight = hourHeight / (60 / this.minDuration);
+
+      var tempStart = Math.floor(mouseOffsetTop / intervalHeight) * intervalHeight;
+      var tempEnd = tempStart + minHeight;
+
+      target.append('<div class="weekly-event-preview"></div>');
+      previewEvent = target.find('.weekly-event-preview');
+
+      previewEvent.css({
+        top: tempStart,
+        bottom: dayHeight - tempEnd
+      });
+    },
+
+    removePreviewEvent: function() {
+      clearTimeout(this.hoverPreviewTimer);
+      this.el.find('.weekly-event-preview').remove();
     }
   });