Skip to content

Commit

Permalink
- (Bug Fix) Fixed an issue with the last build not working properly. …
Browse files Browse the repository at this point in the history
…Recompiled script after a merging a pull request seems to have fixed it.
  • Loading branch information
objectivehtml committed May 30, 2014
1 parent 696e559 commit c735f89
Show file tree
Hide file tree
Showing 205 changed files with 75,672 additions and 8 deletions.
18 changes: 16 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,26 @@ module.exports = function(grunt) {
'compiled/flipclock.min.js': ['<%= concat.js.dest %>']
}
}
}
},
watch: {
options: {
livereload: true
},
scripts: {
files: ['<%= concat.js.src %>'],
tasks: ['concat'],
},
css: {
files: ['<%= concat.css.src %>'],
tasks: ['concat'],
}
},
});

grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');

// Default task(s).
grunt.registerTask('default', ['concat', 'uglify']);
grunt.registerTask('default', ['concat', 'uglify', 'watch']);
};
2 changes: 1 addition & 1 deletion bower.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flipclock",
"version": "0.5.0",
"version": "0.5.1",
"homepage": "https://github.com/objectivehtml/FlipClock",
"authors": [
"Objective HTML",
Expand Down
4 changes: 1 addition & 3 deletions compiled/flipclock.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,6 @@ var FlipClock;
digit = 0;
}

console.log(options);

return new FlipClock.Factory(obj, digit, options);
};

Expand Down Expand Up @@ -483,7 +481,7 @@ var FlipClock;
var t = this;

if(!doNotAddPlayClass) {
if (!t.factory.time.time instanceof Date) {
if (!(t.factory.time.time instanceof Date)) {
if(!t.factory.countdown) {
t.factory.time.time++;
}
Expand Down
4 changes: 2 additions & 2 deletions compiled/flipclock.min.js

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions node_modules/grunt-contrib-watch/LICENSE-MIT

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

Loading

0 comments on commit c735f89

Please sign in to comment.