MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-02-09 20:58:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

honor removing a time constraint

Browse Source 
Looks like a bug got introduced with the great UI rewrite: when you add
a (start or end) time constraint, then remove one, the change wouldn't
be reflected. Within CalendarTSRange, it used null to mean to keep a
value, and || to check if it was null. These meant empty strings turned
into the existing value, instead of no constraint as they should be.
This was unnecessarily clever; stop doing that.

Also keep the console logging in the deployed config; it's harmless and
eases debugging.
This commit is contained in:
Scott Lamb 2019-02-19 13:38:43 -08:00
parent 36f3bda9c6
commit 6f0c8c19de
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ui-src/lib/models/CalendarTSRange.js
View File

@ -149,16 +149,16 @@ export default class CalendarTSRange {
* Strings are parsed to check if they are valid. Update only takes place * Strings are parsed to check if they are valid. Update only takes place
* if they are. Parsing is in accordance with the installed Time90kParser * if they are. Parsing is in accordance with the installed Time90kParser
* which means: * which means:
* - HH:MM:ss:FFFFFZ format, where each componet may be empty to indicate 0 * - HH:MM:ss:FFFFFZ format, where each component may be empty to indicate 0
* - YYYY-MM-DD format for the date * - YYYY-MM-DD format for the date
* *
* NOTE: This function potentially modifies the content of the range * NOTE: This function potentially modifies the content of the range
* argument. This is on purpose and should reflect the new range values * argument. This is on purpose and should reflect the new range values
* upon succesful parsing! * upon successful parsing!
* *
* @param {object} range A range component * @param {object} range A range component
* @param {String} dateStr Date string, if null range's value is re-used * @param {String} dateStr Date string
* @param {String} timeStr Time string, if null range's value is re-used * @param {String} timeStr Time string
* @param {Boolean} dateOnlyThenEndOfDay True if one should be added to date * @param {Boolean} dateOnlyThenEndOfDay True if one should be added to date
* which is only meaningful if there * which is only meaningful if there
* is no time specified here, and also * is no time specified here, and also
@ -166,8 +166,6 @@ export default class CalendarTSRange {
* @return {Number} New timestamp if succesfully parsed, null otherwise * @return {Number} New timestamp if succesfully parsed, null otherwise
*/ */
_setRangeTime(range, dateStr, timeStr, dateOnlyThenEndOfDay) { _setRangeTime(range, dateStr, timeStr, dateOnlyThenEndOfDay) {
dateStr = dateStr || range.dateStr;
timeStr = timeStr || range.timeStr;
const newTs90k = this._timeParser.parseDateTime90k( const newTs90k = this._timeParser.parseDateTime90k(
dateStr, dateStr,
timeStr, timeStr,
@ -188,11 +186,10 @@ export default class CalendarTSRange {
* Uses _setRangeTime with appropriate dateOnlyThenEndOfDay value. * Uses _setRangeTime with appropriate dateOnlyThenEndOfDay value.
* *
* @param {String} dateStr Date string * @param {String} dateStr Date string
* @param {String} timeStr Time string
* @return {Number} New timestamp if succesfully parsed, null otherwise * @return {Number} New timestamp if succesfully parsed, null otherwise
*/ */
setStartDate(dateStr, timeStr = null) { setStartDate(dateStr) {
return this._setRangeTime(this._start, dateStr, timeStr, false); return this._setRangeTime(this._start, dateStr, this._start.timeStr, false);
} }
/** /**
@ -204,7 +201,7 @@ export default class CalendarTSRange {
* @return {Number} New timestamp if succesfully parsed, null otherwise * @return {Number} New timestamp if succesfully parsed, null otherwise
*/ */
setStartTime(timeStr) { setStartTime(timeStr) {
return this._setRangeTime(this._start, null, timeStr, false); return this._setRangeTime(this._start, this._start.dateStr, timeStr, false);
} }
/** /**
@ -213,11 +210,10 @@ export default class CalendarTSRange {
* Uses _setRangeTime with appropriate addOne value. * Uses _setRangeTime with appropriate addOne value.
* *
* @param {String} dateStr Date string * @param {String} dateStr Date string
* @param {String} timeStr Time string
* @return {Number} New timestamp if succesfully parsed, null otherwise * @return {Number} New timestamp if succesfully parsed, null otherwise
*/ */
setEndDate(dateStr, timeStr = null) { setEndDate(dateStr) {
return this._setRangeTime(this._end, dateStr, timeStr, true); return this._setRangeTime(this._end, dateStr, this._end.timeStr, true);
} }
/** /**
@ -229,7 +225,7 @@ export default class CalendarTSRange {
* @return {Number} New timestamp if succesfully parsed, null otherwise * @return {Number} New timestamp if succesfully parsed, null otherwise
*/ */
setEndTime(timeStr) { setEndTime(timeStr) {
return this._setRangeTime(this._end, null, timeStr, true); return this._setRangeTime(this._end, this._end.dateStr, timeStr, true);
} }
/** /**

1
webpack/prod.config.js
View File

@ -76,7 +76,6 @@ module.exports = (env, args) => {
)), )),
uglifyOptions: { uglifyOptions: {
compress: { compress: {
drop_console: true, // Remove all console.log etc.
keep_infinity: true, // Do not change to 1/0 keep_infinity: true, // Do not change to 1/0
warnings: false, // Do not warn when dropping warnings: false, // Do not warn when dropping
}, },