Skip to content

Commit bde4bfc

Browse files
authored
Merge pull request #409 from c-eiser13/issue-405
fix #405, when using drop down for time display, value is now formatt…
2 parents c0292d3 + 804bcc4 commit bde4bfc

File tree

3 files changed

+19
-33
lines changed

3 files changed

+19
-33
lines changed

package-lock.json

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@pnp/telemetry-js": "1.0.0",
2626
"@types/chart.js": "2.7.40",
2727
"chart.js": "2.7.3",
28-
"color": "^3.1.0",
28+
"color": "^3.1.2",
2929
"lodash": "4.17.4",
3030
"office-ui-fabric-react": "5.131.0",
3131
"react-quill": "1.3.3"
@@ -34,10 +34,10 @@
3434
"@microsoft/decorators": "~1.3.0",
3535
"@microsoft/sp-build-web": "~1.3.0",
3636
"@microsoft/sp-core-library": "~1.3.0",
37+
"@microsoft/sp-listview-extensibility": "~1.3.0",
3738
"@microsoft/sp-module-interfaces": "~1.3.0",
3839
"@microsoft/sp-webpart-base": "~1.3.0",
3940
"@microsoft/sp-webpart-workbench": "~1.3.0",
40-
"@microsoft/sp-listview-extensibility": "~1.3.0",
4141
"@types/chai": ">=3.4.34 <3.6.0",
4242
"@types/enzyme": "2.8.7",
4343
"@types/mocha": ">=2.2.33 <2.6.0",
@@ -47,7 +47,7 @@
4747
"@types/react-addons-update": "0.14.14",
4848
"@types/react-dom": "0.14.18",
4949
"@types/sinon": "2.3.4",
50-
"@types/webpack-env": ">=1.12.1 <1.14.0",
50+
"@types/webpack-env": "^1.13.9",
5151
"codecov": "3.0.0",
5252
"enzyme": "2.9.1",
5353
"gulp": "~3.9.1",

src/controls/dateTimePicker/HoursComponent.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default class HoursComponent extends React.Component<IHoursComponentProps
3636
label=''
3737
options={this._hours}
3838
onChanged={option => {
39-
onChange(option.text);
39+
onChange(TimeHelper.hoursValue(option.key as number, this.props.timeConvention))
4040
}}
4141
dropdownWidth={110} />);
4242
}

0 commit comments

Comments
 (0)