Skip to content

Commit 3500cc4

Browse files
committed
Updated Changelog
1 parent f1da30b commit 3500cc4

File tree

5 files changed

+68
-5
lines changed

5 files changed

+68
-5
lines changed

CHANGE LOG.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
11
# FlipClock.js
22

3+
#### 0.7.7
4+
##### 12/12/2014
5+
6+
- (Bug Fix) Recompiled build and version. Mistake in previous release.
7+
8+
#### 0.7.6
9+
##### 12/12/2014
10+
11+
- (Example) Added new interval callback example
12+
- (Bug Fix) Merge pull request #160 from rustygreen/patch-1
13+
- (Bug Fix) Fixed constructor bug passing "factory". Updated face.js, the "factory" was not being passed into the constructor, instead a typo was "factor".
14+
- (Bug Fix) Merge pull request #150 from charlesbaynham/Fix-modulus-for-getWeeks
15+
- (Bug Fix) Fixed typo in the definition of getWeeks, preventing its usage
16+
- (Bug Fix) Merge pull request #156 from laureanoendeiza/patch-1
17+
- (Bug Fix) Fixed typo in the definition of getWeeks, preventing its usage.
18+
319
#### 0.7.5
4-
##### 21/10/2014
20+
##### 10/10/2014
521

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

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "flipclock",
3-
"version": "0.7.5",
3+
"version": "0.7.6",
44
"homepage": "https://github.com/objectivehtml/FlipClock",
55
"authors": [
66
"Objective HTML",

examples/test.html

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<html>
2+
<head>
3+
<link rel="stylesheet" href="../compiled/flipclock.css">
4+
5+
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
6+
7+
<script src="../compiled/flipclock.js"></script>
8+
</head>
9+
<body>
10+
<div class="clock" style="margin:2em;"></div>
11+
12+
<script type="text/javascript">
13+
var clock;
14+
15+
$(document).ready(function() {
16+
// Set dates.
17+
var futureDate = new Date("October 9, 2014 12:02 PM EDT");
18+
var currentDate = new Date();
19+
20+
// Calculate the difference in seconds between the future and current date
21+
var diff = futureDate.getTime() / 1000 - currentDate.getTime() / 1000;
22+
23+
// Calculate day difference and apply class to .clock for extra digit styling.
24+
function dayDiff(first, second) {
25+
return (second-first)/(1000*60*60*24);
26+
}
27+
28+
if (dayDiff(currentDate, futureDate) < 100) {
29+
$('.clock').addClass('twoDayDigits');
30+
} else {
31+
$('.clock').addClass('threeDayDigits');
32+
}
33+
34+
if(diff < 0) {
35+
diff = 0;
36+
}
37+
38+
// Instantiate a coutdown FlipClock
39+
clock = $('.clock').FlipClock(diff, {
40+
clockFace: 'DailyCounter',
41+
countdown: true
42+
});
43+
});
44+
</script>
45+
46+
</body>
47+
</html>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "flipclock",
3-
"version": "0.7.5",
3+
"version": "0.7.6",
44
"email": "[email protected]",
55
"author": "Objective HTML, LLC <[email protected]>",
66
"license": "MIT",

src/flipclock/js/libs/core.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ var FlipClock;
5151
* Build Date
5252
*/
5353

54-
buildDate: '2014-10-06',
54+
buildDate: '2014-12-12',
5555

5656
/**
5757
* Version
5858
*/
5959

60-
version: '0.7.5',
60+
version: '0.7.6',
6161

6262
/**
6363
* Sets the default options

0 commit comments

Comments
 (0)