Merge branch 'master' of github.com:objectivehtml/FlipClock

objectivehtml · objectivehtml · commit f1da30bbb12f · 2014-12-12T15:45:53.000-05:00
diff --git a/src/flipclock/js/libs/face.js b/src/flipclock/js/libs/face.js
@@ -135,7 +135,7 @@
 
 		reset: function() {
 			this.factory.time = new FlipClock.Time(
-				this.factor, 
+				this.factory, 
 				this.factory.original ? Math.round(this.factory.original) : 0,
 				{
 					minimumDigits: this.factory.minimumDigits

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@`
`135`	`135`
`136`	`136`	`reset: function() {`
`137`	`137`	`this.factory.time = new FlipClock.Time(`
`138`		`- this.factor,`
	`138`	`+ this.factory,`
`139`	`139`	`this.factory.original ? Math.round(this.factory.original) : 0,`
`140`	`140`	`{`
`141`	`141`	`minimumDigits: this.factory.minimumDigits`