Merge pull request #2135 from emohedano/bugfixes

[TimePicker] Fixes #2064
mui · Nov 12, 2015 · 4d1bfa2 · 4d1bfa2
2 parents 9c88c9d + 5c43f3f
commit 4d1bfa2
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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),
  };
  },