Skip to content

Commit

Permalink
Merge pull request #150 from charlesbaynham/Fix-modulus-for-getWeeks
Browse files Browse the repository at this point in the history
- (Bug Fix) Fixed typo in the definition of getWeeks, preventing its usage
  • Loading branch information
objectivehtml committed Nov 18, 2014
2 parents 2293c5e + e54db5d commit 880fe38
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 8 deletions.
5 changes: 5 additions & 0 deletions CHANGE LOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# FlipClock.js

#### 0.7.5
##### 21/10/2014

- (Bug Fix) Fixed a typo in the definition of the (unused by default) method getWeeks.

#### 0.7.4
##### 10/06/2014

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flipclock",
"version": "0.7.4",
"version": "0.7.5",
"homepage": "https://github.com/objectivehtml/FlipClock",
"authors": [
"Objective HTML",
Expand Down
4 changes: 2 additions & 2 deletions compiled/flipclock.js
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ var FlipClock;
* Version
*/

version: '0.7.3',
version: '0.7.5',

/**
* Sets the default options
Expand Down Expand Up @@ -1568,7 +1568,7 @@ var FlipClock;
* @return int Retuns a floored integer
*/

getWeeks: function() {
getWeeks: function(mod) {
var weeks = this.getTimeSeconds() / 60 / 60 / 24 / 7;

if(mod) {
Expand Down
4 changes: 2 additions & 2 deletions compiled/flipclock.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flipclock",
"version": "0.7.4",
"version": "0.7.5",
"email": "support@objectivehtml.com",
"author": "Objective HTML, LLC <support@objectivehtml.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion src/flipclock/js/libs/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ var FlipClock;
* Version
*/

version: '0.7.4',
version: '0.7.5',

/**
* Sets the default options
Expand Down
2 changes: 1 addition & 1 deletion src/flipclock/js/libs/time.js
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@
* @return int Retuns a floored integer
*/

getWeeks: function() {
getWeeks: function(mod) {
var weeks = this.getTimeSeconds() / 60 / 60 / 24 / 7;

if(mod) {
Expand Down

0 comments on commit 880fe38

Please sign in to comment.