Merge pull request #3142 from alitaheri/critical-bug-fix-0.14.4

Critical bug fix 0.14.4

CHANGELOG.md

@@ -1,5 +1,23 @@
 ## HEAD
 
+## 0.14.4
+###### _Feb 03, 2016_
+
+##### General
+- [CRITICAL] Fixed a regression that completely disabled the auto-prefixer (#3142)
+- [Docs] Contributing guide (#3075)
+- [Docs] Added a `Related Projects` section (#3102)
+- [Examples] General updates (#3078)
+
+##### Component Fixes / Enhancements
+- [Tabs] Removed the calc style property (#3058)
+- [Tabs] Added icon and text (#3042)
+- [Tabs] Use `FlatButtons` for tabs (#3051)
+- [AutoComplete] Fixed regression of undefined muiTheme (#3069)
+- [List] Auto-expand SelectableList (#3039)
+- [DatePicker] Added `disabled` property (#3060)
+- [Buttons] Fixed the vertical alignment issue (#3100)
+
 ## 0.14.3
 ###### _Jan 26, 2016_
 

docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "material-ui-docs",
-  "version": "0.14.3",
+  "version": "0.14.4",
   "description": "Documentation site for material-ui",
   "repository": {
     "type": "git",

docs/src/app/components/pages/components/TimePicker/Page.jsx

@@ -9,14 +9,11 @@ import TimePickerExampleSimple from './ExampleSimple';
 import timePickerExampleSimpleCode from '!raw!./ExampleSimple';
 import TimePickerExampleComplex from './ExampleComplex';
 import timePickerExampleComplexCode from '!raw!./ExampleComplex';
-import TimePickerExampleInternational from './ExampleInternational';
-import timePickerExampleInternationalCode from '!raw!./ExampleInternational';
 
 const descriptions = {
   simple: 'Time Picker supports 12 hour and 24 hour formats. In 12 hour format the AM and PM indicators toggle the ' +
   'selected time period.',
   controlled: '`TimePicker` can be used as a controlled component.',
-  localised: 'The buttons can be localised using the `wordings` property.',
 };
 
 const TimePickersPage = () => (
@@ -36,13 +33,6 @@ const TimePickersPage = () => (
     >
       <TimePickerExampleComplex />
     </CodeExample>
-    <CodeExample
-      title="Localised example"
-      description={descriptions.localised}
-      code={timePickerExampleInternationalCode}
-    >
-      <TimePickerExampleInternational />
-    </CodeExample>
     <PropTypeDescription code={timePickerCode} />
   </div>
 );

examples/browserify-gulp-example/package.json

@@ -1,6 +1,6 @@
 {
   "name": "material-ui-example-browserify",
-  "version": "0.14.3",
+  "version": "0.14.4",
   "description": "Sample project that uses material-ui",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "watchify": "^3.6.1"
   },
   "dependencies": {
-    "material-ui": "^0.14.3",
+    "material-ui": "^0.14.4",
     "react": "^0.14.0",
     "react-dom": "^0.14.0",
     "react-tap-event-plugin": "^0.2.1"

examples/webpack-example/package.json

@@ -1,6 +1,6 @@
 {
   "name": "material-ui-example-webpack",
-  "version": "0.14.3",
+  "version": "0.14.4",
   "description": "Sample project that uses material-ui",
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
     "webpack-dev-server": "^1.14.0"
   },
   "dependencies": {
-    "material-ui": "^0.14.3",
+    "material-ui": "^0.14.4",
     "react": "^0.14.3",
     "react-dom": "^0.14.3",
     "react-tap-event-plugin": "^0.2.1"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "material-ui",
   "author": "Call-em-all Engineering Team",
-  "version": "0.14.3",
+  "version": "0.14.4",
   "description": "Material Design UI components built with React",
   "main": "./lib",
   "scripts": {

src/styles/auto-prefix.js

@@ -28,7 +28,7 @@ export default {
         userAgent: userAgent,
       });
 
-      return prefixer.prefix;
+      return (style) => prefixer.prefix(style);
     }
   },
 

src/time-picker/time-picker-dialog.jsx

@@ -16,7 +16,6 @@ const TimePickerDialog = React.createClass({
     onAccept: React.PropTypes.func,
     onDismiss: React.PropTypes.func,
     onShow: React.PropTypes.func,
-    wordings: React.PropTypes.object,
   },
 
   contextTypes: {
@@ -30,15 +29,6 @@ const TimePickerDialog = React.createClass({
 
   mixins: [StylePropable, WindowListenable],
 
-  getDefaultProps() {
-    return {
-      wordings: {
-        ok: 'OK',
-        cancel: 'Cancel',
-      },
-    };
-  },
-
   getInitialState() {
     return {
       open: false,
@@ -104,7 +94,6 @@ const TimePickerDialog = React.createClass({
       onAccept,
       format,
       autoOk,
-      wordings,
       ...other,
     } = this.props;
 
@@ -124,23 +113,18 @@ const TimePickerDialog = React.createClass({
     let actions = [
       <FlatButton
         key={0}
-        label={wordings.cancel}
+        label="Cancel"
         secondary={true}
         onTouchTap={this.dismiss}
       />,
+      <FlatButton
+        key={1}
+        label="OK"
+        secondary={true}
+        onTouchTap={this._handleOKTouchTap}
+      />,
     ];
 
-    if (!autoOk) {
-      actions.push(
-        <FlatButton
-          key={1}
-          label={wordings.ok}
-          secondary={true}
-          onTouchTap={this._handleOKTouchTap}
-        />
-      );
-    }
-
     const onClockChangeMinutes = (autoOk === true ? this._handleOKTouchTap : undefined);
 
     return (

src/time-picker/time-picker.jsx

@@ -78,11 +78,6 @@ const TimePicker = React.createClass({
      * Override the inline-styles of TimePicker's TextField element.
      */
     textFieldStyle: React.PropTypes.object,
-
-    /**
-     * Wordings used inside the button of the dialog.
-     */
-    wordings: React.PropTypes.object,
   },
 
   contextTypes: {
@@ -193,7 +188,6 @@ const TimePicker = React.createClass({
       onShow,
       onDismiss,
       style,
-      wordings,
       textFieldStyle,
       ...other,
     } = this.props;
@@ -217,7 +211,6 @@ const TimePicker = React.createClass({
           onShow={onShow}
           onDismiss={onDismiss}
           format={format}
-          wordings={wordings}
           autoOk={autoOk}
         />
       </div>