Skip to content

Commit

Permalink
upd dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
UsulPro committed Oct 15, 2016
1 parent 90e277a commit 3e55204
Show file tree
Hide file tree
Showing 10 changed files with 5,459 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
node_modules
develop
//dist
dist
4 changes: 2 additions & 2 deletions .storybook/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ setOptions({
name: 'sm-react',
url: 'https://github.com/sm-react/storybook-addon-material-ui',
goFullScreen: false,
showLeftPanel: false,
showDownPanel: false,
showLeftPanel: true,
showDownPanel: true,
showSearchBox: false,
downPanelInRight: false,
});
Expand Down
4 changes: 2 additions & 2 deletions example/SupportProject.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import Paper from 'material-ui/Paper';
import {Card, CardActions, CardHeader, CardMedia, CardTitle, CardText} from 'material-ui/Card';
import TwitterButton from '../src/Utils/twitter';
import GithubButton from '../src/Utils/github';
import TwitterButton from './react-twitter-button';
import GithubButton from './react-github-button';
import smBackground from './smLogoBW.png'

const Buttons = (
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion example/stories/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import DatePickerExampleSimple from '../DatePickerExampleSimple.jsx';
import greyTheme from './greyTheme.json';
import SupportProject from '../SupportProject.jsx';

const SHOW_SUPPORT = false;
const SHOW_SUPPORT = true;

/** note: decorators
* You can add decorator globally:
Expand Down
8 changes: 3 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"eslint-plugin-react": "^5.0.1",
"git-url-parse": "^6.0.1",
"jsdom": "^9.5.0",
"material-ui": "^0.15.4",
"material-ui": "^0.16.0",
"mocha": "^3.0.2",
"node-sass": "^3.10.0",
"raw-loader": "^0.5.1",
Expand All @@ -76,14 +76,12 @@
},
"peerDependencies": {
"@kadira/storybook": "^2.18.1",
"@kadira/storybook-addons": "^1.3.0",
"material-ui": "^0.15.4 || ^0.16.0",
"material-ui": "^0.15.0 || ^0.16.0",
"react": "^0.14.7 || ^15.0.0",
"react-dom": "^0.14.7 || ^15.0.0"
},
"dependencies": {
"@kadira/storybook-addons": "^1.3.0",
"json-stringify-safe": "^5.0.1",
"@kadira/storybook-addons": "^1.5.0",
"react-material-color-picker": "^1.1.0",
"react-split-pane": "^0.1.50",
"react-tap-event-plugin": "^1.0.0"
Expand Down
6 changes: 3 additions & 3 deletions src/containers/MuiTheme.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { EVENT_ID_DATA, CSS_CLASS } from '../'; // future: add CSS_CLASS
// future: [x] remove ThemeToolbar
import ThemeSideBar from '../components/ThemeSideBar';
import SplitPane from 'react-split-pane';
const stringify = require('json-stringify-safe');
// const stringify = require('json-stringify-safe');

const propTypes = {
themesAppliedListInit: React.PropTypes.arrayOf(React.PropTypes.object),
Expand Down Expand Up @@ -92,8 +92,8 @@ export default class MuiTheme extends React.Component {

dataChannelSend(data) {
if (this.isChannelData || !this.state.isMount) return false;
const dataStr = stringify(data);
this.props.channel.emit(EVENT_ID_DATA, dataStr);
// const dataStr = stringify(data);
this.props.channel.emit(EVENT_ID_DATA, data);
return true;
}

Expand Down
4 changes: 2 additions & 2 deletions src/containers/PanelContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ export default class PanelContainer extends React.Component {
this.setState({ ...initData, ...queryData, themesNameList, isReady: true });
}

onDataChannel(strData) {
const stateData = JSON.parse(strData);
onDataChannel(stateData) {
// const stateData = JSON.parse(strData);
const themesNameList = this.genNameList(stateData.themesAppliedList);
this.isChannelData = true; // note: this state received by channel, don't need to send back
this.setState({ ...stateData, themesNameList });
Expand Down
Loading

0 comments on commit 3e55204

Please sign in to comment.