From e56fbbac2b9c47bc92930a5f3098481c30744886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Wed, 8 Jul 2015 13:05:15 +0200 Subject: [PATCH] fix polling endless loop --- .../accordion_list_item.js | 5 ++--- js/components/ascribe_media/media_player.js | 19 ------------------- js/components/edition_container.js | 6 +++--- 3 files changed, 5 insertions(+), 25 deletions(-) diff --git a/js/components/ascribe_accordion_list/accordion_list_item.js b/js/components/ascribe_accordion_list/accordion_list_item.js index bf97beed..c5b6b3b3 100644 --- a/js/components/ascribe_accordion_list/accordion_list_item.js +++ b/js/components/ascribe_accordion_list/accordion_list_item.js @@ -19,11 +19,9 @@ let AccordionListItem = React.createClass({ content: React.PropTypes.object, children: React.PropTypes.object }, - handleClick(event){ + handleClick(){ requests.get('piece_first_edition_id', {'piece_id': this.props.content.id}) .then((res) => this.transitionTo('edition', {editionId: res.bitcoin_id})); - - console.log(event.target); }, getGlyphicon(){ if (this.props.content.requestAction){ @@ -53,6 +51,7 @@ let AccordionListItem = React.createClass({

{getLangText('by %s', this.props.content.artist_name)}

{this.props.content.date_created.split('-')[0]} + this.props. {/* {getLangText('%s license', this.props.content.license_type.code)} */} diff --git a/js/components/ascribe_media/media_player.js b/js/components/ascribe_media/media_player.js index a4c84513..786c40a4 100644 --- a/js/components/ascribe_media/media_player.js +++ b/js/components/ascribe_media/media_player.js @@ -133,25 +133,6 @@ let Video = React.createClass({ } }); - -let EncodingStatus = React.createClass({ - propTypes: { - encodingStatus: React.PropTypes.number.isRequired - }, - - render() { - return ( - - ); - } -}); - - let resourceMap = { 'image': Image, 'video': Video, diff --git a/js/components/edition_container.js b/js/components/edition_container.js index e9a169da..e0eae9ab 100644 --- a/js/components/edition_container.js +++ b/js/components/edition_container.js @@ -17,10 +17,10 @@ let EditionContainer = React.createClass({ onChange(state) { this.setState(state); - let isEncoding = state.edition.digital_work.isEncoding; - if (isEncoding !== undefined && isEncoding !== 100) { + let isEncoding = state.edition.digital_work ? state.edition.digital_work.isEncoding : null; + if (typeof isEncoding === 'number' && isEncoding !== 100 && !this.state.timerId) { let timerId = window.setInterval(() => EditionActions.fetchOne(this.props.params.editionId), 10000); - this.setState({timerId: timerId}) + this.setState({timerId: timerId}); } },