Separating formatDate + only init'ing its vars once

diff --git a/client/build.js b/client/build.js
index 4b9df3b3369e36c21cb71016688695627d880b43..7b41a1c99392bed77106b6acb0aabac97617ada6 100644 (file)
--- a/client/build.js
+++ b/client/build.js
@@ -58,8 +58,6 @@ var source_files = [
     __dirname + '/src/models/datastore.js',\r
     __dirname + '/src/models/channelinfo.js',\r
 \r
-    __dirname + '/src/helpers/utils.js',\r
-\r
     __dirname + '/src/views/panel.js',\r
     __dirname + '/src/views/channel.js',\r
     __dirname + '/src/views/applet.js',\r
@@ -89,6 +87,15 @@ var source_files = [
 ];\r
 \r
 \r
+var helpers_path = __dirname + '/src/helpers/';\r
+var helpers_sources = fs.readdirSync(helpers_path)\r
+    .map(function(file){\r
+        return helpers_path + file;\r
+    });\r
+\r
+source_files = source_files.concat(helpers_sources);\r
+\r
+\r
 /**\r
  * Build the kiwi.js/kiwi.min.js files\r
  */\r

diff --git a/client/src/helpers/formatdate.js b/client/src/helpers/formatdate.js
new file mode 100644 (file)
index 0000000..a75af8b
--- /dev/null
+++ b/client/src/helpers/formatdate.js
@@ -0,0 +1,134 @@
+var formatDate = (function() {
+    /*
+    Modified version of date.format.js
+    https://github.com/jacwright/date.format
+    */
+    var locale_init = false, // Once the loales have been loaded, this is set to true
+        shortMonths, longMonths, shortDays, longDays;
+
+    // defining patterns
+    var replaceChars = {
+        // Day
+        d: function() { return (this.getDate() < 10 ? '0' : '') + this.getDate(); },
+        D: function() { return Date.shortDays[this.getDay()]; },
+        j: function() { return this.getDate(); },
+        l: function() { return Date.longDays[this.getDay()]; },
+        N: function() { return this.getDay() + 1; },
+        S: function() { return (this.getDate() % 10 == 1 && this.getDate() != 11 ? 'st' : (this.getDate() % 10 == 2 && this.getDate() != 12 ? 'nd' : (this.getDate() % 10 == 3 && this.getDate() != 13 ? 'rd' : 'th'))); },
+        w: function() { return this.getDay(); },
+        z: function() { var d = new Date(this.getFullYear(),0,1); return Math.ceil((this - d) / 86400000); }, // Fixed now
+        // Week
+        W: function() { var d = new Date(this.getFullYear(), 0, 1); return Math.ceil((((this - d) / 86400000) + d.getDay() + 1) / 7); }, // Fixed now
+        // Month
+        F: function() { return Date.longMonths[this.getMonth()]; },
+        m: function() { return (this.getMonth() < 9 ? '0' : '') + (this.getMonth() + 1); },
+        M: function() { return Date.shortMonths[this.getMonth()]; },
+        n: function() { return this.getMonth() + 1; },
+        t: function() { var d = new Date(); return new Date(d.getFullYear(), d.getMonth(), 0).getDate(); }, // Fixed now, gets #days of date
+        // Year
+        L: function() { var year = this.getFullYear(); return (year % 400 == 0 || (year % 100 != 0 && year % 4 == 0)); },   // Fixed now
+        o: function() { var d  = new Date(this.valueOf());  d.setDate(d.getDate() - ((this.getDay() + 6) % 7) + 3); return d.getFullYear();}, //Fixed now
+        Y: function() { return this.getFullYear(); },
+        y: function() { return ('' + this.getFullYear()).substr(2); },
+        // Time
+        a: function() { return this.getHours() < 12 ? 'am' : 'pm'; },
+        A: function() { return this.getHours() < 12 ? 'AM' : 'PM'; },
+        B: function() { return Math.floor((((this.getUTCHours() + 1) % 24) + this.getUTCMinutes() / 60 + this.getUTCSeconds() / 3600) * 1000 / 24); }, // Fixed now
+        g: function() { return this.getHours() % 12 || 12; },
+        G: function() { return this.getHours(); },
+        h: function() { return ((this.getHours() % 12 || 12) < 10 ? '0' : '') + (this.getHours() % 12 || 12); },
+        H: function() { return (this.getHours() < 10 ? '0' : '') + this.getHours(); },
+        i: function() { return (this.getMinutes() < 10 ? '0' : '') + this.getMinutes(); },
+        s: function() { return (this.getSeconds() < 10 ? '0' : '') + this.getSeconds(); },
+        u: function() { var m = this.getMilliseconds(); return (m < 10 ? '00' : (m < 100 ? '0' : '')) + m; },
+        // Timezone
+        e: function() { return "Not Yet Supported"; },
+        I: function() {
+            var DST = null;
+                for (var i = 0; i < 12; ++i) {
+                        var d = new Date(this.getFullYear(), i, 1);
+                        var offset = d.getTimezoneOffset();
+
+                        if (DST === null) DST = offset;
+                        else if (offset < DST) { DST = offset; break; }
+                        else if (offset > DST) break;
+                }
+                return (this.getTimezoneOffset() == DST) | 0;
+            },
+        O: function() { return (-this.getTimezoneOffset() < 0 ? '-' : '+') + (Math.abs(this.getTimezoneOffset() / 60) < 10 ? '0' : '') + (Math.abs(this.getTimezoneOffset() / 60)) + '00'; },
+        P: function() { return (-this.getTimezoneOffset() < 0 ? '-' : '+') + (Math.abs(this.getTimezoneOffset() / 60) < 10 ? '0' : '') + (Math.abs(this.getTimezoneOffset() / 60)) + ':00'; }, // Fixed now
+        T: function() { var m = this.getMonth(); this.setMonth(0); var result = this.toTimeString().replace(/^.+ \(?([^\)]+)\)?$/, '$1'); this.setMonth(m); return result;},
+        Z: function() { return -this.getTimezoneOffset() * 60; },
+        // Full Date/Time
+        c: function() { return this.format("Y-m-d\\TH:i:sP"); }, // Fixed now
+        r: function() { return this.toString(); },
+        U: function() { return this.getTime() / 1000; }
+    };
+
+
+    var initLocaleFormats = function() {
+        shortMonths = [
+            _kiwi.global.i18n.translate('client.libs.date_format.short_months.january').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.short_months.february').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.short_months.march').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.short_months.april').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.short_months.may').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.short_months.june').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.short_months.july').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.short_months.august').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.short_months.september').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.short_months.october').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.short_months.november').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.short_months.december').fetch()
+        ];
+        longMonths = [
+            _kiwi.global.i18n.translate('client.libs.date_format.long_months.january').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.long_months.february').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.long_months.march').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.long_months.april').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.long_months.may').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.long_months.june').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.long_months.july').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.long_months.august').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.long_months.september').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.long_months.october').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.long_months.november').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.long_months.december').fetch()
+        ];
+        shortDays = [
+            _kiwi.global.i18n.translate('client.libs.date_format.short_days.monday').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.short_days.tuesday').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.short_days.wednesday').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.short_days.thursday').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.short_days.friday').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.short_days.saturday').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.short_days.sunday').fetch()
+        ];
+        longDays = [
+            _kiwi.global.i18n.translate('client.libs.date_format.long_days.monday').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.long_days.tuesday').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.long_days.wednesday').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.long_days.thursday').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.long_days.friday').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.long_days.saturday').fetch(),
+            _kiwi.global.i18n.translate('client.libs.date_format.long_days.sunday').fetch()
+        ];
+
+        locale_init = true;
+    };
+    /* End of date.format */
+
+
+    // Finally.. the actuall formatDate function
+    return function(working_date, format) {
+        if (!locale_init)
+            initLocaleFormats();
+
+        working_date = working_date || new Date();
+        format = format || _kiwi.global.i18n.translate('client_date_format').fetch();
+
+        return format.replace(/(\\?)(.)/g, function(_, esc, chr) {
+            return (esc === '' && replaceChars[chr]) ? replaceChars[chr].call(working_date) : chr;
+        });
+    };
+})();
\ No newline at end of file

diff --git a/client/src/helpers/utils.js b/client/src/helpers/utils.js
index d0da27a6657b6f627fd395d7dbec8660eb82bf9a..eb049e0e9aa6bcc6f7a87280f4d00447e424fa10 100644 (file)
--- a/client/src/helpers/utils.js
+++ b/client/src/helpers/utils.js
@@ -377,125 +377,6 @@ function formatIRCMsg (msg) {
     return out;
 }
 
-
-function formatDate (d) {
-    /* 
-    date.format.js
-    A JavaScript date format library that uses the same method as PHP's date() function.
-
-    https://github.com/jacwright/date.format
-    */
-    Date.shortMonths = [_kiwi.global.i18n.translate('client.libs.date_format.short_months.january').fetch(),
-                        _kiwi.global.i18n.translate('client.libs.date_format.short_months.february').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.short_months.march').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.short_months.april').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.short_months.may').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.short_months.june').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.short_months.july').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.short_months.august').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.short_months.september').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.short_months.october').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.short_months.november').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.short_months.december').fetch()];
-    Date.longMonths = [_kiwi.global.i18n.translate('client.libs.date_format.long_months.january').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.long_months.february').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.long_months.march').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.long_months.april').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.long_months.may').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.long_months.june').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.long_months.july').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.long_months.august').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.long_months.september').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.long_months.october').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.long_months.november').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.long_months.december').fetch()];
-    Date.shortDays = [_kiwi.global.i18n.translate('client.libs.date_format.short_days.monday').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.short_days.tuesday').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.short_days.wednesday').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.short_days.thursday').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.short_days.friday').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.short_days.saturday').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.short_days.sunday').fetch()];
-    Date.longDays = [_kiwi.global.i18n.translate('client.libs.date_format.long_days.monday').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.long_days.tuesday').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.long_days.wednesday').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.long_days.thursday').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.long_days.friday').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.long_days.saturday').fetch(), 
-                        _kiwi.global.i18n.translate('client.libs.date_format.long_days.sunday').fetch()];
-    
-    // defining patterns
-    var replaceChars = {
-        // Day
-        d: function() { return (this.getDate() < 10 ? '0' : '') + this.getDate(); },
-        D: function() { return Date.shortDays[this.getDay()]; },
-        j: function() { return this.getDate(); },
-        l: function() { return Date.longDays[this.getDay()]; },
-        N: function() { return this.getDay() + 1; },
-        S: function() { return (this.getDate() % 10 == 1 && this.getDate() != 11 ? 'st' : (this.getDate() % 10 == 2 && this.getDate() != 12 ? 'nd' : (this.getDate() % 10 == 3 && this.getDate() != 13 ? 'rd' : 'th'))); },
-        w: function() { return this.getDay(); },
-        z: function() { var d = new Date(this.getFullYear(),0,1); return Math.ceil((this - d) / 86400000); }, // Fixed now
-        // Week
-        W: function() { var d = new Date(this.getFullYear(), 0, 1); return Math.ceil((((this - d) / 86400000) + d.getDay() + 1) / 7); }, // Fixed now
-        // Month
-        F: function() { return Date.longMonths[this.getMonth()]; },
-        m: function() { return (this.getMonth() < 9 ? '0' : '') + (this.getMonth() + 1); },
-        M: function() { return Date.shortMonths[this.getMonth()]; },
-        n: function() { return this.getMonth() + 1; },
-        t: function() { var d = new Date(); return new Date(d.getFullYear(), d.getMonth(), 0).getDate() }, // Fixed now, gets #days of date
-        // Year
-        L: function() { var year = this.getFullYear(); return (year % 400 == 0 || (year % 100 != 0 && year % 4 == 0)); },   // Fixed now
-        o: function() { var d  = new Date(this.valueOf());  d.setDate(d.getDate() - ((this.getDay() + 6) % 7) + 3); return d.getFullYear();}, //Fixed now
-        Y: function() { return this.getFullYear(); },
-        y: function() { return ('' + this.getFullYear()).substr(2); },
-        // Time
-        a: function() { return this.getHours() < 12 ? 'am' : 'pm'; },
-        A: function() { return this.getHours() < 12 ? 'AM' : 'PM'; },
-        B: function() { return Math.floor((((this.getUTCHours() + 1) % 24) + this.getUTCMinutes() / 60 + this.getUTCSeconds() / 3600) * 1000 / 24); }, // Fixed now
-        g: function() { return this.getHours() % 12 || 12; },
-        G: function() { return this.getHours(); },
-        h: function() { return ((this.getHours() % 12 || 12) < 10 ? '0' : '') + (this.getHours() % 12 || 12); },
-        H: function() { return (this.getHours() < 10 ? '0' : '') + this.getHours(); },
-        i: function() { return (this.getMinutes() < 10 ? '0' : '') + this.getMinutes(); },
-        s: function() { return (this.getSeconds() < 10 ? '0' : '') + this.getSeconds(); },
-        u: function() { var m = this.getMilliseconds(); return (m < 10 ? '00' : (m < 100 ?
-    '0' : '')) + m; },
-        // Timezone
-        e: function() { return "Not Yet Supported"; },
-        I: function() {
-            var DST = null;
-                for (var i = 0; i < 12; ++i) {
-                        var d = new Date(this.getFullYear(), i, 1);
-                        var offset = d.getTimezoneOffset();
-    
-                        if (DST === null) DST = offset;
-                        else if (offset < DST) { DST = offset; break; }                     else if (offset > DST) break;
-                }
-                return (this.getTimezoneOffset() == DST) | 0;
-            },
-        O: function() { return (-this.getTimezoneOffset() < 0 ? '-' : '+') + (Math.abs(this.getTimezoneOffset() / 60) < 10 ? '0' : '') + (Math.abs(this.getTimezoneOffset() / 60)) + '00'; },
-        P: function() { return (-this.getTimezoneOffset() < 0 ? '-' : '+') + (Math.abs(this.getTimezoneOffset() / 60) < 10 ? '0' : '') + (Math.abs(this.getTimezoneOffset() / 60)) + ':00'; }, // Fixed now
-        T: function() { var m = this.getMonth(); this.setMonth(0); var result = this.toTimeString().replace(/^.+ \(?([^\)]+)\)?$/, '$1'); this.setMonth(m); return result;},
-        Z: function() { return -this.getTimezoneOffset() * 60; },
-        // Full Date/Time
-        c: function() { return this.format("Y-m-d\\TH:i:sP"); }, // Fixed now
-        r: function() { return this.toString(); },
-        U: function() { return this.getTime() / 1000; }
-    };
-
-    // Simulates PHP's date function
-    Date.prototype.format = function(format) {
-        var date = this;
-        return format.replace(/(\\?)(.)/g, function(_, esc, chr) {
-            return (esc === '' && replaceChars[chr]) ? replaceChars[chr].call(date) : chr;
-        });
-    };
-    /* End of date.format */
-
-    d = d || new Date();
-    return d.format(_kiwi.global.i18n.translate('client_date_format').fetch());
-}
-
 function escapeRegex (str) {
     return str.replace(/[\[\\\^\$\.\|\?\*\+\(\)]/g, '\\$&');
 }

diff --git a/server/settingsgenerator.js b/server/settingsgenerator.js
index 89d1d25d54fe4dcda4b840eb92722636d9bdaf5e..ffb108708a67fbdcf1c47a2d9dc793d3bcc8316a 100644 (file)
--- a/server/settingsgenerator.js
+++ b/server/settingsgenerator.js
@@ -215,7 +215,8 @@ function addScripts(vars, debug) {
             'src/models/server.js',     // Depends on models/channel.js
             'src/models/pluginmanager.js',
             'src/models/datastore.js',
-            'src/helpers/utils.js'
+            'src/helpers/utils.js',
+            'src/helpers/formatdate.js'
         ],
 
         // Some views extend these, so make sure they're loaded beforehand