Skip to content

Commit

Permalink
Merge pull request #47 from carbonfive/enhancements/ensure-minimum-gr…
Browse files Browse the repository at this point in the history
…id-size-35

Enhancements/ensure minimum grid size 35
  • Loading branch information
Rudy Jahchan committed Jan 21, 2014
2 parents b857b5e + 13fdae7 commit d03b43c
Show file tree
Hide file tree
Showing 35 changed files with 477 additions and 252 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ lib-cov
pids
logs
results
maps

npm-debug.log

Expand Down
15 changes: 10 additions & 5 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,18 @@ module.exports = function(grunt) {
mochaTest: {
test: {
options: {
mocha: require('mocha')
mocha: require('mocha'),
require: 'test/common'
},
src: ['test/**/*.coffee']
src: ['test/**/*_test.coffee']
}
},
coffee: {
compile: {
options: {
sourceMap: true,
sourceMapDir: 'maps/'
},
expand: true,
cwd: 'src/',
src: ['**/*.coffee'],
Expand All @@ -24,14 +29,14 @@ module.exports = function(grunt) {
watch: {
tests: {
files: ['test/**/*_test.coffee'],
tasks: ['mochaTest']
tasks: ['build']
},
src: {
files: ['src/**/*.coffee'],
tasks: ['mochaTest', 'coffee']
tasks: ['build']
}
}
});
grunt.registerTask('build', ['mochaTest','coffee']);
grunt.registerTask('build', ['coffee', 'mochaTest']);
grunt.registerTask('default', ['mochaTest']);
};
2 changes: 2 additions & 0 deletions lib/client/buffer.js

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

23 changes: 15 additions & 8 deletions lib/client/index.js

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

107 changes: 82 additions & 25 deletions lib/client/screen.js

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

13 changes: 7 additions & 6 deletions lib/client/views/cycle_view.js

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

2 changes: 2 additions & 0 deletions lib/client/views/game_list_view.js

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

Loading

0 comments on commit d03b43c

Please sign in to comment.