Skip to content

Commit

Permalink
Release 0.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
jgallen23 committed Dec 19, 2014
1 parent 5836b0c commit da5ceeb
Show file tree
Hide file tree
Showing 11 changed files with 63 additions and 13 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
@@ -1,4 +1,9 @@

0.5.2 / 2014-12-19
==================

* bump version

0.5.1 / 2014-12-19
==================

Expand Down
2 changes: 1 addition & 1 deletion bower.json
@@ -1,7 +1,7 @@
{
"name": "weekly",
"description": "jQuery Weekly Calendar Plugin",
"version": "0.5.1",
"version": "0.5.2",
"homepage": "https://github.com/firstandthird/weekly",
"license": "MIT",
"copyright": "First + Third",
Expand Down
2 changes: 1 addition & 1 deletion dist/weekly-mobile.full.js
@@ -1,7 +1,7 @@

/*!
* weekly - jQuery Weekly Calendar Plugin
* v0.5.0
* v0.5.2
* https://github.com/firstandthird/weekly
* copyright First + Third 2014
* MIT License
Expand Down
2 changes: 1 addition & 1 deletion dist/weekly-mobile.full.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/weekly-mobile.js
@@ -1,7 +1,7 @@

/*!
* weekly - jQuery Weekly Calendar Plugin
* v0.5.0
* v0.5.2
* https://github.com/firstandthird/weekly
* copyright First + Third 2014
* MIT License
Expand Down
2 changes: 1 addition & 1 deletion dist/weekly-mobile.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions dist/weekly.css
Expand Up @@ -126,8 +126,14 @@
right: 5px;
}
.weekly .weekly-grid .weekly-day .weekly-event-preview {
position: absolute;
padding: 5px;
z-index: 0;
}
.weekly .weekly-grid .weekly-day .weekly-event-preview .weekly-event-time {
font-size: 10px;
margin-bottom: 4px;
}
.weekly .weekly-time-navigation {
margin: 15px 0;
line-height: 22px;
Expand Down Expand Up @@ -216,6 +222,7 @@
}
.weekly .weekly-grid .weekly-event-preview {
background-color: rgba(52, 73, 94, 0.8);
color: #ffffff;
border-radius: 3px;
}
.weekly .weekly-today {
Expand Down
23 changes: 21 additions & 2 deletions dist/weekly.full.js
@@ -1,7 +1,7 @@

/*!
* weekly - jQuery Weekly Calendar Plugin
* v0.5.0
* v0.5.2
* https://github.com/firstandthird/weekly
* copyright First + Third 2014
* MIT License
Expand Down Expand Up @@ -562,6 +562,7 @@
},

init: function() {
var self = this;
this.events = [];

this.oldDate = this.currentDate;
Expand All @@ -584,11 +585,17 @@
this.hoverPreviewTimer = null;
if(this.hoverPreviewDelay !== false) {
this.el.on('mousemove', '.weekly-day', this.proxy(function(e) {
if (self.readOnly) {
return;
}
this.removePreviewEvent();
this.hoverPreviewTimer = setTimeout(this.proxy(function() {
this.showPreviewEvent(e);
}), this.hoverPreviewDelay);
})).on('mouseleave', '.weekly-day', this.proxy(function() {
if (self.readOnly) {
return;
}
this.removePreviewEvent();
}));
}
Expand Down Expand Up @@ -1232,7 +1239,19 @@
var tempStart = Math.floor(mouseOffsetTop / intervalHeight) * intervalHeight;
var tempEnd = tempStart + minHeight;

target.append('<div class="weekly-event-preview"></div>');
var dateSplit = target.data('date').split('-');

var startTime = ((tempStart / hourHeight) || 0) + this.startTime;
var endTime = ((tempEnd / 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));

target.append('<div class="weekly-event-preview"><div class="weekly-event-time">' + dateFormat('%g:%i', start) + ' - ' + dateFormat('%g:%i%a', end) + '</div></div>');
previewEvent = target.find('.weekly-event-preview');

previewEvent.css({
Expand Down
4 changes: 2 additions & 2 deletions dist/weekly.full.min.js

Large diffs are not rendered by default.

23 changes: 21 additions & 2 deletions dist/weekly.js
@@ -1,7 +1,7 @@

/*!
* weekly - jQuery Weekly Calendar Plugin
* v0.5.0
* v0.5.2
* https://github.com/firstandthird/weekly
* copyright First + Third 2014
* MIT License
Expand Down Expand Up @@ -153,6 +153,7 @@
},

init: function() {
var self = this;
this.events = [];

this.oldDate = this.currentDate;
Expand All @@ -175,11 +176,17 @@
this.hoverPreviewTimer = null;
if(this.hoverPreviewDelay !== false) {
this.el.on('mousemove', '.weekly-day', this.proxy(function(e) {
if (self.readOnly) {
return;
}
this.removePreviewEvent();
this.hoverPreviewTimer = setTimeout(this.proxy(function() {
this.showPreviewEvent(e);
}), this.hoverPreviewDelay);
})).on('mouseleave', '.weekly-day', this.proxy(function() {
if (self.readOnly) {
return;
}
this.removePreviewEvent();
}));
}
Expand Down Expand Up @@ -823,7 +830,19 @@
var tempStart = Math.floor(mouseOffsetTop / intervalHeight) * intervalHeight;
var tempEnd = tempStart + minHeight;

target.append('<div class="weekly-event-preview"></div>');
var dateSplit = target.data('date').split('-');

var startTime = ((tempStart / hourHeight) || 0) + this.startTime;
var endTime = ((tempEnd / 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));

target.append('<div class="weekly-event-preview"><div class="weekly-event-time">' + dateFormat('%g:%i', start) + ' - ' + dateFormat('%g:%i%a', end) + '</div></div>');
previewEvent = target.find('.weekly-event-preview');

previewEvent.css({
Expand Down
4 changes: 2 additions & 2 deletions dist/weekly.min.js

Large diffs are not rendered by default.

0 comments on commit da5ceeb

Please sign in to comment.