Skip to content

Dev #618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jul 29, 2013
Merged

Dev #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
83c55c3
Documented formatTime's options parameter as optional.
srvance Jul 28, 2013
d787f15
Time zone and literal tests, as well as some additional cases for the…
srvance Jul 28, 2013
f46683c
Preserve leading and trailing whitespace. Don't second guess the deve…
srvance Jul 28, 2013
8b6b533
Merge branch 'dev' of https://github.com/trentrichardson/jQuery-Timep…
srvance Jul 28, 2013
c1112ad
Tabify jshintrc files.
srvance Jul 29, 2013
dd06588
Huge number of jshint motivated cleanups. We should consider adding j…
srvance Jul 29, 2013
03dab46
Fix the jasmine test running issue by explicitly declaring the jasmin…
srvance Jul 29, 2013
5202885
Minor gruntfile cleanup
srvance Jul 29, 2013
0188d4e
Jshint motivated cleanups in the spec.
srvance Jul 29, 2013
fb927e8
Add the hint predefs necessary for Jasmine and jQuery $
srvance Jul 29, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .jshintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"curly": true,
"eqeqeq": true,
"immed": true,
"latedef": true,
"newcap": true,
"noarg": true,
"sub": true,
"undef": true,
"unused": true,
"boss": true,
"eqnull": true,
"node": true,
"es5": true
"curly": true,
"eqeqeq": true,
"immed": true,
"latedef": true,
"newcap": true,
"noarg": true,
"sub": true,
"undef": true,
"unused": true,
"boss": true,
"eqnull": true,
"node": true,
"es5": true
}
15 changes: 8 additions & 7 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = function(grunt) {
files: [
//{ src: 'src/index.html', dest: 'dist/index.html' },
{ src: 'src/<%= pkg.name %>.css', dest: 'dist/<%= pkg.name %>.css' },
{ src: 'src/i18n/jquery-ui-timepicker-*.js', dest: 'dist/i18n/', expand:true, flatten: true },
{ src: 'src/i18n/jquery-ui-timepicker-*.js', dest: 'dist/i18n/', expand:true, flatten: true }
]
}
},
Expand Down Expand Up @@ -53,7 +53,7 @@ module.exports = function(grunt) {
dist: {
src: '<%= concat.dist.dest %>',
dest: 'dist/<%= pkg.name %>.min.js'
},
}
},
cssmin: {
options: {
Expand All @@ -62,15 +62,16 @@ module.exports = function(grunt) {
dist: {
src: 'dist/<%= pkg.name %>.css',
dest: 'dist/<%= pkg.name %>.min.css'
},
}
},
jasmine: {
src: 'src/<%= pkg.name %>.js',
options: {
specs: 'test/*_spec.js',
vendor: [
'http://code.jquery.com/jquery-1.10.1.min.js',
'http://code.jquery.com/ui/1.10.3/jquery-ui.min.js'
'http://code.jquery.com/ui/1.10.3/jquery-ui.min.js',
'http://github.com/searls/jasmine-fixture/releases/1.0.5/1737/jasmine-fixture.js'
]
}
},
Expand All @@ -92,7 +93,7 @@ module.exports = function(grunt) {
jshintrc: 'test/.jshintrc'
},
src: ['test/**/*.js']
},
}
},
watch: {
gruntfile: {
Expand All @@ -106,8 +107,8 @@ module.exports = function(grunt) {
test: {
files: '<%= jshint.test.src %>',
tasks: ['jshint:test', 'jasmine']
},
},
}
}
});

// These plugins provide necessary tasks.
Expand Down
28 changes: 14 additions & 14 deletions src/.jshintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"curly": true,
"eqeqeq": true,
"immed": true,
"latedef": true,
"newcap": true,
"noarg": true,
"sub": true,
"undef": true,
"unused": false,
"loopfunc": true,
"boss": true,
"eqnull": true,
"browser": true,
"predef": ["jQuery"]
"curly": true,
"eqeqeq": true,
"immed": true,
"latedef": true,
"newcap": true,
"noarg": true,
"sub": true,
"undef": true,
"unused": false,
"loopfunc": true,
"boss": true,
"eqnull": true,
"browser": true,
"predef": ["jQuery"]
}
Loading