Navy.gif/timestring
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix jhint errors

Browse Source
This commit is contained in:
Mike Barrett 2014-07-17 22:10:24 +01:00
parent 587bcbcbc8
commit 4740173d3e
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/timestring.js
View File

@ -11,16 +11,10 @@
};
// merge default settings with user settings
var settings = settings || {};
settings = settings || {};
this.settings = {};
for (var property in defaults) {
this.settings[property] = defaults[property];
}
for (var property in settings) {
this.settings[property] = settings[property];
}
for (var d in defaults) { this.settings[d] = defaults[d]; }
for (var s in settings) { this.settings[s] = settings[s]; }
// time units
this.units = {
@ -101,12 +95,12 @@
// return total, convert if needed
return (returnUnit) ? convert(totalSeconds, returnUnit) : totalSeconds;
}
};
// add convenience method to string prototype
String.prototype.parseTime = function (unit, settings) {
return (new Timestring(settings)).parse(this, unit);
}
};
// export Timestring object for either the browser or node
if (typeof module !== 'undefined' && module.exports) {