forked from reactioncommerce/reaction
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Loading 1455 (reactioncommerce#1471)
* Updated loader component to be consistent with other spinners Added loader for PDP container. Added a basic circular progress component. Removed domkit package. Replaced loader with already available spinner component through CSS. * Renamed loading.jsx to loading.js. JSX extension is unnecessary.
- Loading branch information
1 parent
7971159
commit 8a43db8
Showing
6 changed files
with
44 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
imports/plugins/core/ui/client/components/loading/loading.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
107
imports/plugins/core/ui/client/components/loading/loading.jsx
This file was deleted.
Oops, something went wrong.
27 changes: 27 additions & 0 deletions
27
imports/plugins/core/ui/client/components/progress/circularProgress.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters