Skip to content

Remove unused getters from TimeValue #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ladsgroup merged 1 commit into from
Jul 20, 2017
Merged

Remove unused getters from TimeValue #116

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 20 additions & 84 deletions src/values/TimeValue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,24 @@ var PARENT = dv.DataValue;
* @throws {Error} if `timestamp` is not a valid YMD-ordered timestamp string resembling ISO 8601.
*/
var SELF = dv.TimeValue = util.inherit( 'DvTimeValue', PARENT, function( timestamp, options ) {
this._time = {};

try {
var matches = /^([-+]?\d+)-(\d+)-(\d+)T(?:(\d+):(\d+)(?::(\d+))?Z?)?$/.exec( timestamp );

// Strip additional leading zeros from the year, but keep 4 digits.
this._time.year = matches[1].replace( /\b0+(?=\d{4})/, '' );
this._time.month = parseInt( matches[2], 10 );
this._time.day = parseInt( matches[3], 10 );
this._time.hour = parseInt( matches[4] || 0, 10 );
this._time.minute = parseInt( matches[5] || 0, 10 );
this._time.second = parseInt( matches[6] || 0, 10 );
var year = matches[1].replace( /\b0+(?=\d{4})/, '' ),
month = parseInt( matches[2], 10 ),
day = parseInt( matches[3], 10 ),
hour = parseInt( matches[4] || 0, 10 ),
minute = parseInt( matches[5] || 0, 10 ),
second = parseInt( matches[6] || 0, 10 );

this.timestamp = ( year.charAt( 0 ) === '-' ? '-' : '+' )
+ pad( year, 4 ) + '-'
+ pad( month, 2 ) + '-'
+ pad( day, 2 ) + 'T'
+ pad( hour, 2 ) + ':'
+ pad( minute, 2 ) + ':'
+ pad( second, 2 ) + 'Z';
} catch( e ) {
throw new Error( 'Unable to process timestamp "' + timestamp + '"' );
}
Expand All @@ -79,10 +85,10 @@ var SELF = dv.TimeValue = util.inherit( 'DvTimeValue', PARENT, function( timesta
} );
}, {
/**
* @property {Object}
* @property {string}
* @private
*/
_time: null,
timestamp: null,

/**
* @property {Object}
Expand Down Expand Up @@ -130,7 +136,9 @@ var SELF = dv.TimeValue = util.inherit( 'DvTimeValue', PARENT, function( timesta
* @return {string}
*/
getSortKey: function() {
return this._getTimestamp( true );
return this.timestamp.replace( /^([+-])(\d+)/, function ( $0, sign, year ) {
return sign + pad( year, 16 );
} );
},

/**
Expand All @@ -142,60 +150,6 @@ var SELF = dv.TimeValue = util.inherit( 'DvTimeValue', PARENT, function( timesta
return this.toJSON();
},

/**
* @since 0.7
*
* @return {string}
*/
getYear: function() {
return this._time.year;
},

/**
* @since 0.7
*
* @return {number}
*/
getMonth: function() {
return this._time.month;
},

/**
* @since 0.7
*
* @return {number}
*/
getDay: function() {
return this._time.day;
},

/**
* @since 0.7
*
* @return {number}
*/
getHour: function() {
return this._time.hour;
},

/**
* @since 0.7
*
* @return {number}
*/
getMinute: function() {
return this._time.minute;
},

/**
* @since 0.7
*
* @return {number}
*/
getSecond: function() {
return this._time.second;
},

/**
* @inheritdoc
*/
Expand All @@ -217,24 +171,6 @@ var SELF = dv.TimeValue = util.inherit( 'DvTimeValue', PARENT, function( timesta
return match;
},

/**
* @private
*
* @param {boolean} [padYear=false] True if the year should be padded to the maximum length of
* 16 digits, false for the default padding to 4 digits.
*
* @return {string} A YMD-ordered timestamp string resembling ISO 8601.
*/
_getTimestamp: function( padYear ) {
return ( this._time.year.charAt( 0 ) === '-' ? '-' : '+' )
+ pad( this._time.year, padYear ? 16 : 4 ) + '-'
+ pad( this._time.month, 2 ) + '-'
+ pad( this._time.day, 2 ) + 'T'
+ pad( this._time.hour, 2 ) + ':'
+ pad( this._time.minute, 2 ) + ':'
+ pad( this._time.second, 2 ) + 'Z';
},

/**
* @inheritdoc
*
Expand All @@ -246,7 +182,7 @@ var SELF = dv.TimeValue = util.inherit( 'DvTimeValue', PARENT, function( timesta
before: this._options.before,
calendarmodel: this._options.calendarModel,
precision: this._options.precision,
time: this._getTimestamp(),
time: this.timestamp,
timezone: this._options.timezone
};
}
Expand Down