Skip to content

Commit 098fc32

Browse files
committed
Merge pull request #103 from parallaxinc/pkgupdate
Pkgupdate
2 parents 93342a0 + c854859 commit 098fc32

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@
1111
"codemirror": "^4.13.0",
1212
"frylord": "^0.5.0",
1313
"holovisor": "^0.2.0",
14-
"iggins": "^0.1.0",
14+
"iggins": "^0.2.1",
1515
"irken": "^0.6.0",
1616
"lodash": "^3.9.1",
1717
"react": "^0.13.1",
1818
"react-loader": "^1.2.0",
1919
"react-material": "git://github.com/iceddev/react-material#fake-release-13",
2020
"react-mfb-iceddev": "^0.1.0",
21-
"react-select": "^0.4.0",
2221
"react-style": "^0.4.0",
2322
"skrim": "0.0.3",
2423
"snacks": "^0.2.0",

plugins/sidebar/overlays/download.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@ const React = require('react');
55
const through = require('through2');
66
const Card = require('react-material/components/Card');
77
const Button = require('react-material/components/Button');
8-
const Select = require('react-select');
98
const Loader = require('react-loader');
109
const Progress = require('./progress');
1110

12-
require('react-select/dist/default.css');
13-
1411
const styles = require('../styles');
1512

1613
class DownloadOverlay extends React.Component {
@@ -138,7 +135,7 @@ class DownloadOverlay extends React.Component {
138135
<div style={styles.overlayDevicesBottom}>
139136
<div style={styles.overlayLoadingContainer}>
140137
<Button onClick={this.reloadDevices}>Reload Devices</Button>
141-
<Progress setComplete={this.state.progress} />
138+
<Progress percent={this.state.progress} />
142139
</div>
143140
<div style={styles.overlayButtonContainer}>
144141
<Button onClick={this.onAccept}>Download</Button>

plugins/sidebar/overlays/progress.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ class Progress extends React.Component {
88

99
render(){
1010

11-
var setComplete = {width: this.props.setComplete + '%'};
11+
var percent = {width: this.props.percent + '%'};
1212

1313
return (
1414
<div style={styles.progressContainerStyle}>
15-
<div styles={[styles.progressBarStyle, setComplete]}></div>
15+
<div styles={[styles.progressBarStyle, percent]}></div>
1616
</div>
1717
);
1818
}

0 commit comments

Comments
 (0)