aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-11-29 06:06:44 +0800
committerFabio Berger <me@fabioberger.com>2017-11-29 06:06:44 +0800
commit9ce899d3f3610fc5fe1b11b7446c56021ae42b5d (patch)
tree3c0e8febebe614212e6d5af1c331f6ffc58c3ce6
parent3c3033586d517da667a7618f57c0bc131ae2599e (diff)
parente71c7fdb16b3477e75c10d349ebeccab394ef9b1 (diff)
downloaddexon-sol-tools-9ce899d3f3610fc5fe1b11b7446c56021ae42b5d.tar
dexon-sol-tools-9ce899d3f3610fc5fe1b11b7446c56021ae42b5d.tar.gz
dexon-sol-tools-9ce899d3f3610fc5fe1b11b7446c56021ae42b5d.tar.bz2
dexon-sol-tools-9ce899d3f3610fc5fe1b11b7446c56021ae42b5d.tar.lz
dexon-sol-tools-9ce899d3f3610fc5fe1b11b7446c56021ae42b5d.tar.xz
dexon-sol-tools-9ce899d3f3610fc5fe1b11b7446c56021ae42b5d.tar.zst
dexon-sol-tools-9ce899d3f3610fc5fe1b11b7446c56021ae42b5d.zip
Merge branch 'development' into feature/connect-docs
* development: rename for clarity remove unused code Publish
-rw-r--r--packages/0x.js/package.json2
-rw-r--r--packages/connect/package.json4
-rw-r--r--packages/website/package.json2
-rw-r--r--packages/website/ts/index.tsx9
-rw-r--r--packages/website/ts/pages/documentation/event_definition.tsx4
-rw-r--r--packages/website/ts/pages/documentation/method_signature.tsx4
6 files changed, 8 insertions, 17 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 4b1dd478c..97aff0581 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
{
"name": "0x.js",
- "version": "0.27.0",
+ "version": "0.27.1",
"description": "A javascript library for interacting with the 0x protocol",
"keywords": [
"0x.js",
diff --git a/packages/connect/package.json b/packages/connect/package.json
index 0d6ecb3d2..4048ab186 100644
--- a/packages/connect/package.json
+++ b/packages/connect/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/connect",
- "version": "0.1.1",
+ "version": "0.1.2",
"description": "A javascript library for interacting with the standard relayer api",
"keywords": [
"connect",
@@ -36,7 +36,7 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/connect/README.md",
"dependencies": {
- "0x.js": "^0.27.0",
+ "0x.js": "^0.27.1",
"@0xproject/assert": "^0.0.6",
"@0xproject/json-schemas": "^0.6.9",
"bignumber.js": "~4.1.0",
diff --git a/packages/website/package.json b/packages/website/package.json
index ca1f440a4..eb6a5df35 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -18,7 +18,7 @@
"author": "Fabio Berger",
"license": "Apache-2.0",
"dependencies": {
- "0x.js": "^0.27.0",
+ "0x.js": "^0.27.1",
"accounting": "^0.4.1",
"basscss": "^8.0.3",
"bignumber.js": "~4.1.0",
diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx
index 283eb8125..922102d96 100644
--- a/packages/website/ts/index.tsx
+++ b/packages/website/ts/index.tsx
@@ -94,15 +94,6 @@ const LazyConnectDocumentation = createLazyComponent(
),
);
-const docs = class Documentation extends
- React.Component<any, any> {
- public render() {
- return (
- <div>hlwkdjaeljdflajfesli</div>
- );
- }
- };
-
const store: ReduxStore<State> = createStore(reducer);
render(
<Router>
diff --git a/packages/website/ts/pages/documentation/event_definition.tsx b/packages/website/ts/pages/documentation/event_definition.tsx
index 3b1b86112..469e6bb37 100644
--- a/packages/website/ts/pages/documentation/event_definition.tsx
+++ b/packages/website/ts/pages/documentation/event_definition.tsx
@@ -55,7 +55,7 @@ export class EventDefinition extends React.Component<EventDefinitionProps, Event
private renderEventCode() {
const indexed = <span style={{color: CUSTOM_GREEN}}> indexed</span>;
const eventArgs = _.map(this.props.event.eventArgs, (eventArg: EventArg) => {
- const t = (
+ const type = (
<Type
type={eventArg.type}
docsInfo={this.props.docsInfo}
@@ -63,7 +63,7 @@ export class EventDefinition extends React.Component<EventDefinitionProps, Event
);
return (
<span key={`eventArg-${eventArg.name}`}>
- {eventArg.name}{eventArg.isIndexed ? indexed : ''}: {t},
+ {eventArg.name}{eventArg.isIndexed ? indexed : ''}: {type},
</span>
);
});
diff --git a/packages/website/ts/pages/documentation/method_signature.tsx b/packages/website/ts/pages/documentation/method_signature.tsx
index 197252fb4..846c9fa4f 100644
--- a/packages/website/ts/pages/documentation/method_signature.tsx
+++ b/packages/website/ts/pages/documentation/method_signature.tsx
@@ -48,7 +48,7 @@ function renderParameters(
const parameters = method.parameters;
const params = _.map(parameters, (p: Parameter) => {
const isOptional = p.isOptional;
- const t = (
+ const type = (
<Type
type={p.type}
typeDefinitionByName={typeDefinitionByName}
@@ -57,7 +57,7 @@ function renderParameters(
);
return (
<span key={`param-${p.type}-${p.name}`}>
- {p.name}{isOptional && '?'}: {t}
+ {p.name}{isOptional && '?'}: {type}
</span>
);
});