camelCase everywhere

diff --git a/Gruntfile.js b/Gruntfile.js
index f8d885d486d3eb9dc72887211e2939c39fa91015..0e220f387ec85be0727aa775f0ce0d3e676540d2 100644 (file)
--- 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 18529c10d539b4a6be33ed5c953ca14c03ffdfd2..49f477c08e9c7de38559525d829204b2d0e82103 100644 (file)
--- 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 a787bcf2d3990b79798bdb5df20bde0b6317e049..152d0a7b9564e9d4dca91f624d5ebdcd5b2f3b50 100644 (file)
--- 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 aa4e23d0a2223ffca749028d1bf131d63a9a1a59..7657a7d221700b15cfa0bc00b26a32d362c0b5cf 100644 (file)
--- 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 fb631e1cd5ebb926d9612f816876b8fa6b7e7c54..59ac5c2daaa9cf41e92d2fb7f48edc598ffa29c8 100644 (file)
--- 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 7eae5e36b97151aa5dfe06e9d1e53fd62b58aeda..38da3ca527850213180128dc1564454962a6812e 100644 (file)
--- 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 3e932d790bc4025790b1e1d62bffd9f76b0c2d43..0a2f6f81969f93ff7b0c72fd7bdb5c89d22db81a 100644 (file)
--- 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 f57f9ff80e5b94037c7e9db5e29c652981615fd2..202f2ce1f59df503949a4d8719b3dd9900bd6c3a 100644 (file)
--- 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 0f4bd727064b378cd75a7d7dfeeef049376f48a0..b30b5cf950e06e49f3aa58311e54587470f71264 100644 (file)
--- 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 410bd69d50c8ba46baff7e65f27dbe5fb48c8b61..5a8b23b8c6915b23e2457d6e584fc79b05928755 100644 (file)
--- 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 e71da0a8990cc668986cc3ebdf89b9b42d44e666..a638573f52f92ce3b46ae4780c859531320d2628 100644 (file)
--- 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 bac76eb30de1b05bd53a1de3b67ec385766cfa89..6897333e20c3341e1060289c26ddd27585f65238 100644 (file)
--- 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 a8d1c3a76b719f527744a2acb2e8381acbd93935..5e38f875826543c97032037a4f60ed0be0a5fc46 100644 (file)
--- 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 ecbcb923373fb78988e90e02d748a4cb863ded44..65e2b2ab11b7239a655759fa0a0ced197f3d6575 100644 (file)
--- 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 729404e899e428ae5cc75b5d2eeb4a267f19d7dc..3a8611fdbe693b40ba36f459c3b760411a735d5a 100644 (file)
--- 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 132d6c05b70c6bceb9992f5eec1536e7e0cdb089..325a1333df82127c24642f7939b79a295928701c 100644 (file)
--- 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 c7b8a7201fdc8d51549db6c1f196237856a8dbdd..6936da030766d6e16dc7d9e44a866ac5b3558277 100644 (file)
--- 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 226154006c4c2d2a93bed7b93be462e2aaf14d00..1a81223a0782fc6badd232e3464bbec9e0d7efa3 100644 (file)
--- 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");