Skip to content

Commit 12e5f62

Browse files
Merge branch 'dev' of https://github.com/SharePoint/sp-dev-fx-controls-react into add-folder-explorer
2 parents 771a508 + 2322a33 commit 12e5f62

File tree

7 files changed

+187
-110
lines changed

7 files changed

+187
-110
lines changed

CHANGELOG.JSON

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,16 @@
2525
"`FilePicker`: Button text overflow fix + global classnames and properties",
2626
"`FieldUserRenderer`: implementation of `api/SP.UserProfiles.PeopleManager/GetPropertiesFor` is not working on on-prem [#468](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/468)",
2727
"`Placeholder`: Placeholder component is not rendering after a string change in it's properties [#469](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/469)",
28-
"`ListView` documentation update: `minWidth` instead of `maxWidth` [#480](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/480)"
28+
"`ListView` documentation update: `minWidth` instead of `maxWidth` [#480](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/480)",
29+
"`DateTimePicker`: Minutes and Seconds validation [#495](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/495)",
30+
"`FilePicker`: bingAPIKey not working [#489](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/489)"
2931
]
3032
},
3133
"contributions": [
3234
"[Alexander Kleshcheov](https://github.com/SharePickle)",
3335
"[Jason S](https://github.com/jason-appliedis)",
3436
"[JonasBjerke89](https://github.com/JonasBjerke89)",
37+
"[Léo Maradan](https://github.com/Leomaradan)",
3538
"[Matej](https://github.com/Matej4386)",
3639
"[mgwojciech](https://github.com/mgwojciech)",
3740
"[Piotr Siatka](https://github.com/siata13)",

package-lock.json

Lines changed: 150 additions & 102 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/controls/dateTimePicker/MinutesComponent.tsx

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import * as strings from 'ControlStrings';
12
import * as React from 'react';
23
import { ITimeComponentProps } from './ITimeComponentProps';
34
import { MaskedTextField } from 'office-ui-fabric-react/lib/TextField';
@@ -46,8 +47,17 @@ export default class MinutesComponent extends React.Component<ITimeComponentProp
4647
label=""
4748
value={value ? TimeHelper.suffixZero(value.toString()) : "00"}
4849
onGetErrorMessage={(val) => {
49-
onChange(val);
50-
return "";
50+
let message = "";
51+
const minutes: number = parseInt(val);
52+
if (isNaN(minutes)) {
53+
message = strings.DateTimePickerMinuteValueInvalid;
54+
}
55+
56+
if (!message) {
57+
onChange(val);
58+
}
59+
60+
return message;
5161
}}
5262
mask="59"
5363
maskFormat={{

0 commit comments

Comments
 (0)