Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renaming #13

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions build/bundle.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions demos/radon/client/components/MarketCreator.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import {bind} from 'react-radon';
import {bindToSilo} from 'react-radon';

class MarketCreator extends React.Component {
render() {
Expand All @@ -16,4 +16,4 @@ class MarketCreator extends React.Component {
}
}

export default bind(MarketCreator);
export default bindToSilo(MarketCreator);
4 changes: 2 additions & 2 deletions demos/radon/client/components/MarketDisplay.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import {bind} from 'react-radon';
import {bindToSilo} from 'react-radon';

const MarketDisplay = (props) => (
<div>
Expand All @@ -8,4 +8,4 @@ const MarketDisplay = (props) => (
</div>
);

export default bind(MarketDisplay);
export default bindToSilo(MarketDisplay);
4 changes: 2 additions & 2 deletions demos/radon/client/components/MarketsDisplay.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import MarketDisplay from './MarketDisplay.jsx';
import {bind} from 'react-radon';
import {bindToSilo} from 'react-radon';

const MarketsDisplay = (props) => {

Expand All @@ -12,4 +12,4 @@ const MarketsDisplay = (props) => {
);
};

export default bind(MarketsDisplay);
export default bindToSilo(MarketsDisplay);
4 changes: 2 additions & 2 deletions demos/radon/client/components/TotalsDisplay.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import {bind} from 'react-radon';
import {bindToSilo} from 'react-radon';

class TotalsDisplay extends React.Component{
render() {
Expand All @@ -12,4 +12,4 @@ class TotalsDisplay extends React.Component{
</div>);
}
}
export default bind(TotalsDisplay);
export default bindToSilo(TotalsDisplay);
4 changes: 2 additions & 2 deletions demos/radon/client/containers/MainContainer.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import TotalsDisplay from '../components/TotalsDisplay.jsx';
import MarketsContainer from './MarketsContainer.jsx'
import {bind} from 'react-radon';
import {bindToSilo} from 'react-radon';

class MainContainer extends Component {
constructor(props) {
Expand All @@ -21,4 +21,4 @@ class MainContainer extends Component {
}
}

export default bind(MainContainer);
export default bindToSilo(MainContainer);
6 changes: 3 additions & 3 deletions demos/radon/client/containers/MarketsContainer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { Component } from 'react';
import MarketCreator from '../components/MarketCreator.jsx'
import MarketsDisplay from '../components/MarketDisplay.jsx'
import Market from '../components/Market.jsx';
import {bind, objectBind} from 'react-radon';
import {bindToSilo, bindObjectToSilo} from 'react-radon';

class MarketsContainer extends Component {
constructor(props) {
Expand Down Expand Up @@ -40,7 +40,7 @@ class MarketsContainer extends Component {
let marketData = this.props.val.marketList.val;

for(let i in marketData){
let ArrMarket = objectBind(Market, i, this.props.val.marketList);
let ArrMarket = bindObjectToSilo(Market, i, this.props.val.marketList);
markets.push(<ArrMarket key={i} i={i} addCard={this.addCard} deleteCard={this.deleteCard}/>)
}

Expand All @@ -55,4 +55,4 @@ class MarketsContainer extends Component {
}
}

export default bind(MarketsContainer);
export default bindToSilo(MarketsContainer);
4 changes: 2 additions & 2 deletions demos/radon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
"path": "^0.12.7",
"prop-types": "^15.6.2",
"radon-devtool": "^1.0.11",
"radon-js": "^3.2.16",
"radon-js": "^3.3.0",
"react": "^16.5.1",
"react-dom": "^16.5.1",
"react-radon": "^1.0.12",
"react-radon": "^1.0.15",
"webpack": "^4.19.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-radon",
"version": "1.0.12",
"version": "1.0.14",
"description": "Radon is an object-oriented state management framework for JavaScript applications.",
"main": "build/bundle.js",
"files": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';

// siloObject is passed in to have access to keySubscribe function
function objectBind(ComponentToBind, key, siloObject) {
function bindObjectToSilo(ComponentToBind, key, siloObject) {
class WrapperFunction extends React.Component {
constructor() {
super();
Expand All @@ -27,7 +27,7 @@ function objectBind(ComponentToBind, key, siloObject) {
}

componentWillUnmount() {
//this.unsubscribe();
this.unsubscribe();
}
}

Expand All @@ -39,4 +39,4 @@ function objectBind(ComponentToBind, key, siloObject) {
return WrapperFunction;
}

export default objectBind;
export default bindObjectToSilo;
4 changes: 2 additions & 2 deletions reactBindings/bind.js → reactBindings/bindToSilo.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';

function bind(ComponentToBind) {
function bindToSilo(ComponentToBind) {
class WrapperFunction extends React.Component {
constructor() {
super();
Expand Down Expand Up @@ -63,4 +63,4 @@ function bind(ComponentToBind) {
return WrapperFunction;
}

export default bind;
export default bindToSilo;
8 changes: 4 additions & 4 deletions reactBindings/reactBindings.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import bindImport from './bind.js';
import objectBindImport from './objectBind.js';
import bindImport from './bindToSilo';
import objectBindImport from './bindObjectToSilo.js';
import ProviderImport from './Provider.js';

export const bind = bindImport;
export const objectBind = objectBindImport;
export const bindToSilo = bindImport;
export const bindObjectToSilo = objectBindImport;
export const Provider = ProviderImport;