Skip to content

Commit

Permalink
Merge branch 'master' into v0.11
Browse files Browse the repository at this point in the history
Conflicts:
	docs/src/app/components/pages/components/date-picker.jsx
	docs/src/app/components/pages/components/table.jsx
	docs/src/app/components/pages/components/tabs.jsx
	src/tabs/tabs.jsx
  • Loading branch information
Hai Nguyen committed Aug 13, 2015
2 parents 534b23d + f660d03 commit e92854d
Show file tree
Hide file tree
Showing 150 changed files with 3,027 additions and 1,822 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
node_modules
npm-debug.log
build
coverage

# Exclude compiled files
lib
Expand Down
3 changes: 2 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
build
coverage
docs
example
icon-builder
icon-builder
41 changes: 41 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,47 @@
## 0.10.4
###### _Aug 8, 2015_

##### Component Fixes / Enhancements
- TouchRipple - Fixed a bug that caused onClick to not fire on the first click (#1370)

## 0.10.3
###### _Aug 8, 2015_

##### General
- We've set up the project to perform automated tests - now we just need to increase our test coverage. :) (#1331)
- The style auto-prefixer now caches browser test results so that it only has to perform them once.

##### New Components
- RefreshIndicator (#1312)

##### Component Fixes / Enhancements
- AppBar - showMenuIconButton now only affects the icon next to the title (#1295, #1182)
- CardMedia - CardMedia children styles are now being properly merged (#1306)
- Dialog - fixed a bug that caused the dialog height to be incorrect on window resize (#1305)
- FloatingActionButton - Added backgroundColor and disabledColor props (#1329)
- FocusRipples now only get rendered when needed.
- IconMenu - Added isOpen() (#1288)
- LeftNav
- Added menuItemClassName, menuItemClassNameSubheader, menuItemClassNameLink props (#1318)
- Fixed a display problem that cuased icons to not be the correct color (#1324)
- ListItem - fixed incorrect styling on disabled list items (#1350)
- SelectField
- Fixed a bug that happened when select field was controlled and the value was undefined (#1227)
- Fixed error text positioning (#1341, #1111)
- Added errorStyle prop (#1341)
- Snackbar - Clickaway is now properly bound when openOnMount is true (#1327)
- Tabs - Added contentContainerClassName prop (#1285)
- TextField - Added underlineStyle prop (#1343)
- TimePicker - Added pedantic prop (#1275, #1173)

## 0.10.2
###### _Jul 29, 2015_

##### Breaking Changes (Missed in the original release notes.)
- Changed `date-picker/index.js` to expose DatePicker and DatePickerDialog.
Hence `require('material-ui/lib/date-picker')` no longer works. Use
`require('material-ui/lib/date-picker/date-picker')` instead.

##### General
- Replaced onMouseOver / onMouseOut with onMouseEnter / onMouseLeave to achieve hover affects.
This prevented extra unnecessary renders from happening. (#1190)
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#[Material-UI](http://callemall.github.io/material-ui/) [![Build Status](https://travis-ci.org/callemall/material-ui.svg?branch=master)](https://travis-ci.org/callemall/material-ui) [![npm version](https://badge.fury.io/js/material-ui.svg)](http://badge.fury.io/js/material-ui)
#[Material-UI](http://callemall.github.io/material-ui/) [![npm package](https://img.shields.io/npm/v/material-ui.svg?style=flat-square)](https://www.npmjs.org/package/material-ui) [![Build Status](https://img.shields.io/travis/callemall/material-ui.svg?style=flat-square)](https://travis-ci.org/callemall/material-ui) [![Gitter](https://img.shields.io/badge/gitter-join%20chat-f81a65.svg?style=flat-square)](https://gitter.im/callemall/material-ui?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/callemall/material-ui?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Pair on this](https://tf-assets-staging.s3.amazonaws.com/badges/thinkful_repo_badge.svg)](http://start.thinkful.com/react/?utm_source=github&utm_medium=badge&utm_campaign=material-ui)
[![PeerDependencies](https://img.shields.io/david/peer/callemall/material-ui.svg?style=flat-square)](https://david-dm.org/callemall/material-ui#info=peerDependencies&view=list)
[![Dependencies](https://img.shields.io/david/callemall/material-ui.svg?style=flat-square)](https://david-dm.org/callemall/material-ui)
[![DevDependencies](https://img.shields.io/david/dev/callemall/material-ui.svg?style=flat-square)](https://david-dm.org/callemall/material-ui#info=devDependencies&view=list)

Material-UI is a set of [React](http://facebook.github.io/react/) components that implement [Google's Material Design](https://www.google.com/design/spec/material-design/introduction.html) specification.

Expand Down
29 changes: 15 additions & 14 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,18 @@ Now you can run your local server:
```
npm start
```
#Description of [Gulp](https://github.com/gulpjs/gulp) Plugins


##[browserify](https://github.com/substack/node-browserify)
Browsers do not allow us to use the require method from Node.js. With browserify, we can implement dependency management on the browser. It also will bundle the code into one file in an efficient way to not repeat dependiencies that are used more than once.

##[browserSync](http://www.browsersync.io/)
When developing and testing the website, browserSync is a powerful tool that will rebuild and refresh the webpage so you can see the changes you make as you are working.

##markup
Copies all of the files from /src/www to the build folder.

##[gulp_starter](https://github.com/greypants/gulp-starter)
A useful repository that explains how many of gulp's features work and contains an example project to get familiar with it. We use this example to construct our own project.
Open http://localhost:3000 to view the documentation site.
#Description of [Webpack](http://webpack.github.io/docs/)
Webpack is a module bundler that we are using to run our documentation site. This is a quick overview of how the configuration file works.
##Webpack Configuration:
###Entry:
Webpack creates entry points for the application to know where it starts.
###Resolve:
Webpack uses this configuration options to determine how it will deal with requiring files. For example, when the extension is omitted in a require, Webpack will look at the extensions option and try applying one of those.
###Output:
This is where the bundled project will go to and any other files necessary for it to run.
###Plugins:
These are plugins Webpack uses for more functionality. The HTML Webpack Plugin, for example, will add the index.html to your build folder.
###Modules:
Modules and other things that are required will usually need to be loaded and interpreted by Webpack when bundling, and this is where Webpack looks for the different loaders.
*Loading .js files in es6 and es7 will require a loader like babel-loader to interpret the files into es5.
40 changes: 0 additions & 40 deletions docs/gulp/config.js

This file was deleted.

91 changes: 0 additions & 91 deletions docs/gulp/tasks/browserify.js

This file was deleted.

3 changes: 0 additions & 3 deletions docs/gulp/tasks/build.js

This file was deleted.

7 changes: 0 additions & 7 deletions docs/gulp/tasks/css.js

This file was deleted.

16 changes: 0 additions & 16 deletions docs/gulp/tasks/eslint.js

This file was deleted.

7 changes: 0 additions & 7 deletions docs/gulp/tasks/fontIcons.js

This file was deleted.

28 changes: 9 additions & 19 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,22 @@
{
"name": "material-ui-docs",
"version": "0.10.2",
"version": "0.10.4",
"description": "Documentation site for material-ui",
"repository": {
"type": "git",
"url": "https://github.com/callemall/material-ui.git"
},
"scripts": {
"start": "gulp"
},
"devDependencies": {
"babelify": "^6.1.1",
"browser-sync": "^1.8.1",
"browserify": "^10.2.0",
"gulp": "^3.8.10",
"gulp-eslint": "^0.15.0",
"gulp-notify": "^2.1.0",
"gulp-shell": "^0.4.1",
"gulp-sourcemaps": "1.5.2",
"gulp-util": "^3.0.1",
"pretty-hrtime": "^0.2.2",
"require-dir": "^0.1.0",
"underscore": "^1.7.0",
"vinyl-buffer": "^1.0.0",
"vinyl-source-stream": "^1.0.0",
"watchify": "^2.2.1"
"prestart": "webpack-dev-server --config webpack-dev-server.config.js --progress --colors --inline",
"start": "open http://localhost:3000",
"build": "webpack --config webpack-production.config.js --progress --colors --profile"
},
"dependencies": {
"highlight.js": "^8.4.0"
},
"devDependencies": {
"raw-loader": "^0.5.1",
"webpack": "^1.11.0",
"webpack-dev-server": "^1.10.1"
}
}
2 changes: 2 additions & 0 deletions docs/src/app/app-routes.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ let Lists = require('./components/pages/components/lists');
let Menus = require('./components/pages/components/menus');
let Paper = require('./components/pages/components/paper');
let Progress = require('./components/pages/components/progress');
let RefreshIndicator = require('./components/pages/components/refresh-indicator');
let Sliders = require('./components/pages/components/sliders');
let Snackbar = require('./components/pages/components/snackbar');
let Switches = require('./components/pages/components/switches');
Expand Down Expand Up @@ -76,6 +77,7 @@ let AppRoutes = (
<Route name="menus" handler={Menus} />
<Route name="paper" handler={Paper} />
<Route name="progress" handler={Progress} />
<Route name="refresh-indicator" handler={RefreshIndicator} />
<Route name="sliders" handler={Sliders} />
<Route name="switches" handler={Switches} />
<Route name="snackbar" handler={Snackbar} />
Expand Down
2 changes: 1 addition & 1 deletion docs/src/app/app.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
// This is our callback function, whenever the url changes it will be called again.
// Handler: The ReactComponent class that will be rendered
.run(function (Handler) {
React.render(<Handler/>, document.body);
React.render(<Handler/>, document.getElementById('app'));
});

})();
4 changes: 4 additions & 0 deletions docs/src/app/components/code-example/code-block.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ class CodeBlock extends React.Component {
this.componentDidUpdate = this.componentDidUpdate.bind(this);
}

shouldComponentUpdate({children}, nextState){
return this.props.children !== children;
}

componentDidMount() {
hljs.highlightBlock(React.findDOMNode(this));
}
Expand Down
1 change: 1 addition & 0 deletions docs/src/app/components/pages/components.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class Components extends React.Component {
{ route: 'menus', text: 'Menus'},
{ route: 'paper', text: 'Paper'},
{ route: 'progress', text: 'Progress'},
{ route: 'refresh-indicator', text: 'Refresh Indicator'},
{ route: 'sliders', text: 'Sliders'},
{ route: 'switches', text: 'Switches'},
{ route: 'snackbar', text: 'Snackbar'},
Expand Down
13 changes: 2 additions & 11 deletions docs/src/app/components/pages/components/app-bar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,14 @@ let IconButton = require('icon-button');
let NavigationClose = require('svg-icons/navigation/close');
let FlatButton = require('flat-button');
let ComponentDoc = require('../../component-doc');
let Code = require('app-bar-code');


class AppBarPage extends React.Component {

constructor(props) {
super(props);

this.code =
'<AppBar\n' +
' title="Title"\n' +
' iconClassNameRight="muidocs-icon-navigation-expand-more" />\n' +
'\n' +
'<AppBar\n' +
' title="Title"\n' +
' iconElementLeft={<IconButton><NavigationClose /></IconButton>}\n' +
' iconElementRight={<FlatButton label="Save" />} />';

this.desc = 'App bars are a collection of components placed as a static ' +
'header for an application. It is used for navigation, search ' +
'branding, and actions. An app bar is also referred to as the ' +
Expand Down Expand Up @@ -117,7 +108,7 @@ class AppBarPage extends React.Component {
return (
<ComponentDoc
name="AppBar"
code={this.code}
code={Code}
desc={this.desc}
componentInfo={this.componentInfo}>
<AppBar
Expand Down
Loading

0 comments on commit e92854d

Please sign in to comment.