Skip to content
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

Jump to bottom

[TimePicker] Fixes #2064 #2135

Merged
merged 2 commits into from
Nov 12, 2015
Merged

[TimePicker] Fixes #2064 #2135

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
904b92e
[TimePicker] FIx: muiTheme missing in state
emohedano Nov 11, 2015
5c43f3f
Added trailing comma for previous commit
emohedano Nov 11, 2015
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
3 changes: 3 additions & 0 deletions src/time-picker/time-picker.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ const StylePropable = require('../mixins/style-propable');
const WindowListenable = require('../mixins/window-listenable');
const TimePickerDialog = require('./time-picker-dialog');
const TextField = require('../text-field');
const ThemeManager = require('../styles/theme-manager');
const DefaultRawTheme = require('../styles/raw-themes/light-raw-theme');


let emptyTime = new Date();
Expand Down Expand Up @@ -50,6 +52,7 @@ const TimePicker = React.createClass({
return {
time: this.props.defaultTime || emptyTime,
dialogTime: new Date(),
muiTheme: this.context.muiTheme ? this.context.muiTheme : ThemeManager.getMuiTheme(DefaultRawTheme),
};
},

Expand Down