From 904b92e8dc1305f7e8c5f766d0882b4bd8ffa74e Mon Sep 17 00:00:00 2001 From: Eduardo Mohedano Date: Wed, 11 Nov 2015 17:43:31 -0600 Subject: [PATCH 1/2] [TimePicker] FIx: muiTheme missing in state --- src/time-picker/time-picker.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/time-picker/time-picker.jsx b/src/time-picker/time-picker.jsx index a8fab683100d21..70ee37330b5d0a 100644 --- a/src/time-picker/time-picker.jsx +++ b/src/time-picker/time-picker.jsx @@ -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(); @@ -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) }; }, From 5c43f3f09f596b719c1be33cc834d7fae5e58efa Mon Sep 17 00:00:00 2001 From: Eduardo Mohedano Date: Wed, 11 Nov 2015 17:57:22 -0600 Subject: [PATCH 2/2] Added trailing comma for previous commit --- src/time-picker/time-picker.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/time-picker/time-picker.jsx b/src/time-picker/time-picker.jsx index 70ee37330b5d0a..c46212f9b5b02e 100644 --- a/src/time-picker/time-picker.jsx +++ b/src/time-picker/time-picker.jsx @@ -52,7 +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) + muiTheme: this.context.muiTheme ? this.context.muiTheme : ThemeManager.getMuiTheme(DefaultRawTheme), }; },