Skip to content

Commit bbcdb95

Browse files
icambronicambron
committed
camelCase everywhere
1 parent e7e1b60 commit bbcdb95

18 files changed

+56
-55
lines changed

‎Gruntfile.js

+20-19
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = function (grunt) {
22

3-
var embedOption = grunt.option('embed_languages'),
3+
var embedOption = grunt.option('embedLanguages'),
44
embedLanguageDest = embedOption ?
55
'min/moment-with-customlangs.js' :
66
'min/moment-with-langs.js',
@@ -47,29 +47,29 @@ module.exports = function (grunt) {
4747
testName: 'MomentJS'
4848
},
4949
customLaunchers: {
50-
sl_chrome_win_xp: {
50+
slChromeWinXp: {
5151
base: 'SauceLabs',
5252
browserName: 'chrome',
5353
platform: 'Windows XP'
5454
},
55-
sl_ie9_win7: {
55+
slIe9Win7: {
5656
base: 'SauceLabs',
5757
browserName: 'internet explorer',
5858
platform: 'Windows 7',
5959
version: '9'
6060
},
61-
sl_ie8_win7: {
61+
slIe8Win7: {
6262
base: 'SauceLabs',
6363
browserName: 'internet explorer',
6464
platform: 'Windows 7',
6565
version: '8'
6666
},
67-
sl_ff_linux: {
67+
slFfLinux: {
6868
base: 'SauceLabs',
6969
browserName: 'firefox',
7070
platform: 'Linux'
7171
},
72-
sl_safari_osx: {
72+
slSafariOsx: {
7373
base: 'SauceLabs',
7474
browserName: 'safari',
7575
platform: 'OS X 10.8'
@@ -91,11 +91,11 @@ module.exports = function (grunt) {
9191
options: {reporters: ['dots']},
9292
singleRun: true,
9393
browsers: [
94-
'sl_chrome_win_xp',
95-
'sl_ie9_win7',
96-
'sl_ie8_win7',
97-
'sl_ff_linux',
98-
'sl_safari_osx'
94+
'slChromeWinXp',
95+
'slIe9Win7',
96+
'slIe8Win7',
97+
'slFfLinux',
98+
'slSafariOsx'
9999
]
100100
}
101101
},
@@ -112,10 +112,10 @@ module.exports = function (grunt) {
112112
options: {
113113
mangle: true,
114114
compress: {
115-
dead_code: false
115+
dead_code: false // jshint ignore:line
116116
},
117117
output: {
118-
ascii_only: true
118+
asciiOnly: true
119119
},
120120
report: 'min',
121121
preserveComments: 'some'
@@ -154,6 +154,7 @@ module.exports = function (grunt) {
154154
"strict" : false,
155155
"white" : true,
156156
"es3" : true,
157+
"camelcase" : true,
157158
"globals": {
158159
"define": false
159160
}
@@ -173,7 +174,7 @@ module.exports = function (grunt) {
173174
tasks: ['jshint']
174175
}
175176
},
176-
embed_languages: {
177+
embedLanguages: {
177178
moment: 'moment.js',
178179
dest: embedLanguageDest,
179180
targetLangs: embedLanguageLangs
@@ -191,10 +192,10 @@ module.exports = function (grunt) {
191192
//test tasks
192193
grunt.registerTask('test', ['test:node', 'test:browser']);
193194
grunt.registerTask('test:node', ['nodeunit']);
194-
grunt.registerTask('test:server', ['concat', 'embed_languages', 'karma:server']);
195-
grunt.registerTask('test:browser', ['concat', 'embed_languages', 'karma:chrome', 'karma:firefox']);
196-
grunt.registerTask('test:sauce-browser', ['concat', 'embed_languages', 'env:sauceLabs', 'karma:sauce']);
197-
grunt.registerTask('test:travis-sauce-browser', ['concat', 'embed_languages', 'karma:sauce']);
195+
grunt.registerTask('test:server', ['concat', 'embedLanguages', 'karma:server']);
196+
grunt.registerTask('test:browser', ['concat', 'embedLanguages', 'karma:chrome', 'karma:firefox']);
197+
grunt.registerTask('test:sauce-browser', ['concat', 'embedLanguages', 'env:sauceLabs', 'karma:sauce']);
198+
grunt.registerTask('test:travis-sauce-browser', ['concat', 'embedLanguages', 'karma:sauce']);
198199

199200
// travis build task
200201
grunt.registerTask('build:travis', [
@@ -204,7 +205,7 @@ module.exports = function (grunt) {
204205

205206
// Task to be run when releasing a new version
206207
grunt.registerTask('release', [
207-
'jshint', 'nodeunit', 'concat', 'embed_languages',
208+
'jshint', 'nodeunit', 'concat', 'embedLanguages',
208209
'component', 'uglify'
209210
]);
210211
};

‎lang/fi.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
factory(window.moment); // Browser global
1212
}
1313
}(function (moment) {
14-
var numbers_past = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' '),
15-
numbers_future = ['nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden',
16-
numbers_past[7], numbers_past[8], numbers_past[9]];
14+
var numbersPast = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' '),
15+
numbersFuture = ['nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden',
16+
numbersPast[7], numbersPast[8], numbersPast[9]];
1717

1818
function translate(number, withoutSuffix, key, isFuture) {
1919
var result = "";
@@ -46,12 +46,12 @@
4646
result = isFuture ? 'vuoden' : 'vuotta';
4747
break;
4848
}
49-
result = verbal_number(number, isFuture) + " " + result;
49+
result = verbalNumber(number, isFuture) + " " + result;
5050
return result;
5151
}
5252

53-
function verbal_number(number, isFuture) {
54-
return number < 10 ? (isFuture ? numbers_future[number] : numbers_past[number]) : number;
53+
function verbalNumber(number, isFuture) {
54+
return number < 10 ? (isFuture ? numbersFuture[number] : numbersPast[number]) : number;
5555
}
5656

5757
return moment.lang('fi', {

‎moment.js

+15-15
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
var moment,
1414
VERSION = "2.5.1",
1515
// the global-scope this is NOT the global object in Node.js
16-
global_scope = typeof global !== 'undefined' ? global : this,
16+
globalScope = typeof global !== 'undefined' ? global : this,
1717
round = Math.round,
1818
i,
1919

@@ -1165,9 +1165,9 @@
11651165
//compute day of the year from weeks and weekdays
11661166
if (config._w && config._a[DATE] == null && config._a[MONTH] == null) {
11671167
fixYear = function (val) {
1168-
var int_val = parseInt(val, 10);
1168+
var intVal = parseInt(val, 10);
11691169
return val ?
1170-
(val.length < 3 ? (int_val > 68 ? 1900 + int_val : 2000 + int_val) : int_val) :
1170+
(val.length < 3 ? (intVal > 68 ? 1900 + intVal : 2000 + intVal) : intVal) :
11711171
(config._a[YEAR] == null ? moment().weekYear() : config._a[YEAR]);
11721172
};
11731173

@@ -2037,7 +2037,7 @@
20372037
// Keeping the time actually adds/subtracts (one hour)
20382038
// from the actual represented time. That is why we call updateOffset
20392039
// a second time. In case it wants us to change the offset again
2040-
// _change_in_progress == true case, then we have to adjust, because
2040+
// _changeInProgress == true case, then we have to adjust, because
20412041
// there is no such time in the given timezone.
20422042
zone : function (input, keepTime) {
20432043
var offset = this._offset || 0;
@@ -2051,13 +2051,13 @@
20512051
this._offset = input;
20522052
this._isUTC = true;
20532053
if (offset !== input) {
2054-
if (!keepTime || this._change_in_progress) {
2054+
if (!keepTime || this._changeInProgress) {
20552055
addOrSubtractDurationFromMoment(this,
20562056
moment.duration(offset - input, 'm'), 1, false);
2057-
} else if (!this._change_in_progress) {
2058-
this._change_in_progress = true;
2057+
} else if (!this._changeInProgress) {
2058+
this._changeInProgress = true;
20592059
moment.updateOffset(this, true);
2060-
this._change_in_progress = null;
2060+
this._changeInProgress = null;
20612061
}
20622062
}
20632063
} else {
@@ -2175,16 +2175,16 @@
21752175
});
21762176

21772177
function deprecate(msg, fn) {
2178-
var first_time = true;
2178+
var firstTime = true;
21792179
function printMsg() {
21802180
if (typeof console !== 'undefined' && console.warn) {
21812181
console.warn("Deprecation warning: " + msg);
21822182
}
21832183
}
21842184
return extend(function () {
2185-
if (first_time) {
2185+
if (firstTime) {
21862186
printMsg();
2187-
first_time = false;
2187+
firstTime = false;
21882188
}
21892189
return fn.apply(this, arguments);
21902190
}, fn);
@@ -2426,19 +2426,19 @@
24262426
Exposing Moment
24272427
************************************/
24282428

2429-
function makeGlobal(should_deprecate) {
2429+
function makeGlobal(shouldDeprecate) {
24302430
/*global ender:false */
24312431
if (typeof ender !== 'undefined') {
24322432
return;
24332433
}
2434-
if (should_deprecate) {
2435-
global_scope.moment = deprecate(
2434+
if (shouldDeprecate) {
2435+
globalScope.moment = deprecate(
24362436
"Accessing Moment through the global scope is " +
24372437
"deprecated, and will be removed in an upcoming " +
24382438
"release.",
24392439
moment);
24402440
} else {
2441-
global_scope.moment = moment;
2441+
globalScope.moment = moment;
24422442
}
24432443
}
24442444

‎test/moment/days_in_month.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var moment = require("../../moment");
22

3-
exports.days_in_month = {
3+
exports.daysInMonth = {
44
setUp : function (done) {
55
moment.createFromInputFallback = function () {
66
throw new Error("input not handled by moment");

‎test/moment/getters_setters.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var moment = require("../../moment");
22

3-
exports.getters_setters = {
3+
exports.gettersSetters = {
44
setUp : function (done) {
55
moment.createFromInputFallback = function () {
66
throw new Error("input not handled by moment");

‎test/moment/is_after.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var moment = require("../../moment");
22

3-
exports.is_after = {
3+
exports.isAfter = {
44
setUp : function (done) {
55
moment.createFromInputFallback = function () {
66
throw new Error("input not handled by moment");

‎test/moment/is_before.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var moment = require("../../moment");
22

3-
exports.is_before = {
3+
exports.isBefore = {
44
setUp : function (done) {
55
moment.createFromInputFallback = function () {
66
throw new Error("input not handled by moment");

‎test/moment/is_moment.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var moment = require('../../moment');
22

3-
exports.is_moment = {
3+
exports.isMoment = {
44
setUp : function (done) {
55
moment.createFromInputFallback = function () {
66
throw new Error("input not handled by moment");

‎test/moment/is_same.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var moment = require("../../moment");
22

3-
exports.is_same = {
3+
exports.isSame = {
44
setUp : function (done) {
55
moment.createFromInputFallback = function () {
66
throw new Error("input not handled by moment");

‎test/moment/is_valid.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var moment = require("../../moment");
22

3-
exports.is_valid = {
3+
exports.isValid = {
44
setUp : function (done) {
55
moment.createFromInputFallback = function () {
66
throw new Error("input not handled by moment");

‎test/moment/min_max.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var equalMoment = function (test, a, b, msg) {
44
test.equal(a.valueOf(), b.valueOf(), msg);
55
};
66

7-
exports.min_max = {
7+
exports.minMax = {
88
setUp : function (cb) {
99
moment.lang('en');
1010
moment.createFromInputFallback = function () {

‎test/moment/parsing_flags.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var moment = require('../../moment'),
33
return moment.apply(null, arguments).parsingFlags();
44
};
55

6-
exports.parsing_flags = {
6+
exports.parsingFlags = {
77
setUp : function (done) {
88
moment.createFromInputFallback = function () {
99
throw new Error("input not handled by moment");

‎test/moment/preparse_postformat.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ var symbolLang = {
4141
}
4242
};
4343

44-
exports.preparse_postformat = {
44+
exports.preparsePostformat = {
4545
setUp: function (cb) {
4646
moment.lang('symbol', symbolLang);
4747
moment.createFromInputFallback = function () {

‎test/moment/sod_eod.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var moment = require("../../moment");
22

3-
exports.end_start_of = {
3+
exports.endStartOf = {
44
setUp : function (done) {
55
moment.lang('en');
66
moment.createFromInputFallback = function () {

‎test/moment/string_prototype.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var moment = require("../../moment");
22

3-
exports.string_prototype = {
3+
exports.stringPrototype = {
44
setUp : function (done) {
55
moment.createFromInputFallback = function () {
66
throw new Error("input not handled by moment");

‎test/moment/week_year.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var moment = require("../../moment");
22

3-
exports.week_year = {
3+
exports.weekYear = {
44
setUp : function (done) {
55
moment.createFromInputFallback = function () {
66
throw new Error("input not handled by moment");

‎test/moment/weekday.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var moment = require("../../moment");
22

3-
exports.week_year = {
3+
exports.weekYear = {
44
setUp : function (done) {
55
moment.createFromInputFallback = function () {
66
throw new Error("input not handled by moment");

‎test/moment/weeks_in_year.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var moment = require("../../moment");
22

3-
exports.weeks_in_year = {
3+
exports.weeksInYear = {
44
"isoWeeksInYear": function (test) {
55
test.equal(moment([2004]).isoWeeksInYear(), 53, "2004 has 53 iso weeks");
66
test.equal(moment([2005]).isoWeeksInYear(), 52, "2005 has 53 iso weeks");

0 commit comments

Comments
 (0)