Skip to content

Commit

Permalink
Injects react-tap-event-plugin when calling getMuiTheme()
Browse files Browse the repository at this point in the history
Resolves mui#3068

Signed-off-by: Neil Gabbadon <[email protected]>
  • Loading branch information
newoga committed Jan 28, 2016
1 parent 1288132 commit 89d11e6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
7 changes: 0 additions & 7 deletions docs/src/app/app.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,12 @@ import React from 'react';
import ReactDOM from 'react-dom';
import {Router} from 'react-router';
import AppRoutes from './app-routes.jsx';
import injectTapEventPlugin from 'react-tap-event-plugin';
import createHistory from 'history/lib/createHashHistory';

//Helpers for debugging
window.React = React;
window.Perf = require('react-addons-perf');

//Needed for onTouchTap
//Can go away when react 1.0 release
//Check this repo:
//https://github.com/zilverline/react-tap-event-plugin
injectTapEventPlugin();

/**
* Render the main app component. You can read more about the react-router here:
* https://github.com/rackt/react-router/blob/master/docs/guides/overview.md
Expand Down
2 changes: 2 additions & 0 deletions src/styles/getMuiTheme.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import merge from 'lodash.merge';
import injectTapEventPlugin from 'react-tap-event-plugin';
import Colors from './colors';
import ColorManipulator from '../utils/color-manipulator';
import autoPrefix from './auto-prefix';
Expand All @@ -12,6 +13,7 @@ import zIndex from './zIndex';
* theme will be deeply merged with the second argument.
*/
export default function getMuiTheme(baseTheme, muiTheme) {
injectTapEventPlugin();
baseTheme = merge({}, lightBaseTheme, baseTheme);
const {
palette,
Expand Down

0 comments on commit 89d11e6

Please sign in to comment.