From c5ef3cacd51984450ef62e21d2504175ba45b1d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Tue, 15 Sep 2015 11:50:23 +0200 Subject: [PATCH] add ContractSettingsUpdateButton boilerplate code --- js/components/ascribe_forms/property.js | 2 +- .../ascribe_settings/contract_settings.js | 8 ++++---- .../contract_settings_update_button.js | 16 ++++++++++++++++ .../ascribe_uploader/react_s3_fine_uploader.js | 8 ++++---- 4 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 js/components/ascribe_settings/contract_settings_update_button.js diff --git a/js/components/ascribe_forms/property.js b/js/components/ascribe_forms/property.js index f446b64f..f3c26935 100644 --- a/js/components/ascribe_forms/property.js +++ b/js/components/ascribe_forms/property.js @@ -70,7 +70,7 @@ let Property = React.createClass({ // In order to set this.state.value from another component // the state of value should only be set if its not undefined and // actually references something - if(typeof childInput.getDOMNode().value !== 'undefined') { + if(childInput && typeof childInput.getDOMNode().value !== 'undefined') { this.setState({ value: childInput.getDOMNode().value }); diff --git a/js/components/ascribe_settings/contract_settings.js b/js/components/ascribe_settings/contract_settings.js index 0e53c13b..0df6526e 100644 --- a/js/components/ascribe_settings/contract_settings.js +++ b/js/components/ascribe_settings/contract_settings.js @@ -9,12 +9,14 @@ import ContractListStore from '../../stores/contract_list_store'; import ContractListActions from '../../actions/contract_list_actions'; import ActionPanel from '../ascribe_panel/action_panel'; +import ContractSettingsUpdateButton from './contract_settings_update_button'; import GlobalNotificationModel from '../../models/global_notification_model'; import GlobalNotificationActions from '../../actions/global_notification_actions'; import { getLangText } from '../../utils/lang_utils'; + let ContractSettings = React.createClass({ propTypes: { defaultExpanded: React.PropTypes.bool @@ -97,7 +99,7 @@ let ContractSettings = React.createClass({ + defaultExpanded={true}> MAKE PUBLIC - + + UPDATE + + ); + } +}); + +export default ContractSettingsUpdateButton; \ No newline at end of file diff --git a/js/components/ascribe_uploader/react_s3_fine_uploader.js b/js/components/ascribe_uploader/react_s3_fine_uploader.js index 5d7b69ff..e4361ea7 100644 --- a/js/components/ascribe_uploader/react_s3_fine_uploader.js +++ b/js/components/ascribe_uploader/react_s3_fine_uploader.js @@ -2,14 +2,11 @@ import React from 'react/addons'; import Router from 'react-router'; +import fineUploader from 'fineUploader'; import Q from 'q'; -import { getCookie } from '../../utils/fetch_api_utils'; -import { getLangText } from '../../utils/lang_utils'; - import S3Fetcher from '../../fetchers/s3_fetcher'; -import fineUploader from 'fineUploader'; import FileDragAndDrop from './ascribe_file_drag_and_drop/file_drag_and_drop'; import GlobalNotificationModel from '../../models/global_notification_model'; @@ -17,8 +14,11 @@ import GlobalNotificationActions from '../../actions/global_notification_actions import AppConstants from '../../constants/application_constants'; +import { getCookie } from '../../utils/fetch_api_utils'; +import { getLangText } from '../../utils/lang_utils'; import { computeHashOfFile } from '../../utils/file_utils'; + var ReactS3FineUploader = React.createClass({ propTypes: { keyRoutine: React.PropTypes.shape({