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

Loading 1455 #1471

Merged
merged 5 commits into from
Oct 6, 2016
Merged
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
1 change: 1 addition & 0 deletions imports/plugins/core/ui/client/components/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

export { Alerts, Alert } from "./alerts";
export { default as Icon } from "./icon/icon";
export { default as CircularProgress } from "./progress/circularProgress";
export { default as Divider } from "./divider/divider";
export { default as Items } from "./items/items";
export { default as Item } from "./items/item";
Expand Down
14 changes: 14 additions & 0 deletions imports/plugins/core/ui/client/components/loading/loading.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React, { Component } from "react";
import CircularProgress from "../progress/circularProgress";

class Loading extends Component {
render() {
return (
<div className="spinner-container spinner-container-lg">
<CircularProgress indetermate={true} />
</div>
);
}
}

export default Loading;
107 changes: 0 additions & 107 deletions imports/plugins/core/ui/client/components/loading/loading.jsx

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React, { Component, PropTypes } from "react";

class CircularProgress extends Component {
renderInderterminateProgress() {
return (
<div className="spinner" />
);
}

render() {
if (this.props.indetermate === true) {
return this.renderInderterminateProgress();
}

return null;
}
}

CircularProgress.propTypes = {
indetermate: PropTypes.bool
};

CircularProgress.defaultProps = {
indetermate: true
};

export default CircularProgress;
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { composeWithTracker } from "react-komposer";
import { ReactionProduct } from "/lib/api";
import { Reaction, i18next, Logger } from "/client/api";
import { Tags, Media } from "/lib/collections";
import { Loading } from "/imports/plugins/core/ui/client/components";
import { ProductDetail } from "../components";
import {
SocialContainer,
Expand Down Expand Up @@ -235,6 +236,6 @@ function composer(props, onData) {
let decoratedComponent = ProductDetailContainer;
// decoratedComponent = DragDropContext(HTML5Backend)(decoratedComponent);
// decoratedComponent = DragDropable(decoratedComponent);
decoratedComponent = composeWithTracker(composer)(decoratedComponent);
decoratedComponent = composeWithTracker(composer, Loading)(decoratedComponent);

export default decoratedComponent;
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"css-annotation": "^0.6.2",
"deep-diff": "^0.3.4",
"dnd-core": "^2.0.2",
"domkit": "^0.0.1",
"faker": "^3.1.0",
"fibers": "^1.0.14",
"font-awesome": "^4.6.3",
Expand Down