Merge branch 'master' into lightserv
This commit is contained in:
commit
7eeac232b4
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -1288,7 +1288,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "parity-ui-precompiled"
|
||||
version = "1.4.0"
|
||||
source = "git+https://github.com/ethcore/js-precompiled.git#a59b62ecec8773715d1db7e070bbbe5443eb7378"
|
||||
source = "git+https://github.com/ethcore/js-precompiled.git#f5365b857b006ed60c02eb9360d60d7ddef65104"
|
||||
dependencies = [
|
||||
"parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
@ -7,6 +7,7 @@
|
||||
"transform-runtime",
|
||||
"transform-decorators-legacy",
|
||||
"transform-class-properties",
|
||||
"transform-object-rest-spread",
|
||||
"lodash"
|
||||
],
|
||||
"retainLines": true,
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "parity.js",
|
||||
"version": "0.2.99",
|
||||
"version": "0.2.100",
|
||||
"main": "release/index.js",
|
||||
"jsnext:main": "src/index.js",
|
||||
"author": "Parity Team <admin@parity.io>",
|
||||
@ -48,25 +48,26 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"babel-cli": "6.18.0",
|
||||
"babel-core": "6.18.2",
|
||||
"babel-core": "6.20.0",
|
||||
"babel-eslint": "7.1.1",
|
||||
"babel-loader": "6.2.8",
|
||||
"babel-plugin-lodash": "3.2.10",
|
||||
"babel-plugin-transform-class-properties": "6.19.0",
|
||||
"babel-plugin-transform-class-properties": "6.18.0",
|
||||
"babel-plugin-transform-decorators-legacy": "1.3.4",
|
||||
"babel-plugin-transform-object-rest-spread": "6.20.2",
|
||||
"babel-plugin-transform-react-remove-prop-types": "0.2.11",
|
||||
"babel-plugin-transform-runtime": "6.15.0",
|
||||
"babel-polyfill": "6.16.0",
|
||||
"babel-polyfill": "6.20.0",
|
||||
"babel-preset-es2015": "6.18.0",
|
||||
"babel-preset-es2015-rollup": "1.2.0",
|
||||
"babel-preset-es2016": "6.16.0",
|
||||
"babel-preset-es2017": "6.16.0",
|
||||
"babel-preset-react": "6.16.0",
|
||||
"babel-preset-stage-0": "6.16.0",
|
||||
"babel-register": "6.18.0",
|
||||
"babel-runtime": "6.18.0",
|
||||
"babel-runtime": "6.20.0",
|
||||
"chai": "3.5.0",
|
||||
"chai-enzyme": "0.6.1",
|
||||
"circular-dependency-plugin": "2.0.0",
|
||||
"copy-webpack-plugin": "4.0.1",
|
||||
"core-js": "2.4.1",
|
||||
"coveralls": "2.11.15",
|
||||
|
@ -1 +1 @@
|
||||
// test script 4
|
||||
// test script 6
|
||||
|
@ -262,12 +262,11 @@ export default class Contract {
|
||||
}
|
||||
|
||||
const options = this._getFilterOptions(event, _options);
|
||||
options.fromBlock = 0;
|
||||
options.toBlock = 'latest';
|
||||
|
||||
return this._api.eth
|
||||
.getLogs({
|
||||
fromBlock: 0,
|
||||
toBlock: 'latest',
|
||||
...options
|
||||
})
|
||||
.getLogs(options)
|
||||
.then((logs) => this.parseEventLogs(logs));
|
||||
}
|
||||
|
||||
|
@ -1,55 +0,0 @@
|
||||
/* Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
/* This file is part of Parity.
|
||||
/*
|
||||
/* Parity is free software: you can redistribute it and/or modify
|
||||
/* it under the terms of the GNU General Public License as published by
|
||||
/* the Free Software Foundation, either version 3 of the License, or
|
||||
/* (at your option) any later version.
|
||||
/*
|
||||
/* Parity is distributed in the hope that it will be useful,
|
||||
/* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
/* GNU General Public License for more details.
|
||||
/*
|
||||
/* You should have received a copy of the GNU General Public License
|
||||
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/* todo [adgo] - make local */
|
||||
:global .transition-appear {
|
||||
opacity: 0.01;
|
||||
}
|
||||
|
||||
:global .transition-appear.transition-appear-active {
|
||||
opacity: 1;
|
||||
transition: opacity .3s ease-in-out;
|
||||
}
|
||||
|
||||
:global .transition-enter {
|
||||
opacity: 0.01;
|
||||
}
|
||||
|
||||
:global .transition-enter.transition-enter-active {
|
||||
opacity: 1;
|
||||
transition: opacity .3s ease-in-out;
|
||||
}
|
||||
|
||||
:global .transition-leave {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
:global .transition-leave.transition-leave-active {
|
||||
opacity: 0.01;
|
||||
transition: opacity .3s ease-in-out;
|
||||
}
|
||||
|
||||
:global .absoluteAnimationContainer {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
:global .absoluteAnimationContainer > .transition-leave {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
width: 100%;
|
||||
}
|
@ -1,28 +0,0 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import React, { Component } from 'react';
|
||||
import AnimateChildren from './children';
|
||||
|
||||
export default Wrapped => class Animated extends Component {
|
||||
render () {
|
||||
return (
|
||||
<AnimateChildren>
|
||||
<Wrapped { ...this.props } />
|
||||
</AnimateChildren>
|
||||
);
|
||||
}
|
||||
};
|
@ -1,63 +0,0 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import { isReactComponent } from '../../util/react';
|
||||
import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
|
||||
import './AnimateChildren.css';
|
||||
|
||||
export default class AnimateChildren extends Component {
|
||||
render () {
|
||||
const className = this.props.absolute ? 'absoluteAnimationContainer' : '';
|
||||
return (
|
||||
<ReactCSSTransitionGroup
|
||||
component='div'
|
||||
className={ className }
|
||||
transitionName='transition'
|
||||
transitionAppear
|
||||
transitionAppearTimeout={ 0 }
|
||||
transitionLeaveTimeout={ 0 }
|
||||
transitionEnterTimeout={ 0 }
|
||||
>
|
||||
{ this.renderChildren() }
|
||||
</ReactCSSTransitionGroup>
|
||||
);
|
||||
}
|
||||
|
||||
renderChildren () {
|
||||
const { children, isView } = this.props;
|
||||
|
||||
if (isView) {
|
||||
return React.cloneElement(this.props.children, {
|
||||
key: this.props.pathname
|
||||
});
|
||||
}
|
||||
|
||||
if (isReactComponent(children)) {
|
||||
return React.cloneElement(this.props.children, { ...this.props });
|
||||
}
|
||||
|
||||
return children;
|
||||
}
|
||||
|
||||
static propTypes = {
|
||||
children: PropTypes.any.isRequired,
|
||||
pathname: PropTypes.string,
|
||||
isView: PropTypes.bool,
|
||||
absolute: PropTypes.bool
|
||||
}
|
||||
|
||||
}
|
@ -1,17 +0,0 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
export default from './Animated';
|
@ -15,7 +15,6 @@
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import AnimateChildren from '../../components-compositors/Animated/children';
|
||||
import Call from '../Call';
|
||||
import CallsToolbar from '../CallsToolbar';
|
||||
import styles from './Calls.css';
|
||||
@ -73,13 +72,11 @@ export default class Calls extends Component {
|
||||
}
|
||||
|
||||
return (
|
||||
<AnimateChildren>
|
||||
<div { ...this._test('empty-wrapper') }>
|
||||
<h3 className={ styles.historyInfo } { ...this._test('empty') }>
|
||||
Fire up some calls and the results will be here.
|
||||
</h3>
|
||||
</div>
|
||||
</AnimateChildren>
|
||||
<div { ...this._test('empty-wrapper') }>
|
||||
<h3 className={ styles.historyInfo } { ...this._test('empty') }>
|
||||
Fire up some calls and the results will be here.
|
||||
</h3>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@ -90,17 +87,13 @@ export default class Calls extends Component {
|
||||
return;
|
||||
}
|
||||
|
||||
return (
|
||||
<AnimateChildren>
|
||||
{ calls.map((call, idx) => (
|
||||
<Call
|
||||
key={ calls.length - idx }
|
||||
call={ call }
|
||||
setActiveCall={ this.setActiveCall }
|
||||
/>
|
||||
)) }
|
||||
</AnimateChildren>
|
||||
);
|
||||
return calls.map((call, idx) => (
|
||||
<Call
|
||||
key={ calls.length - idx }
|
||||
call={ call }
|
||||
setActiveCall={ this.setActiveCall }
|
||||
/>
|
||||
));
|
||||
}
|
||||
|
||||
clearActiveCall = () => {
|
||||
|
@ -23,6 +23,7 @@ const postcssImport = require('postcss-import');
|
||||
const postcssNested = require('postcss-nested');
|
||||
const postcssVars = require('postcss-simple-vars');
|
||||
const rucksack = require('rucksack-css');
|
||||
const CircularDependencyPlugin = require('circular-dependency-plugin');
|
||||
|
||||
const ENV = process.env.NODE_ENV || 'development';
|
||||
const isProd = ENV === 'production';
|
||||
@ -102,7 +103,12 @@ function getPlugins (_isProd = isProd) {
|
||||
}
|
||||
}),
|
||||
|
||||
new webpack.optimize.OccurrenceOrderPlugin(!_isProd)
|
||||
new webpack.optimize.OccurrenceOrderPlugin(!_isProd),
|
||||
|
||||
new CircularDependencyPlugin({
|
||||
exclude: /node_modules/,
|
||||
failOnError: true
|
||||
})
|
||||
];
|
||||
|
||||
if (_isProd) {
|
||||
|
Loading…
Reference in New Issue
Block a user