From: Isaac Cambron Date: Wed, 2 Apr 2014 20:24:44 +0000 (-0400) Subject: camelCase everywhere X-Git-Tag: 2.6.0~14^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbcdb957deee007a658653d703ad2d21227727d8;p=thirdparty%2Fmoment.git camelCase everywhere --- diff --git a/Gruntfile.js b/Gruntfile.js index f8d885d48..0e220f387 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,6 +1,6 @@ module.exports = function (grunt) { - var embedOption = grunt.option('embed_languages'), + var embedOption = grunt.option('embedLanguages'), embedLanguageDest = embedOption ? 'min/moment-with-customlangs.js' : 'min/moment-with-langs.js', @@ -47,29 +47,29 @@ module.exports = function (grunt) { testName: 'MomentJS' }, customLaunchers: { - sl_chrome_win_xp: { + slChromeWinXp: { base: 'SauceLabs', browserName: 'chrome', platform: 'Windows XP' }, - sl_ie9_win7: { + slIe9Win7: { base: 'SauceLabs', browserName: 'internet explorer', platform: 'Windows 7', version: '9' }, - sl_ie8_win7: { + slIe8Win7: { base: 'SauceLabs', browserName: 'internet explorer', platform: 'Windows 7', version: '8' }, - sl_ff_linux: { + slFfLinux: { base: 'SauceLabs', browserName: 'firefox', platform: 'Linux' }, - sl_safari_osx: { + slSafariOsx: { base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.8' @@ -91,11 +91,11 @@ module.exports = function (grunt) { options: {reporters: ['dots']}, singleRun: true, browsers: [ - 'sl_chrome_win_xp', - 'sl_ie9_win7', - 'sl_ie8_win7', - 'sl_ff_linux', - 'sl_safari_osx' + 'slChromeWinXp', + 'slIe9Win7', + 'slIe8Win7', + 'slFfLinux', + 'slSafariOsx' ] } }, @@ -112,10 +112,10 @@ module.exports = function (grunt) { options: { mangle: true, compress: { - dead_code: false + dead_code: false // jshint ignore:line }, output: { - ascii_only: true + asciiOnly: true }, report: 'min', preserveComments: 'some' @@ -154,6 +154,7 @@ module.exports = function (grunt) { "strict" : false, "white" : true, "es3" : true, + "camelcase" : true, "globals": { "define": false } @@ -173,7 +174,7 @@ module.exports = function (grunt) { tasks: ['jshint'] } }, - embed_languages: { + embedLanguages: { moment: 'moment.js', dest: embedLanguageDest, targetLangs: embedLanguageLangs @@ -191,10 +192,10 @@ module.exports = function (grunt) { //test tasks grunt.registerTask('test', ['test:node', 'test:browser']); grunt.registerTask('test:node', ['nodeunit']); - grunt.registerTask('test:server', ['concat', 'embed_languages', 'karma:server']); - grunt.registerTask('test:browser', ['concat', 'embed_languages', 'karma:chrome', 'karma:firefox']); - grunt.registerTask('test:sauce-browser', ['concat', 'embed_languages', 'env:sauceLabs', 'karma:sauce']); - grunt.registerTask('test:travis-sauce-browser', ['concat', 'embed_languages', 'karma:sauce']); + grunt.registerTask('test:server', ['concat', 'embedLanguages', 'karma:server']); + grunt.registerTask('test:browser', ['concat', 'embedLanguages', 'karma:chrome', 'karma:firefox']); + grunt.registerTask('test:sauce-browser', ['concat', 'embedLanguages', 'env:sauceLabs', 'karma:sauce']); + grunt.registerTask('test:travis-sauce-browser', ['concat', 'embedLanguages', 'karma:sauce']); // travis build task grunt.registerTask('build:travis', [ @@ -204,7 +205,7 @@ module.exports = function (grunt) { // Task to be run when releasing a new version grunt.registerTask('release', [ - 'jshint', 'nodeunit', 'concat', 'embed_languages', + 'jshint', 'nodeunit', 'concat', 'embedLanguages', 'component', 'uglify' ]); }; diff --git a/lang/fi.js b/lang/fi.js index 18529c10d..49f477c08 100644 --- a/lang/fi.js +++ b/lang/fi.js @@ -11,9 +11,9 @@ factory(window.moment); // Browser global } }(function (moment) { - var numbers_past = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' '), - numbers_future = ['nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden', - numbers_past[7], numbers_past[8], numbers_past[9]]; + var numbersPast = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' '), + numbersFuture = ['nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden', + numbersPast[7], numbersPast[8], numbersPast[9]]; function translate(number, withoutSuffix, key, isFuture) { var result = ""; @@ -46,12 +46,12 @@ result = isFuture ? 'vuoden' : 'vuotta'; break; } - result = verbal_number(number, isFuture) + " " + result; + result = verbalNumber(number, isFuture) + " " + result; return result; } - function verbal_number(number, isFuture) { - return number < 10 ? (isFuture ? numbers_future[number] : numbers_past[number]) : number; + function verbalNumber(number, isFuture) { + return number < 10 ? (isFuture ? numbersFuture[number] : numbersPast[number]) : number; } return moment.lang('fi', { diff --git a/moment.js b/moment.js index a787bcf2d..152d0a7b9 100644 --- a/moment.js +++ b/moment.js @@ -13,7 +13,7 @@ var moment, VERSION = "2.5.1", // the global-scope this is NOT the global object in Node.js - global_scope = typeof global !== 'undefined' ? global : this, + globalScope = typeof global !== 'undefined' ? global : this, round = Math.round, i, @@ -1165,9 +1165,9 @@ //compute day of the year from weeks and weekdays if (config._w && config._a[DATE] == null && config._a[MONTH] == null) { fixYear = function (val) { - var int_val = parseInt(val, 10); + var intVal = parseInt(val, 10); return val ? - (val.length < 3 ? (int_val > 68 ? 1900 + int_val : 2000 + int_val) : int_val) : + (val.length < 3 ? (intVal > 68 ? 1900 + intVal : 2000 + intVal) : intVal) : (config._a[YEAR] == null ? moment().weekYear() : config._a[YEAR]); }; @@ -2037,7 +2037,7 @@ // Keeping the time actually adds/subtracts (one hour) // from the actual represented time. That is why we call updateOffset // a second time. In case it wants us to change the offset again - // _change_in_progress == true case, then we have to adjust, because + // _changeInProgress == true case, then we have to adjust, because // there is no such time in the given timezone. zone : function (input, keepTime) { var offset = this._offset || 0; @@ -2051,13 +2051,13 @@ this._offset = input; this._isUTC = true; if (offset !== input) { - if (!keepTime || this._change_in_progress) { + if (!keepTime || this._changeInProgress) { addOrSubtractDurationFromMoment(this, moment.duration(offset - input, 'm'), 1, false); - } else if (!this._change_in_progress) { - this._change_in_progress = true; + } else if (!this._changeInProgress) { + this._changeInProgress = true; moment.updateOffset(this, true); - this._change_in_progress = null; + this._changeInProgress = null; } } } else { @@ -2175,16 +2175,16 @@ }); function deprecate(msg, fn) { - var first_time = true; + var firstTime = true; function printMsg() { if (typeof console !== 'undefined' && console.warn) { console.warn("Deprecation warning: " + msg); } } return extend(function () { - if (first_time) { + if (firstTime) { printMsg(); - first_time = false; + firstTime = false; } return fn.apply(this, arguments); }, fn); @@ -2426,19 +2426,19 @@ Exposing Moment ************************************/ - function makeGlobal(should_deprecate) { + function makeGlobal(shouldDeprecate) { /*global ender:false */ if (typeof ender !== 'undefined') { return; } - if (should_deprecate) { - global_scope.moment = deprecate( + if (shouldDeprecate) { + globalScope.moment = deprecate( "Accessing Moment through the global scope is " + "deprecated, and will be removed in an upcoming " + "release.", moment); } else { - global_scope.moment = moment; + globalScope.moment = moment; } } diff --git a/test/moment/days_in_month.js b/test/moment/days_in_month.js index aa4e23d0a..7657a7d22 100644 --- a/test/moment/days_in_month.js +++ b/test/moment/days_in_month.js @@ -1,6 +1,6 @@ var moment = require("../../moment"); -exports.days_in_month = { +exports.daysInMonth = { setUp : function (done) { moment.createFromInputFallback = function () { throw new Error("input not handled by moment"); diff --git a/test/moment/getters_setters.js b/test/moment/getters_setters.js index fb631e1cd..59ac5c2da 100644 --- a/test/moment/getters_setters.js +++ b/test/moment/getters_setters.js @@ -1,6 +1,6 @@ var moment = require("../../moment"); -exports.getters_setters = { +exports.gettersSetters = { setUp : function (done) { moment.createFromInputFallback = function () { throw new Error("input not handled by moment"); diff --git a/test/moment/is_after.js b/test/moment/is_after.js index 7eae5e36b..38da3ca52 100644 --- a/test/moment/is_after.js +++ b/test/moment/is_after.js @@ -1,6 +1,6 @@ var moment = require("../../moment"); -exports.is_after = { +exports.isAfter = { setUp : function (done) { moment.createFromInputFallback = function () { throw new Error("input not handled by moment"); diff --git a/test/moment/is_before.js b/test/moment/is_before.js index 3e932d790..0a2f6f819 100644 --- a/test/moment/is_before.js +++ b/test/moment/is_before.js @@ -1,6 +1,6 @@ var moment = require("../../moment"); -exports.is_before = { +exports.isBefore = { setUp : function (done) { moment.createFromInputFallback = function () { throw new Error("input not handled by moment"); diff --git a/test/moment/is_moment.js b/test/moment/is_moment.js index f57f9ff80..202f2ce1f 100644 --- a/test/moment/is_moment.js +++ b/test/moment/is_moment.js @@ -1,6 +1,6 @@ var moment = require('../../moment'); -exports.is_moment = { +exports.isMoment = { setUp : function (done) { moment.createFromInputFallback = function () { throw new Error("input not handled by moment"); diff --git a/test/moment/is_same.js b/test/moment/is_same.js index 0f4bd7270..b30b5cf95 100644 --- a/test/moment/is_same.js +++ b/test/moment/is_same.js @@ -1,6 +1,6 @@ var moment = require("../../moment"); -exports.is_same = { +exports.isSame = { setUp : function (done) { moment.createFromInputFallback = function () { throw new Error("input not handled by moment"); diff --git a/test/moment/is_valid.js b/test/moment/is_valid.js index 410bd69d5..5a8b23b8c 100644 --- a/test/moment/is_valid.js +++ b/test/moment/is_valid.js @@ -1,6 +1,6 @@ var moment = require("../../moment"); -exports.is_valid = { +exports.isValid = { setUp : function (done) { moment.createFromInputFallback = function () { throw new Error("input not handled by moment"); diff --git a/test/moment/min_max.js b/test/moment/min_max.js index e71da0a89..a638573f5 100644 --- a/test/moment/min_max.js +++ b/test/moment/min_max.js @@ -4,7 +4,7 @@ var equalMoment = function (test, a, b, msg) { test.equal(a.valueOf(), b.valueOf(), msg); }; -exports.min_max = { +exports.minMax = { setUp : function (cb) { moment.lang('en'); moment.createFromInputFallback = function () { diff --git a/test/moment/parsing_flags.js b/test/moment/parsing_flags.js index bac76eb30..6897333e2 100644 --- a/test/moment/parsing_flags.js +++ b/test/moment/parsing_flags.js @@ -3,7 +3,7 @@ var moment = require('../../moment'), return moment.apply(null, arguments).parsingFlags(); }; -exports.parsing_flags = { +exports.parsingFlags = { setUp : function (done) { moment.createFromInputFallback = function () { throw new Error("input not handled by moment"); diff --git a/test/moment/preparse_postformat.js b/test/moment/preparse_postformat.js index a8d1c3a76..5e38f8758 100644 --- a/test/moment/preparse_postformat.js +++ b/test/moment/preparse_postformat.js @@ -41,7 +41,7 @@ var symbolLang = { } }; -exports.preparse_postformat = { +exports.preparsePostformat = { setUp: function (cb) { moment.lang('symbol', symbolLang); moment.createFromInputFallback = function () { diff --git a/test/moment/sod_eod.js b/test/moment/sod_eod.js index ecbcb9233..65e2b2ab1 100644 --- a/test/moment/sod_eod.js +++ b/test/moment/sod_eod.js @@ -1,6 +1,6 @@ var moment = require("../../moment"); -exports.end_start_of = { +exports.endStartOf = { setUp : function (done) { moment.lang('en'); moment.createFromInputFallback = function () { diff --git a/test/moment/string_prototype.js b/test/moment/string_prototype.js index 729404e89..3a8611fdb 100644 --- a/test/moment/string_prototype.js +++ b/test/moment/string_prototype.js @@ -1,6 +1,6 @@ var moment = require("../../moment"); -exports.string_prototype = { +exports.stringPrototype = { setUp : function (done) { moment.createFromInputFallback = function () { throw new Error("input not handled by moment"); diff --git a/test/moment/week_year.js b/test/moment/week_year.js index 132d6c05b..325a1333d 100644 --- a/test/moment/week_year.js +++ b/test/moment/week_year.js @@ -1,6 +1,6 @@ var moment = require("../../moment"); -exports.week_year = { +exports.weekYear = { setUp : function (done) { moment.createFromInputFallback = function () { throw new Error("input not handled by moment"); diff --git a/test/moment/weekday.js b/test/moment/weekday.js index c7b8a7201..6936da030 100644 --- a/test/moment/weekday.js +++ b/test/moment/weekday.js @@ -1,6 +1,6 @@ var moment = require("../../moment"); -exports.week_year = { +exports.weekYear = { setUp : function (done) { moment.createFromInputFallback = function () { throw new Error("input not handled by moment"); diff --git a/test/moment/weeks_in_year.js b/test/moment/weeks_in_year.js index 226154006..1a81223a0 100644 --- a/test/moment/weeks_in_year.js +++ b/test/moment/weeks_in_year.js @@ -1,6 +1,6 @@ var moment = require("../../moment"); -exports.weeks_in_year = { +exports.weeksInYear = { "isoWeeksInYear": function (test) { test.equal(moment([2004]).isoWeeksInYear(), 53, "2004 has 53 iso weeks"); test.equal(moment([2005]).isoWeeksInYear(), 52, "2005 has 53 iso weeks");