From a4216db6d9ffc4284a34635eb264b182960fc94b Mon Sep 17 00:00:00 2001 From: Brett Sun Date: Mon, 13 Jun 2016 14:35:02 +0200 Subject: [PATCH] Remove redundant '_utils' suffix in util file names --- js/app.js | 6 +++--- js/components/app_base.js | 2 +- .../ascribe_accordion_list/accordion_list.js | 2 +- .../accordion_list_item_edition_widget.js | 6 ++---- .../accordion_list_item_piece.js | 2 +- .../accordion_list_item_table_editions.js | 4 ++-- .../accordion_list_item_wallet.js | 4 ++-- js/components/ascribe_buttons/acl_button_list.js | 3 +-- js/components/ascribe_buttons/acl_information.js | 4 ++-- js/components/ascribe_buttons/acls/consign_button.js | 4 +--- js/components/ascribe_buttons/acls/email_button.js | 4 +--- js/components/ascribe_buttons/acls/loan_button.js | 4 +--- .../ascribe_buttons/acls/loan_request_button.js | 4 +--- js/components/ascribe_buttons/acls/transfer_button.js | 4 +--- .../ascribe_buttons/acls/unconsign_button.js | 4 +--- .../ascribe_buttons/create_editions_button.js | 4 ++-- js/components/ascribe_buttons/delete_button.js | 10 +++++----- js/components/ascribe_buttons/s3_download_button.js | 8 ++++---- .../ascribe_buttons/unconsign_request_button.js | 2 +- js/components/ascribe_detail/edition.js | 2 +- js/components/ascribe_detail/edition_action_panel.js | 2 +- js/components/ascribe_detail/edition_container.js | 4 ++-- js/components/ascribe_detail/further_details.js | 2 +- .../ascribe_detail/further_details_fileuploader.js | 4 ++-- js/components/ascribe_detail/history_iterator.js | 2 +- js/components/ascribe_detail/media_container.js | 4 ++-- js/components/ascribe_detail/note.js | 2 +- js/components/ascribe_detail/piece_container.js | 6 +++--- js/components/ascribe_forms/acl_form_factory.js | 2 +- js/components/ascribe_forms/create_editions_form.js | 2 +- js/components/ascribe_forms/form.js | 4 ++-- js/components/ascribe_forms/form_consign.js | 2 +- .../ascribe_forms/form_copyright_association.js | 2 +- js/components/ascribe_forms/form_create_contract.js | 2 +- js/components/ascribe_forms/form_delete_edition.js | 9 ++++++--- js/components/ascribe_forms/form_delete_piece.js | 5 +++-- js/components/ascribe_forms/form_loan.js | 10 +++------- .../ascribe_forms/form_loan_request_answer.js | 6 +----- js/components/ascribe_forms/form_login.js | 2 +- js/components/ascribe_forms/form_piece_extradata.js | 11 ++++++----- js/components/ascribe_forms/form_register_piece.js | 2 +- .../form_remove_editions_from_collection.js | 5 +++-- .../form_remove_piece_from_collection.js | 5 +++-- js/components/ascribe_forms/form_request_action.js | 4 ++-- .../ascribe_forms/form_send_contract_agreement.js | 4 ++-- js/components/ascribe_forms/form_share_email.js | 6 +++--- js/components/ascribe_forms/form_signup.js | 2 +- js/components/ascribe_forms/form_transfer.js | 2 +- js/components/ascribe_forms/form_unconsign.js | 3 ++- js/components/ascribe_forms/form_unconsign_request.js | 3 ++- .../input_contract_agreement_checkbox.js | 6 +++--- js/components/ascribe_forms/input_fineuploader.js | 4 ++-- .../ascribe_forms/input_textarea_toggable.js | 2 +- js/components/ascribe_media/media_player.js | 8 ++------ js/components/ascribe_pagination/pagination_button.js | 2 +- .../piece_list_bulk_modal.js | 5 ++--- .../piece_list_bulk_modal_selected_editions_widget.js | 5 +++-- .../piece_list_toolbar_filter_widget.js | 2 +- .../piece_list_toolbar_order_widget.js | 2 +- js/components/ascribe_settings/account_settings.js | 2 +- js/components/ascribe_settings/api_settings.js | 2 +- .../ascribe_settings/bitcoin_wallet_settings.js | 4 ++-- js/components/ascribe_settings/contract_settings.js | 6 +++--- .../contract_settings_update_button.js | 4 ++-- js/components/ascribe_settings/settings_container.js | 4 ++-- js/components/ascribe_settings/webhook_settings.js | 2 +- .../ascribe_social_share/facebook_share_button.js | 2 +- .../ascribe_social_share/twitter_share_button.js | 2 +- .../ascribe_file_drag_and_drop/file_drag_and_drop.js | 2 +- .../file_drag_and_drop_dialog.js | 6 +++--- .../file_drag_and_drop_error_dialog.js | 2 +- .../file_drag_and_drop_preview.js | 6 +++--- .../file_drag_and_drop_preview_image.js | 2 +- .../file_drag_and_drop_preview_iterator.js | 2 +- .../file_drag_and_drop_preview_other.js | 3 +-- .../file_drag_and_drop_preview_progress.js | 2 +- .../ascribe_upload_button/upload_button.js | 4 ++-- .../ascribe_uploader/react_s3_fine_uploader.js | 6 +++--- js/components/coa_verify_container.js | 4 ++-- js/components/context/with_context.js | 4 ++-- js/components/error_not_found_page.js | 2 +- js/components/footer.js | 2 +- js/components/global_notification.js | 9 ++++----- js/components/header.js | 4 ++-- js/components/header_notifications.js | 2 +- js/components/login_container.js | 4 ++-- js/components/logout_container.js | 8 ++++---- js/components/nav_routes_links.js | 5 ++--- js/components/password_reset_container.js | 4 ++-- js/components/piece_list.js | 8 ++++---- js/components/register_piece.js | 4 ++-- js/components/search_bar.js | 3 +-- js/components/signup_container.js | 4 ++-- .../wallet/components/23vivi/23vivi_landing.js | 4 ++-- .../wallet/components/artcity/artcity_landing.js | 4 ++-- .../components/ascribe_detail/wallet_action_panel.js | 2 +- .../ascribe_detail/wallet_piece_container.js | 2 +- .../wallet/components/cc/cc_register_piece.js | 6 +++--- .../cyland_accordion_list_item.js | 2 +- .../cyland/cyland_buttons/cyland_submit_button.js | 2 +- .../cyland/cyland_detail/cyland_piece_container.js | 6 +++--- .../cyland_forms/cyland_additional_data_form.js | 2 +- .../wallet/components/cyland/cyland_landing.js | 4 ++-- .../wallet/components/cyland/cyland_piece_list.js | 4 ++-- .../wallet/components/cyland/cyland_register_piece.js | 8 ++++---- .../whitelabel/wallet/components/demo/demo_landing.js | 4 ++-- .../ikonotv_accordion_list_item.js | 2 +- .../ikonotv/ikonotv_buttons/ikonotv_submit_button.js | 2 +- .../ikonotv/ikonotv_contract_notifications.js | 4 ++-- .../ikonotv/ikonotv_detail/ikonotv_piece_container.js | 6 +++--- .../ikonotv_forms/ikonotv_artist_details_form.js | 2 +- .../ikonotv_forms/ikonotv_artwork_details_form.js | 2 +- .../wallet/components/ikonotv/ikonotv_landing.js | 4 ++-- .../wallet/components/ikonotv/ikonotv_piece_list.js | 4 ++-- .../components/ikonotv/ikonotv_register_piece.js | 4 ++-- .../wallet/components/lumenus/lumenus_landing.js | 4 ++-- .../market/market_buttons/market_acl_button_list.js | 3 +-- .../market/market_buttons/market_submit_button.js | 4 ++-- .../market/market_error_consign_unavailable.js | 2 +- .../wallet/components/market/market_footer.js | 2 +- .../market_forms/market_additional_data_form.js | 3 +-- .../wallet/components/market/market_landing.js | 4 ++-- .../wallet/components/market/market_piece_list.js | 5 +++-- .../wallet/components/market/market_register_piece.js | 7 ++++--- .../wallet/components/polline/polline_landing.js | 4 ++-- js/components/whitelabel/wallet/wallet_app.js | 2 +- js/components/whitelabel/wallet/wallet_routes.js | 2 +- js/constants/error_constants.js | 6 ++---- js/fetchers/edition_list_fetcher.js | 4 ++-- js/fetchers/license_fetcher.js | 2 +- js/fetchers/piece_list_fetcher.js | 4 ++-- js/routes.js | 2 +- js/sources/whitelabel_source.js | 2 +- js/stores/edition_store.js | 2 +- js/third_party/imports/audiojs.js | 2 +- js/third_party/imports/shmui.js | 2 +- js/third_party/imports/videojs.js | 2 +- js/third_party/intercom_handler.js | 2 +- js/third_party/notifications_handler.js | 5 ++--- js/utils/{acl_utils.js => acl.js} | 2 +- js/utils/{constants_utils.js => constants.js} | 0 js/utils/{dom_utils.js => dom.js} | 2 +- js/utils/{error_utils.js => error.js} | 0 ...eature_detection_utils.js => feature_detection.js} | 0 js/utils/{fetch_api_utils.js => fetch_api.js} | 0 js/utils/{file_utils.js => file.js} | 2 +- js/utils/{form_utils.js => form.js} | 2 +- js/utils/{general_utils.js => general.js} | 0 js/utils/{inject_utils.js => inject.js} | 0 js/utils/{lang_utils.js => lang.js} | 2 +- js/utils/{react_utils.js => react.js} | 0 js/utils/{regex_utils.js => regex.js} | 0 js/utils/requests.js | 6 +++--- js/utils/{url_utils.js => url.js} | 2 +- 154 files changed, 259 insertions(+), 284 deletions(-) rename js/utils/{acl_utils.js => acl.js} (96%) rename js/utils/{constants_utils.js => constants.js} (100%) rename js/utils/{dom_utils.js => dom.js} (98%) rename js/utils/{error_utils.js => error.js} (100%) rename js/utils/{feature_detection_utils.js => feature_detection.js} (100%) rename js/utils/{fetch_api_utils.js => fetch_api.js} (100%) rename js/utils/{file_utils.js => file.js} (98%) rename js/utils/{form_utils.js => form.js} (99%) rename js/utils/{general_utils.js => general.js} (100%) rename js/utils/{inject_utils.js => inject.js} (100%) rename js/utils/{lang_utils.js => lang.js} (96%) rename js/utils/{react_utils.js => react.js} (100%) rename js/utils/{regex_utils.js => regex.js} (100%) rename js/utils/{url_utils.js => url.js} (97%) diff --git a/js/app.js b/js/app.js index 0bb94531..4c819706 100644 --- a/js/app.js +++ b/js/app.js @@ -12,9 +12,9 @@ import history from './history'; import AppConstants from './constants/application_constants'; -import { getDefaultSubdomainSettings, getSubdomainSettings } from './utils/constants_utils'; -import { initLogging } from './utils/error_utils'; -import { getSubdomain } from './utils/general_utils'; +import { getDefaultSubdomainSettings, getSubdomainSettings } from './utils/constants'; +import { initLogging } from './utils/error'; +import { getSubdomain } from './utils/general'; import requests from './utils/requests'; diff --git a/js/components/app_base.js b/js/components/app_base.js index e1925d32..50589efd 100644 --- a/js/components/app_base.js +++ b/js/components/app_base.js @@ -9,7 +9,7 @@ import WhitelabelStore from '../stores/whitelabel_store'; import GlobalNotification from './global_notification'; import { currentUserShape, locationShape, whitelabelShape } from './prop_types'; -import { mergeOptions } from '../utils/general_utils'; +import { mergeOptions } from '../utils/general'; export default function AppBase(App) { diff --git a/js/components/ascribe_accordion_list/accordion_list.js b/js/components/ascribe_accordion_list/accordion_list.js index 7bdf937a..eaabacac 100644 --- a/js/components/ascribe_accordion_list/accordion_list.js +++ b/js/components/ascribe_accordion_list/accordion_list.js @@ -3,7 +3,7 @@ import React from 'react'; import Link from 'react-router/es6/Link'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; let AccordionList = React.createClass({ diff --git a/js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js b/js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js index 2bb8b2d0..f62ed58b 100644 --- a/js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js +++ b/js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js @@ -8,13 +8,11 @@ import EditionListStore from '../../stores/edition_list_store'; import PieceListStore from '../../stores/piece_list_store'; -import Button from 'react-bootstrap/lib/Button'; - import CreateEditionsButton from '../ascribe_buttons/create_editions_button'; import AscribeSpinner from '../ascribe_spinner'; -import { mergeOptions } from '../../utils/general_utils'; -import { getLangText } from '../../utils/lang_utils'; +import { mergeOptions } from '../../utils/general'; +import { getLangText } from '../../utils/lang'; let AccordionListItemEditionWidget = React.createClass({ diff --git a/js/components/ascribe_accordion_list/accordion_list_item_piece.js b/js/components/ascribe_accordion_list/accordion_list_item_piece.js index f05ce260..d0a1b1ee 100644 --- a/js/components/ascribe_accordion_list/accordion_list_item_piece.js +++ b/js/components/ascribe_accordion_list/accordion_list_item_piece.js @@ -5,7 +5,7 @@ import React from 'react'; import AccordionListItem from './accordion_list_item'; import AccordionListItemThumbnailPlacholder from './accordion_list_item_thumbnail_placeholder'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; let AccordionListItemPiece = React.createClass({ diff --git a/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js b/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js index 3b0bb02e..a9c42843 100644 --- a/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js +++ b/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js @@ -16,8 +16,8 @@ import TableItemCheckbox from '../ascribe_table/table_item_checkbox'; import TableItemAclFiltered from '../ascribe_table/table_item_acl_filtered'; import AscribeSpinner from '../ascribe_spinner'; -import { getLangText } from '../../utils/lang_utils'; -import { mergeOptions } from '../../utils/general_utils'; +import { getLangText } from '../../utils/lang'; +import { mergeOptions } from '../../utils/general'; let AccordionListItemTableEditions = React.createClass({ diff --git a/js/components/ascribe_accordion_list/accordion_list_item_wallet.js b/js/components/ascribe_accordion_list/accordion_list_item_wallet.js index b1b8ef8a..513b699e 100644 --- a/js/components/ascribe_accordion_list/accordion_list_item_wallet.js +++ b/js/components/ascribe_accordion_list/accordion_list_item_wallet.js @@ -23,8 +23,8 @@ import AclProxy from '../acl_proxy'; import withContext from '../context/with_context'; import { whitelabelShape } from '../prop_types'; -import { mergeOptions } from '../../utils/general_utils'; -import { getLangText } from '../../utils/lang_utils'; +import { mergeOptions } from '../../utils/general'; +import { getLangText } from '../../utils/lang'; let AccordionListItemWallet = React.createClass({ diff --git a/js/components/ascribe_buttons/acl_button_list.js b/js/components/ascribe_buttons/acl_button_list.js index 51f41b5d..5593dfb2 100644 --- a/js/components/ascribe_buttons/acl_button_list.js +++ b/js/components/ascribe_buttons/acl_button_list.js @@ -5,11 +5,10 @@ import React from 'react'; import ConsignButton from './acls/consign_button'; import EmailButton from './acls/email_button'; import LoanButton from './acls/loan_button'; -import LoanRequestButton from './acls/loan_request_button'; import TransferButton from './acls/transfer_button'; import UnconsignButton from './acls/unconsign_button'; -import { selectFromObject } from '../../utils/general_utils'; +import { selectFromObject } from '../../utils/general'; let AclButtonList = React.createClass({ propTypes: { diff --git a/js/components/ascribe_buttons/acl_information.js b/js/components/ascribe_buttons/acl_information.js index d870a24d..4a6f5f50 100644 --- a/js/components/ascribe_buttons/acl_information.js +++ b/js/components/ascribe_buttons/acl_information.js @@ -4,8 +4,8 @@ import React from 'react'; import classnames from 'classnames'; import { AclInformationText } from '../../constants/acl_information_text'; -import { replaceSubstringAtIndex, sanitize, intersectLists } from '../../utils/general_utils'; -import { getLangText } from '../../utils/lang_utils'; +import { replaceSubstringAtIndex, sanitize, intersectLists } from '../../utils/general'; +import { getLangText } from '../../utils/lang'; let AclInformation = React.createClass({ diff --git a/js/components/ascribe_buttons/acls/consign_button.js b/js/components/ascribe_buttons/acls/consign_button.js index 88c86097..9c4da934 100644 --- a/js/components/ascribe_buttons/acls/consign_button.js +++ b/js/components/ascribe_buttons/acls/consign_button.js @@ -1,10 +1,8 @@ 'use strict'; -import React from 'react'; - import AclButton from './acl_button'; -import { getLangText } from '../../../utils/lang_utils'; +import { getLangText } from '../../../utils/lang'; export default AclButton({ action: 'acl_consign', diff --git a/js/components/ascribe_buttons/acls/email_button.js b/js/components/ascribe_buttons/acls/email_button.js index 81317618..7746cdb6 100644 --- a/js/components/ascribe_buttons/acls/email_button.js +++ b/js/components/ascribe_buttons/acls/email_button.js @@ -1,10 +1,8 @@ 'use strict'; -import React from 'react'; - import AclButton from './acl_button'; -import { getLangText } from '../../../utils/lang_utils'; +import { getLangText } from '../../../utils/lang'; export default AclButton({ action: 'acl_share', diff --git a/js/components/ascribe_buttons/acls/loan_button.js b/js/components/ascribe_buttons/acls/loan_button.js index 4b803ceb..f0a05350 100644 --- a/js/components/ascribe_buttons/acls/loan_button.js +++ b/js/components/ascribe_buttons/acls/loan_button.js @@ -1,10 +1,8 @@ 'use strict'; -import React from 'react'; - import AclButton from './acl_button'; -import { getLangText } from '../../../utils/lang_utils'; +import { getLangText } from '../../../utils/lang'; export default AclButton({ action: 'acl_loan', diff --git a/js/components/ascribe_buttons/acls/loan_request_button.js b/js/components/ascribe_buttons/acls/loan_request_button.js index a1ec5f3b..0ae75265 100644 --- a/js/components/ascribe_buttons/acls/loan_request_button.js +++ b/js/components/ascribe_buttons/acls/loan_request_button.js @@ -1,10 +1,8 @@ 'use strict'; -import React from 'react'; - import AclButton from './acl_button'; -import { getLangText } from '../../../utils/lang_utils'; +import { getLangText } from '../../../utils/lang'; export default AclButton({ action: 'acl_loan_request', diff --git a/js/components/ascribe_buttons/acls/transfer_button.js b/js/components/ascribe_buttons/acls/transfer_button.js index 346907ca..962d11e5 100644 --- a/js/components/ascribe_buttons/acls/transfer_button.js +++ b/js/components/ascribe_buttons/acls/transfer_button.js @@ -1,10 +1,8 @@ 'use strict'; -import React from 'react'; - import AclButton from './acl_button'; -import { getLangText } from '../../../utils/lang_utils'; +import { getLangText } from '../../../utils/lang'; export default AclButton({ action: 'acl_transfer', diff --git a/js/components/ascribe_buttons/acls/unconsign_button.js b/js/components/ascribe_buttons/acls/unconsign_button.js index ce1ed0bc..1aa9085a 100644 --- a/js/components/ascribe_buttons/acls/unconsign_button.js +++ b/js/components/ascribe_buttons/acls/unconsign_button.js @@ -1,10 +1,8 @@ 'use strict'; -import React from 'react'; - import AclButton from './acl_button'; -import { getLangText } from '../../../utils/lang_utils'; +import { getLangText } from '../../../utils/lang'; export default AclButton({ action: 'acl_unconsign', diff --git a/js/components/ascribe_buttons/create_editions_button.js b/js/components/ascribe_buttons/create_editions_button.js index c78b0d63..4ad59194 100644 --- a/js/components/ascribe_buttons/create_editions_button.js +++ b/js/components/ascribe_buttons/create_editions_button.js @@ -1,15 +1,15 @@ 'use strict'; import React from 'react'; +import classNames from 'classnames'; import EditionListActions from '../../actions/edition_list_actions'; import EditionListStore from '../../stores/edition_list_store'; import AscribeSpinner from '../ascribe_spinner'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; -import classNames from 'classnames'; let CreateEditionsButton = React.createClass({ propTypes: { diff --git a/js/components/ascribe_buttons/delete_button.js b/js/components/ascribe_buttons/delete_button.js index ac4ec182..f57db082 100644 --- a/js/components/ascribe_buttons/delete_button.js +++ b/js/components/ascribe_buttons/delete_button.js @@ -12,8 +12,8 @@ import PieceRemoveFromCollectionForm from '../ascribe_forms/form_remove_piece_fr import ModalWrapper from '../ascribe_modal/modal_wrapper'; -import { getAvailableAcls } from '../../utils/acl_utils'; -import { getLangText } from '../../utils/lang_utils.js'; +import { getAvailableAcls } from '../../utils/acl'; +import { getLangText } from '../../utils/lang.js'; let DeleteButton = React.createClass({ @@ -46,9 +46,9 @@ let DeleteButton = React.createClass({ } btnDelete = ; - + } else if(availableAcls.acl_unshare){ - + if(this.props.editions) { content = ; title = getLangText('Remove Edition from Collection'); @@ -58,7 +58,7 @@ let DeleteButton = React.createClass({ } btnDelete = ; - + } else { return null; } diff --git a/js/components/ascribe_buttons/s3_download_button.js b/js/components/ascribe_buttons/s3_download_button.js index 1a770386..aec9db0b 100644 --- a/js/components/ascribe_buttons/s3_download_button.js +++ b/js/components/ascribe_buttons/s3_download_button.js @@ -2,14 +2,14 @@ import React from 'react'; -import S3Fetcher from '../../fetchers/s3_fetcher'; - import Glyphicon from 'react-bootstrap/lib/Glyphicon'; +import S3Fetcher from '../../fetchers/s3_fetcher'; + import AppConstants from '../../constants/application_constants'; -import { getLangText } from '../../utils/lang_utils'; -import { queryParamsToArgs } from '../../utils/url_utils'; +import { getLangText } from '../../utils/lang'; +import { queryParamsToArgs } from '../../utils/url'; const { string } = React.PropTypes; diff --git a/js/components/ascribe_buttons/unconsign_request_button.js b/js/components/ascribe_buttons/unconsign_request_button.js index ab9258b5..fb494b8a 100644 --- a/js/components/ascribe_buttons/unconsign_request_button.js +++ b/js/components/ascribe_buttons/unconsign_request_button.js @@ -10,7 +10,7 @@ import UnConsignRequestForm from '../ascribe_forms/form_unconsign_request'; import withContext from '../context/with_context'; import { currentUserShape } from '../prop_types'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; import ApiUrls from '../../constants/api_urls'; diff --git a/js/components/ascribe_detail/edition.js b/js/components/ascribe_detail/edition.js index 5d8f5e78..7b84d90d 100644 --- a/js/components/ascribe_detail/edition.js +++ b/js/components/ascribe_detail/edition.js @@ -27,7 +27,7 @@ import withContext from '../context/with_context'; import ApiUrls from '../../constants/api_urls'; import AscribeSpinner from '../ascribe_spinner'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; /** diff --git a/js/components/ascribe_detail/edition_action_panel.js b/js/components/ascribe_detail/edition_action_panel.js index 05d5a3ed..4c85f341 100644 --- a/js/components/ascribe_detail/edition_action_panel.js +++ b/js/components/ascribe_detail/edition_action_panel.js @@ -28,7 +28,7 @@ import { routerShape } from '../prop_types'; import ApiUrls from '../../constants/api_urls'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; /* A component that handles all the actions inside of the edition detail diff --git a/js/components/ascribe_detail/edition_container.js b/js/components/ascribe_detail/edition_container.js index 8b619a6c..bdf96fc2 100644 --- a/js/components/ascribe_detail/edition_container.js +++ b/js/components/ascribe_detail/edition_container.js @@ -12,8 +12,8 @@ import Edition from './edition'; import AscribeSpinner from '../ascribe_spinner'; -import { getLangText } from '../../utils/lang_utils'; -import { setDocumentTitle } from '../../utils/dom_utils'; +import { getLangText } from '../../utils/lang'; +import { setDocumentTitle } from '../../utils/dom'; /** diff --git a/js/components/ascribe_detail/further_details.js b/js/components/ascribe_detail/further_details.js index 69b605bc..8973f6a9 100644 --- a/js/components/ascribe_detail/further_details.js +++ b/js/components/ascribe_detail/further_details.js @@ -15,7 +15,7 @@ import PieceExtraDataForm from './../ascribe_forms/form_piece_extradata'; import { formSubmissionValidation } from '../ascribe_uploader/react_s3_fine_uploader_utils'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; let FurtherDetails = React.createClass({ diff --git a/js/components/ascribe_detail/further_details_fileuploader.js b/js/components/ascribe_detail/further_details_fileuploader.js index 8f23e4e4..9d6ac75f 100644 --- a/js/components/ascribe_detail/further_details_fileuploader.js +++ b/js/components/ascribe_detail/further_details_fileuploader.js @@ -10,8 +10,8 @@ import ApiUrls from '../../constants/api_urls'; import AppConstants from '../../constants/application_constants'; import { validationTypes } from '../../constants/uploader_constants'; -import { getCookie } from '../../utils/fetch_api_utils'; -import { getLangText } from '../../utils/lang_utils'; +import { getCookie } from '../../utils/fetch_api'; +import { getLangText } from '../../utils/lang'; const { func, bool, number, object, string, arrayOf } = React.PropTypes; diff --git a/js/components/ascribe_detail/history_iterator.js b/js/components/ascribe_detail/history_iterator.js index 03904863..62ac9db4 100644 --- a/js/components/ascribe_detail/history_iterator.js +++ b/js/components/ascribe_detail/history_iterator.js @@ -5,7 +5,7 @@ import React from 'react'; import Form from '../ascribe_forms/form'; import Property from '../ascribe_forms/property'; -import { replaceSubstringAtIndex } from '../../utils/general_utils'; +import { replaceSubstringAtIndex } from '../../utils/general'; let HistoryIterator = React.createClass({ diff --git a/js/components/ascribe_detail/media_container.js b/js/components/ascribe_detail/media_container.js index 3c084873..65bb03fe 100644 --- a/js/components/ascribe_detail/media_container.js +++ b/js/components/ascribe_detail/media_container.js @@ -22,8 +22,8 @@ import { currentUserShape } from '../prop_types'; import AppConstants from '../../constants/application_constants'; -import { extractFileExtensionFromUrl } from '../../utils/file_utils'; -import { getLangText } from '../../utils/lang_utils'; +import { extractFileExtensionFromUrl } from '../../utils/file'; +import { getLangText } from '../../utils/lang'; const EMBED_IFRAME_HEIGHT = { diff --git a/js/components/ascribe_detail/note.js b/js/components/ascribe_detail/note.js index 6f03877f..82ca58e5 100644 --- a/js/components/ascribe_detail/note.js +++ b/js/components/ascribe_detail/note.js @@ -11,7 +11,7 @@ import InputTextAreaToggable from '../ascribe_forms/input_textarea_toggable'; import withContext from '../context/with_context'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; let Note = React.createClass({ propTypes: { diff --git a/js/components/ascribe_detail/piece_container.js b/js/components/ascribe_detail/piece_container.js index 1dd38849..80a84182 100644 --- a/js/components/ascribe_detail/piece_container.js +++ b/js/components/ascribe_detail/piece_container.js @@ -41,9 +41,9 @@ import { routerShape } from '../prop_types'; import ApiUrls from '../../constants/api_urls'; -import { setDocumentTitle } from '../../utils/dom_utils'; -import { mergeOptions } from '../../utils/general_utils'; -import { getLangText } from '../../utils/lang_utils'; +import { setDocumentTitle } from '../../utils/dom'; +import { mergeOptions } from '../../utils/general'; +import { getLangText } from '../../utils/lang'; /** * This is the component that implements resource/data specific functionality diff --git a/js/components/ascribe_forms/acl_form_factory.js b/js/components/ascribe_forms/acl_form_factory.js index 4c45caf1..a3abace4 100644 --- a/js/components/ascribe_forms/acl_form_factory.js +++ b/js/components/ascribe_forms/acl_form_factory.js @@ -18,7 +18,7 @@ import { currentUserShape } from '../prop_types'; import AppConstants from '../../constants/application_constants'; import ApiUrls from '../../constants/api_urls'; -import { getAclFormMessage, getAclFormDataId } from '../../utils/form_utils'; +import { getAclFormMessage, getAclFormDataId } from '../../utils/form'; let AclFormFactory = React.createClass({ propTypes: { diff --git a/js/components/ascribe_forms/create_editions_form.js b/js/components/ascribe_forms/create_editions_form.js index 47715d3d..50dbb737 100644 --- a/js/components/ascribe_forms/create_editions_form.js +++ b/js/components/ascribe_forms/create_editions_form.js @@ -11,7 +11,7 @@ import GlobalNotificationActions from '../../actions/global_notification_actions import AscribeSpinner from '../ascribe_spinner'; import ApiUrls from '../../constants/api_urls'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; let CreateEditionsForm = React.createClass({ propTypes: { diff --git a/js/components/ascribe_forms/form.js b/js/components/ascribe_forms/form.js index 2356d455..3f5bf96b 100644 --- a/js/components/ascribe_forms/form.js +++ b/js/components/ascribe_forms/form.js @@ -13,8 +13,8 @@ import GlobalNotificationActions from '../../actions/global_notification_actions import requests from '../../utils/requests'; -import { getLangText } from '../../utils/lang_utils'; -import { sanitize } from '../../utils/general_utils'; +import { sanitize } from '../../utils/general'; +import { getLangText } from '../../utils/lang'; let Form = React.createClass({ diff --git a/js/components/ascribe_forms/form_consign.js b/js/components/ascribe_forms/form_consign.js index 346d45c0..9d49916f 100644 --- a/js/components/ascribe_forms/form_consign.js +++ b/js/components/ascribe_forms/form_consign.js @@ -15,7 +15,7 @@ import AscribeSpinner from '../ascribe_spinner'; import AclInformation from '../ascribe_buttons/acl_information'; -import { getLangText } from '../../utils/lang_utils.js'; +import { getLangText } from '../../utils/lang'; let ConsignForm = React.createClass({ propTypes: { diff --git a/js/components/ascribe_forms/form_copyright_association.js b/js/components/ascribe_forms/form_copyright_association.js index b0b1b577..0a2df2de 100644 --- a/js/components/ascribe_forms/form_copyright_association.js +++ b/js/components/ascribe_forms/form_copyright_association.js @@ -14,7 +14,7 @@ import { currentUserShape } from '../prop_types'; import ApiUrls from '../../constants/api_urls'; import AppConstants from '../../constants/application_constants'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; const { bool } = React.PropTypes; diff --git a/js/components/ascribe_forms/form_create_contract.js b/js/components/ascribe_forms/form_create_contract.js index c19843d5..55091f5e 100644 --- a/js/components/ascribe_forms/form_create_contract.js +++ b/js/components/ascribe_forms/form_create_contract.js @@ -16,7 +16,7 @@ import ApiUrls from '../../constants/api_urls'; import AppConstants from '../../constants/application_constants'; import { validationTypes } from '../../constants/uploader_constants'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; import { formSubmissionValidation } from '../ascribe_uploader/react_s3_fine_uploader_utils'; diff --git a/js/components/ascribe_forms/form_delete_edition.js b/js/components/ascribe_forms/form_delete_edition.js index 6ae8ddd6..11d9ac5f 100644 --- a/js/components/ascribe_forms/form_delete_edition.js +++ b/js/components/ascribe_forms/form_delete_edition.js @@ -4,11 +4,14 @@ import React from 'react'; import Form from './form'; -import ApiUrls from '../../constants/api_urls'; +import AclInformation from '../ascribe_buttons/acl_information'; + import AscribeSpinner from '../ascribe_spinner'; -import { getLangText } from '../../utils/lang_utils'; -import AclInformation from '../ascribe_buttons/acl_information'; +import ApiUrls from '../../constants/api_urls'; + +import { getLangText } from '../../utils/lang'; + let EditionDeleteForm = React.createClass({ diff --git a/js/components/ascribe_forms/form_delete_piece.js b/js/components/ascribe_forms/form_delete_piece.js index ee066d3f..cb0a5f27 100644 --- a/js/components/ascribe_forms/form_delete_piece.js +++ b/js/components/ascribe_forms/form_delete_piece.js @@ -6,10 +6,11 @@ import Form from '../ascribe_forms/form'; import AclInformation from '../ascribe_buttons/acl_information'; -import ApiUrls from '../../constants/api_urls'; import AscribeSpinner from '../ascribe_spinner'; -import { getLangText } from '../../utils/lang_utils'; +import ApiUrls from '../../constants/api_urls'; + +import { getLangText } from '../../utils/lang'; let PieceDeleteForm = React.createClass({ diff --git a/js/components/ascribe_forms/form_loan.js b/js/components/ascribe_forms/form_loan.js index 18888dd1..b7498e58 100644 --- a/js/components/ascribe_forms/form_loan.js +++ b/js/components/ascribe_forms/form_loan.js @@ -5,21 +5,17 @@ import classnames from 'classnames'; import Button from 'react-bootstrap/lib/Button'; -import ContractAgreementListStore from '../../stores/contract_agreement_list_store'; - import Form from './form'; import Property from './property'; - import InputDate from './input_date'; import InputTextAreaToggable from './input_textarea_toggable'; import InputContractAgreementCheckbox from './input_contract_agreement_checkbox'; -import AscribeSpinner from '../ascribe_spinner'; - import AclInformation from '../ascribe_buttons/acl_information'; -import { getLangText } from '../../utils/lang_utils'; -import { mergeOptions } from '../../utils/general_utils'; +import AscribeSpinner from '../ascribe_spinner'; + +import { getLangText } from '../../utils/lang'; let LoanForm = React.createClass({ diff --git a/js/components/ascribe_forms/form_loan_request_answer.js b/js/components/ascribe_forms/form_loan_request_answer.js index 349b4efc..b16c3c3e 100644 --- a/js/components/ascribe_forms/form_loan_request_answer.js +++ b/js/components/ascribe_forms/form_loan_request_answer.js @@ -3,14 +3,10 @@ import React from 'react'; import Moment from 'moment'; -import LoanForm from './form_loan'; - import OwnershipActions from '../../actions/ownership_actions'; import OwnershipStore from '../../stores/ownership_store'; -import AppConstants from '../../constants/application_constants'; - -import { getLangText } from '../../utils/lang_utils'; +import LoanForm from './form_loan'; let LoanRequestAnswerForm = React.createClass({ diff --git a/js/components/ascribe_forms/form_login.js b/js/components/ascribe_forms/form_login.js index a28492a6..aa8f9f77 100644 --- a/js/components/ascribe_forms/form_login.js +++ b/js/components/ascribe_forms/form_login.js @@ -16,7 +16,7 @@ import { locationShape } from '../prop_types'; import ApiUrls from '../../constants/api_urls'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; let LoginForm = React.createClass({ diff --git a/js/components/ascribe_forms/form_piece_extradata.js b/js/components/ascribe_forms/form_piece_extradata.js index 6a475fb6..58da9d2d 100644 --- a/js/components/ascribe_forms/form_piece_extradata.js +++ b/js/components/ascribe_forms/form_piece_extradata.js @@ -2,15 +2,16 @@ import React from 'react'; -import requests from '../../utils/requests'; -import { getLangText } from '../../utils/lang_utils.js'; - -import ApiUrls from '../../constants/api_urls'; - import Form from './form'; import Property from './property'; import InputTextAreaToggable from './input_textarea_toggable'; +import ApiUrls from '../../constants/api_urls'; + +import requests from '../../utils/requests'; +import { getLangText } from '../../utils/lang.js'; + + let PieceExtraDataForm = React.createClass({ propTypes: { name: React.PropTypes.string.isRequired, diff --git a/js/components/ascribe_forms/form_register_piece.js b/js/components/ascribe_forms/form_register_piece.js index 8203c35b..c9763e60 100644 --- a/js/components/ascribe_forms/form_register_piece.js +++ b/js/components/ascribe_forms/form_register_piece.js @@ -19,7 +19,7 @@ import AppConstants from '../../constants/application_constants'; import { validationParts, validationTypes } from '../../constants/uploader_constants'; import { FileStatus, formSubmissionValidation } from '../ascribe_uploader/react_s3_fine_uploader_utils'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; let RegisterPieceForm = React.createClass({ diff --git a/js/components/ascribe_forms/form_remove_editions_from_collection.js b/js/components/ascribe_forms/form_remove_editions_from_collection.js index ccea441a..a816c1ab 100644 --- a/js/components/ascribe_forms/form_remove_editions_from_collection.js +++ b/js/components/ascribe_forms/form_remove_editions_from_collection.js @@ -4,10 +4,11 @@ import React from 'react'; import Form from './form'; -import ApiUrls from '../../constants/api_urls'; import AscribeSpinner from '../ascribe_spinner'; -import { getLangText } from '../../utils/lang_utils'; +import ApiUrls from '../../constants/api_urls'; + +import { getLangText } from '../../utils/lang'; let EditionRemoveFromCollectionForm = React.createClass({ propTypes: { diff --git a/js/components/ascribe_forms/form_remove_piece_from_collection.js b/js/components/ascribe_forms/form_remove_piece_from_collection.js index fe0cab1d..6fffd671 100644 --- a/js/components/ascribe_forms/form_remove_piece_from_collection.js +++ b/js/components/ascribe_forms/form_remove_piece_from_collection.js @@ -4,10 +4,11 @@ import React from 'react'; import Form from './form'; -import ApiUrls from '../../constants/api_urls'; import AscribeSpinner from '../ascribe_spinner'; -import { getLangText } from '../../utils/lang_utils'; +import ApiUrls from '../../constants/api_urls'; + +import { getLangText } from '../../utils/lang'; let PieceRemoveFromCollectionForm = React.createClass({ diff --git a/js/components/ascribe_forms/form_request_action.js b/js/components/ascribe_forms/form_request_action.js index 95071eda..77c4bf9d 100644 --- a/js/components/ascribe_forms/form_request_action.js +++ b/js/components/ascribe_forms/form_request_action.js @@ -16,8 +16,8 @@ import GlobalNotificationActions from '../../actions/global_notification_actions import ApiUrls from '../../constants/api_urls'; -import { getAclFormDataId } from '../../utils/form_utils'; -import { getLangText } from '../../utils/lang_utils.js'; +import { getAclFormDataId } from '../../utils/form'; +import { getLangText } from '../../utils/lang.js'; let RequestActionForm = React.createClass({ propTypes: { diff --git a/js/components/ascribe_forms/form_send_contract_agreement.js b/js/components/ascribe_forms/form_send_contract_agreement.js index 8dbeb484..bc012a0a 100644 --- a/js/components/ascribe_forms/form_send_contract_agreement.js +++ b/js/components/ascribe_forms/form_send_contract_agreement.js @@ -18,8 +18,8 @@ import { routerShape } from '../prop_types'; import ApiUrls from '../../constants/api_urls'; -import { getLangText } from '../../utils/lang_utils'; -import { mergeOptions } from '../../utils/general_utils'; +import { mergeOptions } from '../../utils/general'; +import { getLangText } from '../../utils/lang'; const SendContractAgreementForm = React.createClass({ diff --git a/js/components/ascribe_forms/form_share_email.js b/js/components/ascribe_forms/form_share_email.js index eb3770d4..c35e04de 100644 --- a/js/components/ascribe_forms/form_share_email.js +++ b/js/components/ascribe_forms/form_share_email.js @@ -2,17 +2,17 @@ import React from 'react'; +import Button from 'react-bootstrap/lib/Button'; + import Form from './form'; import Property from './property'; import InputTextAreaToggable from './input_textarea_toggable'; -import Button from 'react-bootstrap/lib/Button'; - import AclInformation from '../ascribe_buttons/acl_information'; import AscribeSpinner from '../ascribe_spinner'; -import { getLangText } from '../../utils/lang_utils.js'; +import { getLangText } from '../../utils/lang.js'; let ShareForm = React.createClass({ diff --git a/js/components/ascribe_forms/form_signup.js b/js/components/ascribe_forms/form_signup.js index 034bd839..091352cc 100644 --- a/js/components/ascribe_forms/form_signup.js +++ b/js/components/ascribe_forms/form_signup.js @@ -17,7 +17,7 @@ import { locationShape } from '../prop_types'; import ApiUrls from '../../constants/api_urls'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; let SignupForm = React.createClass({ diff --git a/js/components/ascribe_forms/form_transfer.js b/js/components/ascribe_forms/form_transfer.js index 245de177..662ee267 100644 --- a/js/components/ascribe_forms/form_transfer.js +++ b/js/components/ascribe_forms/form_transfer.js @@ -13,7 +13,7 @@ import AclInformation from '../ascribe_buttons/acl_information'; import AscribeSpinner from '../ascribe_spinner'; -import { getLangText } from '../../utils/lang_utils.js'; +import { getLangText } from '../../utils/lang.js'; let TransferForm = React.createClass({ diff --git a/js/components/ascribe_forms/form_unconsign.js b/js/components/ascribe_forms/form_unconsign.js index e1719577..35fb3dfa 100644 --- a/js/components/ascribe_forms/form_unconsign.js +++ b/js/components/ascribe_forms/form_unconsign.js @@ -9,7 +9,8 @@ import Property from './property'; import InputTextAreaToggable from './input_textarea_toggable'; import AscribeSpinner from '../ascribe_spinner'; -import { getLangText } from '../../utils/lang_utils.js'; + +import { getLangText } from '../../utils/lang.js'; let UnConsignForm = React.createClass({ diff --git a/js/components/ascribe_forms/form_unconsign_request.js b/js/components/ascribe_forms/form_unconsign_request.js index 173649e1..3b6e325d 100644 --- a/js/components/ascribe_forms/form_unconsign_request.js +++ b/js/components/ascribe_forms/form_unconsign_request.js @@ -9,7 +9,8 @@ import Property from './property'; import InputTextAreaToggable from './input_textarea_toggable'; import AscribeSpinner from '../ascribe_spinner'; -import { getLangText } from '../../utils/lang_utils.js'; + +import { getLangText } from '../../utils/lang.js'; let UnConsignRequestForm = React.createClass({ diff --git a/js/components/ascribe_forms/input_contract_agreement_checkbox.js b/js/components/ascribe_forms/input_contract_agreement_checkbox.js index 1e1411db..f049ac72 100644 --- a/js/components/ascribe_forms/input_contract_agreement_checkbox.js +++ b/js/components/ascribe_forms/input_contract_agreement_checkbox.js @@ -8,9 +8,9 @@ import InputCheckbox from './input_checkbox'; import ContractAgreementListStore from '../../stores/contract_agreement_list_store'; import ContractAgreementListActions from '../../actions/contract_agreement_list_actions'; -import { getLangText } from '../../utils/lang_utils'; -import { mergeOptions } from '../../utils/general_utils'; -import { isEmail } from '../../utils/regex_utils'; +import { mergeOptions } from '../../utils/general'; +import { getLangText } from '../../utils/lang'; +import { isEmail } from '../../utils/regex'; const InputContractAgreementCheckbox = React.createClass({ diff --git a/js/components/ascribe_forms/input_fineuploader.js b/js/components/ascribe_forms/input_fineuploader.js index c62d9183..e5819d2d 100644 --- a/js/components/ascribe_forms/input_fineuploader.js +++ b/js/components/ascribe_forms/input_fineuploader.js @@ -7,10 +7,10 @@ import FileDragAndDrop from '../ascribe_uploader/ascribe_file_drag_and_drop/file import AppConstants from '../../constants/application_constants'; -import { getCookie } from '../../utils/fetch_api_utils'; +import { getCookie } from '../../utils/fetch_api'; -const { func, bool, shape, string, number, element, oneOf, oneOfType, arrayOf } = React.PropTypes; +const { func, bool, oneOf } = React.PropTypes; const InputFineUploader = React.createClass({ propTypes: { diff --git a/js/components/ascribe_forms/input_textarea_toggable.js b/js/components/ascribe_forms/input_textarea_toggable.js index 05a1f011..06794d25 100644 --- a/js/components/ascribe_forms/input_textarea_toggable.js +++ b/js/components/ascribe_forms/input_textarea_toggable.js @@ -4,7 +4,7 @@ import React from 'react'; import TextareaAutosize from 'react-textarea-autosize'; -import { anchorize } from '../../utils/dom_utils'; +import { anchorize } from '../../utils/dom'; let InputTextAreaToggable = React.createClass({ diff --git a/js/components/ascribe_media/media_player.js b/js/components/ascribe_media/media_player.js index 73921d0b..fe0c61db 100644 --- a/js/components/ascribe_media/media_player.js +++ b/js/components/ascribe_media/media_player.js @@ -1,19 +1,15 @@ 'use strict'; import React from 'react'; -import Q from 'q'; import Panel from 'react-bootstrap/lib/Panel'; -import AppConstants from '../../constants/application_constants'; - import audiojs from '../../third_party/imports/audiojs'; import shmui from '../../third_party/imports/shmui'; import videojs from '../../third_party/imports/videojs'; -import { escapeHTML } from '../../utils/general_utils'; -import { extractFileExtensionFromUrl } from '../../utils/file_utils'; -import { InjectInHeadUtils } from '../../utils/inject_utils'; +import { extractFileExtensionFromUrl } from '../../utils/file'; +import { escapeHTML } from '../../utils/general'; /** diff --git a/js/components/ascribe_pagination/pagination_button.js b/js/components/ascribe_pagination/pagination_button.js index b5a7ff92..12090882 100644 --- a/js/components/ascribe_pagination/pagination_button.js +++ b/js/components/ascribe_pagination/pagination_button.js @@ -4,7 +4,7 @@ import React from 'react'; import Link from 'react-router/es6/Link'; import Glyphicon from 'react-bootstrap/lib/Glyphicon'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; let PaginationButton = React.createClass({ diff --git a/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js b/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js index c9c7f9f4..b3a86d72 100644 --- a/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js +++ b/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js @@ -2,13 +2,12 @@ import React from 'react'; -import { mergeOptions } from '../../utils/general_utils'; - import EditionListActions from '../../actions/edition_list_actions'; import PieceListBulkModalSelectedEditionsWidget from './piece_list_bulk_modal_selected_editions_widget'; -import { getLangText } from '../../utils/lang_utils.js'; +import { getLangText } from '../../utils/lang.js'; + let PieceListBulkModal = React.createClass({ propTypes: { diff --git a/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal_selected_editions_widget.js b/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal_selected_editions_widget.js index e169adaa..1b523db6 100644 --- a/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal_selected_editions_widget.js +++ b/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal_selected_editions_widget.js @@ -1,7 +1,8 @@ 'use strict'; import React from 'react'; -import { getLangText } from '../../utils/lang_utils.js'; + +import { getLangText } from '../../utils/lang.js'; let PieceListBulkModalSelectedEditionsWidget = React.createClass({ propTypes: { @@ -17,4 +18,4 @@ let PieceListBulkModalSelectedEditionsWidget = React.createClass({ } }); -export default PieceListBulkModalSelectedEditionsWidget; \ No newline at end of file +export default PieceListBulkModalSelectedEditionsWidget; diff --git a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js index 68a23fa7..c1bac2ed 100644 --- a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js +++ b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js @@ -4,7 +4,7 @@ import React from 'react'; import DropdownButton from 'react-bootstrap/lib/DropdownButton'; -import { getLangText } from '../../utils/lang_utils.js'; +import { getLangText } from '../../utils/lang.js'; let PieceListToolbarFilterWidget = React.createClass({ diff --git a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js index d689c7fe..e54029fe 100644 --- a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js +++ b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js @@ -4,7 +4,7 @@ import React from 'react'; import DropdownButton from 'react-bootstrap/lib/DropdownButton'; -import { getLangText } from '../../utils/lang_utils.js'; +import { getLangText } from '../../utils/lang.js'; let PieceListToolbarOrderWidget = React.createClass({ propTypes: { diff --git a/js/components/ascribe_settings/account_settings.js b/js/components/ascribe_settings/account_settings.js index 980a19be..f4a7c89c 100644 --- a/js/components/ascribe_settings/account_settings.js +++ b/js/components/ascribe_settings/account_settings.js @@ -19,7 +19,7 @@ import { currentUserShape, whitelabelShape } from '../prop_types'; import ApiUrls from '../../constants/api_urls'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; let AccountSettings = React.createClass({ propTypes: { diff --git a/js/components/ascribe_settings/api_settings.js b/js/components/ascribe_settings/api_settings.js index 3acaa7bb..c4ed8e44 100644 --- a/js/components/ascribe_settings/api_settings.js +++ b/js/components/ascribe_settings/api_settings.js @@ -17,7 +17,7 @@ import CollapsibleParagraph from '../ascribe_collapsible/collapsible_paragraph'; import ApiUrls from '../../constants/api_urls'; import AscribeSpinner from '../ascribe_spinner'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; let APISettings = React.createClass({ diff --git a/js/components/ascribe_settings/bitcoin_wallet_settings.js b/js/components/ascribe_settings/bitcoin_wallet_settings.js index 91f5e5d6..f08cf3b3 100644 --- a/js/components/ascribe_settings/bitcoin_wallet_settings.js +++ b/js/components/ascribe_settings/bitcoin_wallet_settings.js @@ -12,7 +12,7 @@ import CollapsibleParagraph from '../ascribe_collapsible/collapsible_paragraph'; import AscribeSpinner from '../ascribe_spinner'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; let BitcoinWalletSettings = React.createClass({ @@ -68,4 +68,4 @@ let BitcoinWalletSettings = React.createClass({ } }); -export default BitcoinWalletSettings; \ No newline at end of file +export default BitcoinWalletSettings; diff --git a/js/components/ascribe_settings/contract_settings.js b/js/components/ascribe_settings/contract_settings.js index c87a243b..8b36b662 100644 --- a/js/components/ascribe_settings/contract_settings.js +++ b/js/components/ascribe_settings/contract_settings.js @@ -19,9 +19,9 @@ import AclProxy from '../acl_proxy'; import withContext from '../context/with_context'; import { currentUserShape, whitelabelShape } from '../prop_types'; -import { setDocumentTitle } from '../../utils/dom_utils'; -import { truncateTextAtCharIndex } from '../../utils/general_utils'; -import { getLangText } from '../../utils/lang_utils'; +import { setDocumentTitle } from '../../utils/dom'; +import { truncateTextAtCharIndex } from '../../utils/general'; +import { getLangText } from '../../utils/lang'; let ContractSettings = React.createClass({ diff --git a/js/components/ascribe_settings/contract_settings_update_button.js b/js/components/ascribe_settings/contract_settings_update_button.js index 73aa98ea..a1b3fea5 100644 --- a/js/components/ascribe_settings/contract_settings_update_button.js +++ b/js/components/ascribe_settings/contract_settings_update_button.js @@ -15,8 +15,8 @@ import AppConstants from '../../constants/application_constants'; import { validationTypes } from '../../constants/uploader_constants'; import { formSubmissionValidation } from '../ascribe_uploader/react_s3_fine_uploader_utils'; -import { getCookie } from '../../utils/fetch_api_utils'; -import { getLangText } from '../../utils/lang_utils'; +import { getCookie } from '../../utils/fetch_api'; +import { getLangText } from '../../utils/lang'; let ContractSettingsUpdateButton = React.createClass({ diff --git a/js/components/ascribe_settings/settings_container.js b/js/components/ascribe_settings/settings_container.js index 217302ce..9f803138 100644 --- a/js/components/ascribe_settings/settings_container.js +++ b/js/components/ascribe_settings/settings_container.js @@ -13,8 +13,8 @@ import AclProxy from '../acl_proxy'; import withContext from '../context/with_context'; import { whitelabelShape } from '../prop_types'; -import { setDocumentTitle } from '../../utils/dom_utils'; -import { getLangText } from '../../utils/lang_utils'; +import { setDocumentTitle } from '../../utils/dom'; +import { getLangText } from '../../utils/lang'; let SettingsContainer = React.createClass({ diff --git a/js/components/ascribe_settings/webhook_settings.js b/js/components/ascribe_settings/webhook_settings.js index 1de87d45..a38f70cd 100644 --- a/js/components/ascribe_settings/webhook_settings.js +++ b/js/components/ascribe_settings/webhook_settings.js @@ -19,7 +19,7 @@ import CollapsibleParagraph from '../ascribe_collapsible/collapsible_paragraph'; import ApiUrls from '../../constants/api_urls'; import AscribeSpinner from '../ascribe_spinner'; -import { getLangText } from '../../utils/lang_utils'; +import { getLangText } from '../../utils/lang'; let WebhookSettings = React.createClass({ diff --git a/js/components/ascribe_social_share/facebook_share_button.js b/js/components/ascribe_social_share/facebook_share_button.js index 81218724..7ce4fb09 100644 --- a/js/components/ascribe_social_share/facebook_share_button.js +++ b/js/components/ascribe_social_share/facebook_share_button.js @@ -6,7 +6,7 @@ import FacebookHandler from '../../third_party/facebook_handler'; import AppConstants from '../../constants/application_constants'; -import { InjectInHeadUtils } from '../../utils/inject_utils'; +import { InjectInHeadUtils } from '../../utils/inject'; let FacebookShareButton = React.createClass({ propTypes: { diff --git a/js/components/ascribe_social_share/twitter_share_button.js b/js/components/ascribe_social_share/twitter_share_button.js index 2cf50a68..043a4c96 100644 --- a/js/components/ascribe_social_share/twitter_share_button.js +++ b/js/components/ascribe_social_share/twitter_share_button.js @@ -4,7 +4,7 @@ import React from 'react'; import AppConstants from '../../constants/application_constants'; -import { InjectInHeadUtils } from '../../utils/inject_utils'; +import { InjectInHeadUtils } from '../../utils/inject'; let TwitterShareButton = React.createClass({ propTypes: { diff --git a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js index 4f1c2105..0b58f4de 100644 --- a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js +++ b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js @@ -9,7 +9,7 @@ import FileDragAndDropErrorDialog from './file_drag_and_drop_error_dialog'; import FileDragAndDropPreviewIterator from './file_drag_and_drop_preview_iterator'; import { FileStatus } from '../react_s3_fine_uploader_utils'; -import { getLangText } from '../../../utils/lang_utils'; +import { getLangText } from '../../../utils/lang'; // Taken from: https://github.com/fedosejev/react-file-drag-and-drop diff --git a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js index 5540ad8c..304ae146 100644 --- a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js +++ b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js @@ -3,9 +3,9 @@ import React from 'react'; import { Link } from 'react-router'; -import { dragAndDropAvailable } from '../../../utils/feature_detection_utils'; -import { getLangText } from '../../../utils/lang_utils'; -import { getCurrentQueryParams } from '../../../utils/url_utils'; +import { dragAndDropAvailable } from '../../../utils/feature_detection'; +import { getLangText } from '../../../utils/lang'; +import { getCurrentQueryParams } from '../../../utils/url'; let FileDragAndDropDialog = React.createClass({ propTypes: { diff --git a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_error_dialog.js b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_error_dialog.js index a88d2e35..c8119020 100644 --- a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_error_dialog.js +++ b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_error_dialog.js @@ -5,7 +5,7 @@ import classNames from 'classnames'; import { ErrorClasses } from '../../../constants/error_constants'; -import { getLangText } from '../../../utils/lang_utils'; +import { getLangText } from '../../../utils/lang'; let FileDragAndDropErrorDialog = React.createClass({ propTypes: { diff --git a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview.js b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview.js index 0c326ed4..1d6fa4e9 100644 --- a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview.js +++ b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview.js @@ -6,9 +6,9 @@ import FileDragAndDropPreviewImage from './file_drag_and_drop_preview_image'; import FileDragAndDropPreviewOther from './file_drag_and_drop_preview_other'; import { FileStatus } from '../react_s3_fine_uploader_utils'; -import { getLangText } from '../../../utils/lang_utils'; -import { truncateTextAtCharIndex } from '../../../utils/general_utils'; -import { extractFileExtensionFromString } from '../../../utils/file_utils'; +import { getLangText } from '../../../utils/lang'; +import { truncateTextAtCharIndex } from '../../../utils/general'; +import { extractFileExtensionFromString } from '../../../utils/file'; const { shape, string, number, func, bool } = React.PropTypes; diff --git a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_image.js b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_image.js index 5c757121..29acb9c4 100644 --- a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_image.js +++ b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_image.js @@ -5,7 +5,7 @@ import ProgressBar from 'react-bootstrap/lib/ProgressBar'; import AclProxy from '../../acl_proxy'; import AscribeSpinner from '../../ascribe_spinner'; -import { getLangText } from '../../../utils/lang_utils'; +import { getLangText } from '../../../utils/lang'; const { number, string, func, bool } = React.PropTypes; diff --git a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_iterator.js b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_iterator.js index 982544b4..56a2c62e 100644 --- a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_iterator.js +++ b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_iterator.js @@ -57,4 +57,4 @@ let FileDragAndDropPreviewIterator = React.createClass({ } }); -export default FileDragAndDropPreviewIterator; \ No newline at end of file +export default FileDragAndDropPreviewIterator; diff --git a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_other.js b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_other.js index e57b9495..a893f27f 100644 --- a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_other.js +++ b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_other.js @@ -3,9 +3,8 @@ import React from 'react'; import ProgressBar from 'react-bootstrap/lib/ProgressBar'; -import AclProxy from '../../acl_proxy'; import AscribeSpinner from '../../ascribe_spinner'; -import { getLangText } from '../../../utils/lang_utils'; +import { getLangText } from '../../../utils/lang'; const { string, number, bool, func } = React.PropTypes; diff --git a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_progress.js b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_progress.js index 302837d5..00c35dbd 100644 --- a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_progress.js +++ b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_progress.js @@ -55,4 +55,4 @@ const FileDragAndDropPreviewProgress = React.createClass({ } }); -export default FileDragAndDropPreviewProgress; \ No newline at end of file +export default FileDragAndDropPreviewProgress; diff --git a/js/components/ascribe_uploader/ascribe_upload_button/upload_button.js b/js/components/ascribe_uploader/ascribe_upload_button/upload_button.js index 6e309c29..95e31230 100644 --- a/js/components/ascribe_uploader/ascribe_upload_button/upload_button.js +++ b/js/components/ascribe_uploader/ascribe_upload_button/upload_button.js @@ -4,8 +4,8 @@ import React from 'react'; import classNames from 'classnames'; import { displayValidProgressFilesFilter, FileStatus } from '../react_s3_fine_uploader_utils'; -import { getLangText } from '../../../utils/lang_utils'; -import { truncateTextAtCharIndex } from '../../../utils/general_utils'; +import { truncateTextAtCharIndex } from '../../../utils/general'; +import { getLangText } from '../../../utils/lang'; const { func, array, bool, shape, string } = React.PropTypes; diff --git a/js/components/ascribe_uploader/react_s3_fine_uploader.js b/js/components/ascribe_uploader/react_s3_fine_uploader.js index ed7cfe09..0c9a2585 100644 --- a/js/components/ascribe_uploader/react_s3_fine_uploader.js +++ b/js/components/ascribe_uploader/react_s3_fine_uploader.js @@ -20,9 +20,9 @@ import { ErrorClasses, testErrorAgainstAll } from '../../constants/error_constan import { RETRY_ATTEMPT_TO_SHOW_CONTACT_US, ENDPOINTS } from '../../constants/uploader_constants'; import { displayValidFilesFilter, FileStatus, transformAllowedExtensionsToInputAcceptProp } from './react_s3_fine_uploader_utils'; -import { getCookie } from '../../utils/fetch_api_utils'; -import { computeHashOfFile, extractFileExtensionFromString } from '../../utils/file_utils'; -import { getLangText } from '../../utils/lang_utils'; +import { getCookie } from '../../utils/fetch_api'; +import { computeHashOfFile, extractFileExtensionFromString } from '../../utils/file'; +import { getLangText } from '../../utils/lang'; const { shape, diff --git a/js/components/coa_verify_container.js b/js/components/coa_verify_container.js index 6bbf7a5a..d26e8c1a 100644 --- a/js/components/coa_verify_container.js +++ b/js/components/coa_verify_container.js @@ -15,8 +15,8 @@ import { locationShape } from './prop_types'; import ApiUrls from '../constants/api_urls'; -import { getLangText } from '../utils/lang_utils'; -import { setDocumentTitle } from '../utils/dom_utils'; +import { setDocumentTitle } from '../utils/dom'; +import { getLangText } from '../utils/lang'; let CoaVerifyContainer = React.createClass({ diff --git a/js/components/context/with_context.js b/js/components/context/with_context.js index 205abc20..f4820466 100644 --- a/js/components/context/with_context.js +++ b/js/components/context/with_context.js @@ -1,8 +1,8 @@ import React from 'react'; import { currentUserShape, locationShape, routerShape, whitelabelShape } from '../prop_types'; -import { selectFromObject } from '../../utils/general_utils'; -import { getDisplayName } from '../../utils/react_utils'; +import { selectFromObject } from '../../utils/general'; +import { getDisplayName } from '../../utils/react'; /** * ContextPropDefinitions diff --git a/js/components/error_not_found_page.js b/js/components/error_not_found_page.js index d9622db5..6cc25d49 100644 --- a/js/components/error_not_found_page.js +++ b/js/components/error_not_found_page.js @@ -2,7 +2,7 @@ import React from 'react'; import history from '../history'; -import { getLangText } from '../utils/lang_utils'; +import { getLangText } from '../utils/lang'; const ErrorNotFoundPage = React.createClass({ diff --git a/js/components/footer.js b/js/components/footer.js index ced01fb5..b4f115da 100644 --- a/js/components/footer.js +++ b/js/components/footer.js @@ -2,7 +2,7 @@ import React from 'react'; -import { getLangText } from '../utils/lang_utils'; +import { getLangText } from '../utils/lang'; const Footer = React.createClass({ diff --git a/js/components/global_notification.js b/js/components/global_notification.js index 27840898..3ab8ac61 100644 --- a/js/components/global_notification.js +++ b/js/components/global_notification.js @@ -3,13 +3,12 @@ import React from 'react'; import classNames from 'classnames'; -import GlobalNotificationActions from '../actions/global_notification_actions'; -import GlobalNotificationStore from '../stores/global_notification_store'; - import Row from 'react-bootstrap/lib/Row'; import Col from 'react-bootstrap/lib/Col'; -import { mergeOptions } from '../utils/general_utils'; +import GlobalNotificationStore from '../stores/global_notification_store'; + +import { mergeOptions } from '../utils/general'; const MAX_NOTIFICATION_BUBBLE_CONTAINER_WIDTH = 768; @@ -60,7 +59,7 @@ let GlobalNotification = React.createClass({ const notificationClasses = []; - if (this.state.containerWidth > 768) { + if (this.state.containerWidth > MAX_NOTIFICATION_BUBBLE_CONTAINER_WIDTH) { notificationClasses.push('ascribe-global-notification-bubble'); notificationClasses.push(notificationStatus === 'show' ? 'ascribe-global-notification-bubble-on' : 'ascribe-global-notification-bubble-off'); diff --git a/js/components/header.js b/js/components/header.js index c5f7ef61..aba4cc91 100644 --- a/js/components/header.js +++ b/js/components/header.js @@ -20,8 +20,8 @@ import HeaderNotificationDebug from './header_notification_debug'; import NavRoutesLinks from './nav_routes_links'; import { currentUserShape, whitelabelShape } from './prop_types'; -import { constructHead } from '../utils/dom_utils'; -import { getLangText } from '../utils/lang_utils'; +import { constructHead } from '../utils/dom'; +import { getLangText } from '../utils/lang'; let Header = React.createClass({ diff --git a/js/components/header_notifications.js b/js/components/header_notifications.js index 5e94f63b..2f52908b 100644 --- a/js/components/header_notifications.js +++ b/js/components/header_notifications.js @@ -13,7 +13,7 @@ import NotificationStore from '../stores/notification_store'; import withContext from './context/with_context'; import { currentUserShape } from './prop_types'; -import { getLangText } from '../utils/lang_utils'; +import { getLangText } from '../utils/lang'; let HeaderNotifications = React.createClass({ diff --git a/js/components/login_container.js b/js/components/login_container.js index 1676d544..7288804f 100644 --- a/js/components/login_container.js +++ b/js/components/login_container.js @@ -8,8 +8,8 @@ import LoginForm from './ascribe_forms/form_login'; import withContext from './context/with_context'; import { whitelabelShape } from './prop_types'; -import { setDocumentTitle } from '../utils/dom_utils'; -import { getLangText } from '../utils/lang_utils'; +import { setDocumentTitle } from '../utils/dom'; +import { getLangText } from '../utils/lang'; let LoginContainer = React.createClass({ diff --git a/js/components/logout_container.js b/js/components/logout_container.js index 2b714557..f3d65e08 100644 --- a/js/components/logout_container.js +++ b/js/components/logout_container.js @@ -2,12 +2,12 @@ import React from 'react'; -import AscribeSpinner from './ascribe_spinner'; - import UserActions from '../actions/user_actions'; -import { getLangText } from '../utils/lang_utils'; -import { setDocumentTitle } from '../utils/dom_utils'; +import AscribeSpinner from './ascribe_spinner'; + +import { setDocumentTitle } from '../utils/dom'; +import { getLangText } from '../utils/lang'; let LogoutContainer = React.createClass({ diff --git a/js/components/nav_routes_links.js b/js/components/nav_routes_links.js index 676a9896..6d86af6c 100644 --- a/js/components/nav_routes_links.js +++ b/js/components/nav_routes_links.js @@ -4,11 +4,10 @@ import React from 'react'; import Nav from 'react-bootstrap/lib/Nav'; +import AclProxy from './acl_proxy'; import NavRoutesLinksLink from './nav_routes_links_link'; -import AclProxy from './acl_proxy'; - -import { sanitizeList } from '../utils/general_utils'; +import { sanitizeList } from '../utils/general'; const DISABLE_ENUM = ['hasPieces', 'noPieces']; diff --git a/js/components/password_reset_container.js b/js/components/password_reset_container.js index 8f348f65..dd82815a 100644 --- a/js/components/password_reset_container.js +++ b/js/components/password_reset_container.js @@ -14,8 +14,8 @@ import { locationShape, routerShape } from './prop_types'; import ApiUrls from '../constants/api_urls'; -import { setDocumentTitle } from '../utils/dom_utils'; -import { getLangText } from '../utils/lang_utils'; +import { setDocumentTitle } from '../utils/dom'; +import { getLangText } from '../utils/lang'; let PasswordResetContainer = React.createClass({ diff --git a/js/components/piece_list.js b/js/components/piece_list.js index 98e3252d..847acd8f 100644 --- a/js/components/piece_list.js +++ b/js/components/piece_list.js @@ -24,10 +24,10 @@ import AscribeSpinner from './ascribe_spinner'; import withContext from './context/with_context'; import { locationShape, routerShape } from './prop_types'; -import { getAvailableAcls } from '../utils/acl_utils'; -import { setDocumentTitle } from '../utils/dom_utils'; -import { mergeOptions, isShallowEqual } from '../utils/general_utils'; -import { getLangText } from '../utils/lang_utils'; +import { getAvailableAcls } from '../utils/acl'; +import { setDocumentTitle } from '../utils/dom'; +import { mergeOptions, isShallowEqual } from '../utils/general'; +import { getLangText } from '../utils/lang'; const PieceList = React.createClass({ diff --git a/js/components/register_piece.js b/js/components/register_piece.js index 31a608c3..76b7ee6e 100644 --- a/js/components/register_piece.js +++ b/js/components/register_piece.js @@ -15,8 +15,8 @@ import RegisterPieceForm from './ascribe_forms/form_register_piece'; import withContext from './context/with_context'; import { routerShape, whitelabelShape } from './prop_types'; -import { setDocumentTitle } from '../utils/dom_utils'; -import { getLangText } from '../utils/lang_utils'; +import { setDocumentTitle } from '../utils/dom'; +import { getLangText } from '../utils/lang'; const RegisterPiece = React.createClass( { diff --git a/js/components/search_bar.js b/js/components/search_bar.js index d2cc2863..b3615689 100644 --- a/js/components/search_bar.js +++ b/js/components/search_bar.js @@ -4,11 +4,10 @@ import React from 'react'; // FIXME: Input is deprecated import Input from 'react-bootstrap/lib/Input'; -import Glyphicon from 'react-bootstrap/lib/Glyphicon'; import AscribeSpinner from './ascribe_spinner'; -import { getLangText } from '../utils/lang_utils'; +import { getLangText } from '../utils/lang'; const { func, string, number } = React.PropTypes; diff --git a/js/components/signup_container.js b/js/components/signup_container.js index 3735604b..8fe5b6de 100644 --- a/js/components/signup_container.js +++ b/js/components/signup_container.js @@ -6,8 +6,8 @@ import SignupForm from './ascribe_forms/form_signup'; import withContext from './context/with_context'; import { whitelabelShape } from './prop_types'; -import { setDocumentTitle } from '../utils/dom_utils'; -import { getLangText } from '../utils/lang_utils'; +import { setDocumentTitle } from '../utils/dom'; +import { getLangText } from '../utils/lang'; let SignupContainer = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js b/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js index 0e725100..921bc722 100644 --- a/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js +++ b/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js @@ -8,8 +8,8 @@ import LinkContainer from 'react-router-bootstrap/lib/LinkContainer'; import withContext from '../../../../context/with_context'; import { whitelabelShape } from '../../../../prop_types'; -import { setDocumentTitle } from '../../../../../utils/dom_utils'; -import { getLangText } from '../../../../../utils/lang_utils'; +import { setDocumentTitle } from '../../../../../utils/dom'; +import { getLangText } from '../../../../../utils/lang'; let Vivi23Landing = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/artcity/artcity_landing.js b/js/components/whitelabel/wallet/components/artcity/artcity_landing.js index 1ed1ea5a..92b81b9c 100644 --- a/js/components/whitelabel/wallet/components/artcity/artcity_landing.js +++ b/js/components/whitelabel/wallet/components/artcity/artcity_landing.js @@ -8,8 +8,8 @@ import LinkContainer from 'react-router-bootstrap/lib/LinkContainer'; import withContext from '../../../../context/with_context'; import { whitelabelShape } from '../../../../prop_types'; -import { getLangText } from '../../../../../utils/lang_utils'; -import { setDocumentTitle } from '../../../../../utils/dom_utils'; +import { getLangText } from '../../../../../utils/lang'; +import { setDocumentTitle } from '../../../../../utils/dom'; let ArtcityLanding = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js b/js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js index 74a55095..b15e1288 100644 --- a/js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js +++ b/js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js @@ -10,7 +10,7 @@ import AclProxy from '../../../../acl_proxy'; import withContext from '../../../../context/with_context'; import { currentUserShape } from '../../../../prop_types'; -import { mergeOptions } from '../../../../../utils/general_utils'; +import { mergeOptions } from '../../../../../utils/general'; let WalletActionPanel = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/ascribe_detail/wallet_piece_container.js b/js/components/whitelabel/wallet/components/ascribe_detail/wallet_piece_container.js index 45093893..23216717 100644 --- a/js/components/whitelabel/wallet/components/ascribe_detail/wallet_piece_container.js +++ b/js/components/whitelabel/wallet/components/ascribe_detail/wallet_piece_container.js @@ -17,7 +17,7 @@ import withContext from '../../../../context/with_context'; import ApiUrls from '../../../../../constants/api_urls'; -import { getLangText } from '../../../../../utils/lang_utils'; +import { getLangText } from '../../../../../utils/lang'; let WalletPieceContainer = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/cc/cc_register_piece.js b/js/components/whitelabel/wallet/components/cc/cc_register_piece.js index 83c68368..668ec4f4 100644 --- a/js/components/whitelabel/wallet/components/cc/cc_register_piece.js +++ b/js/components/whitelabel/wallet/components/cc/cc_register_piece.js @@ -7,9 +7,9 @@ import Property from '../../../../ascribe_forms/property'; import LicenseActions from '../../../../../actions/license_actions'; import LicenseStore from '../../../../../stores/license_store'; -import { getLangText } from '../../../../../utils/lang_utils'; -import { setDocumentTitle } from '../../../../../utils/dom_utils'; -import { mergeOptions } from '../../../../../utils/general_utils'; +import { setDocumentTitle } from '../../../../../utils/dom'; +import { mergeOptions } from '../../../../../utils/general'; +import { getLangText } from '../../../../../utils/lang'; let CCRegisterPiece = React.createClass({ getInitialState() { diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_accordion_list/cyland_accordion_list_item.js b/js/components/whitelabel/wallet/components/cyland/cyland_accordion_list/cyland_accordion_list_item.js index 0eb83d0c..630d1468 100644 --- a/js/components/whitelabel/wallet/components/cyland/cyland_accordion_list/cyland_accordion_list_item.js +++ b/js/components/whitelabel/wallet/components/cyland/cyland_accordion_list/cyland_accordion_list_item.js @@ -15,7 +15,7 @@ import AccordionListItemPiece from '../../../../../ascribe_accordion_list/accord import AclProxy from '../../../../../acl_proxy'; -import { getLangText } from '../../../../../../utils/lang_utils'; +import { getLangText } from '../../../../../../utils/lang'; let CylandAccordionListItem = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_buttons/cyland_submit_button.js b/js/components/whitelabel/wallet/components/cyland/cyland_buttons/cyland_submit_button.js index 2a881fbd..90f3c349 100644 --- a/js/components/whitelabel/wallet/components/cyland/cyland_buttons/cyland_submit_button.js +++ b/js/components/whitelabel/wallet/components/cyland/cyland_buttons/cyland_submit_button.js @@ -7,7 +7,7 @@ import Button from 'react-bootstrap/lib/Button'; import LinkContainer from 'react-router-bootstrap/lib/LinkContainer'; -import { getLangText } from '../../../../../../utils/lang_utils'; +import { getLangText } from '../../../../../../utils/lang'; let CylandSubmitButton = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_detail/cyland_piece_container.js b/js/components/whitelabel/wallet/components/cyland/cyland_detail/cyland_piece_container.js index 4ab98e57..13032baa 100644 --- a/js/components/whitelabel/wallet/components/cyland/cyland_detail/cyland_piece_container.js +++ b/js/components/whitelabel/wallet/components/cyland/cyland_detail/cyland_piece_container.js @@ -23,9 +23,9 @@ import AscribeSpinner from '../../../../../ascribe_spinner'; import withContext from '../../../../../context/with_context'; import { routerShape } from '../../../../../prop_types'; -import { setDocumentTitle } from '../../../../../../utils/dom_utils'; -import { mergeOptions } from '../../../../../../utils/general_utils'; -import { getLangText } from '../../../../../../utils/lang_utils'; +import { setDocumentTitle } from '../../../../../../utils/dom'; +import { mergeOptions } from '../../../../../../utils/general'; +import { getLangText } from '../../../../../../utils/lang'; const CylandPieceContainer = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js b/js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js index c41caa76..31799117 100644 --- a/js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js +++ b/js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js @@ -17,7 +17,7 @@ import AscribeSpinner from '../../../../../ascribe_spinner'; import requests from '../../../../../../utils/requests'; -import { getLangText } from '../../../../../../utils/lang_utils'; +import { getLangText } from '../../../../../../utils/lang'; import { formSubmissionValidation } from '../../../../../ascribe_uploader/react_s3_fine_uploader_utils'; diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_landing.js b/js/components/whitelabel/wallet/components/cyland/cyland_landing.js index b4bae8b7..2159027d 100644 --- a/js/components/whitelabel/wallet/components/cyland/cyland_landing.js +++ b/js/components/whitelabel/wallet/components/cyland/cyland_landing.js @@ -9,8 +9,8 @@ import LinkContainer from 'react-router-bootstrap/lib/LinkContainer'; import withContext from '../../../../context/with_context'; import { whitelabelShape } from '../../../../prop_types'; -import { setDocumentTitle } from '../../../../../utils/dom_utils'; -import { getLangText } from '../../../../../utils/lang_utils'; +import { setDocumentTitle } from '../../../../../utils/dom'; +import { getLangText } from '../../../../../utils/lang'; let CylandLanding = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_piece_list.js b/js/components/whitelabel/wallet/components/cyland/cyland_piece_list.js index 275ceb69..60b208d5 100644 --- a/js/components/whitelabel/wallet/components/cyland/cyland_piece_list.js +++ b/js/components/whitelabel/wallet/components/cyland/cyland_piece_list.js @@ -8,8 +8,8 @@ import CylandAccordionListItem from './cyland_accordion_list/cyland_accordion_li import withContext from '../../../../context/with_context'; import { currentUserShape, whitelabelShape } from '../../../../prop_types'; -import { setDocumentTitle } from '../../../../../utils/dom_utils'; -import { getLangText } from '../../../../../utils/lang_utils'; +import { setDocumentTitle } from '../../../../../utils/dom'; +import { getLangText } from '../../../../../utils/lang'; let CylandPieceList = React.createClass({ propTypes: { diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js b/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js index e4c2e631..71260042 100644 --- a/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js +++ b/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js @@ -28,10 +28,10 @@ import { currentUserShape, locationShape, routerShape, whitelabelShape } from '. import ApiUrls from '../../../../../constants/api_urls'; -import { setDocumentTitle } from '../../../../../utils/dom_utils'; -import { getAclFormMessage } from '../../../../../utils/form_utils'; -import { getLangText } from '../../../../../utils/lang_utils'; -import { mergeOptions } from '../../../../../utils/general_utils'; +import { setDocumentTitle } from '../../../../../utils/dom'; +import { getAclFormMessage } from '../../../../../utils/form'; +import { mergeOptions } from '../../../../../utils/general'; +import { getLangText } from '../../../../../utils/lang'; const CylandRegisterPiece = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/demo/demo_landing.js b/js/components/whitelabel/wallet/components/demo/demo_landing.js index 8c06913b..5d5f275c 100644 --- a/js/components/whitelabel/wallet/components/demo/demo_landing.js +++ b/js/components/whitelabel/wallet/components/demo/demo_landing.js @@ -8,8 +8,8 @@ import LinkContainer from 'react-router-bootstrap/lib/LinkContainer'; import withContext from '../../../../context/with_context'; import { whitelabelShape } from '../../../../prop_types'; -import { setDocumentTitle } from '../../../../../utils/dom_utils'; -import { getLangText } from '../../../../../utils/lang_utils'; +import { setDocumentTitle } from '../../../../../utils/dom'; +import { getLangText } from '../../../../../utils/lang'; let DemoLanding = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_accordion_list/ikonotv_accordion_list_item.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_accordion_list/ikonotv_accordion_list_item.js index 7aab851b..ca925932 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_accordion_list/ikonotv_accordion_list_item.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_accordion_list/ikonotv_accordion_list_item.js @@ -17,7 +17,7 @@ import AclProxy from '../../../../../acl_proxy'; import withContext from '../../../../../context/with_context'; import { currentUserShape } from '../../../../../prop_types'; -import { getLangText } from '../../../../../../utils/lang_utils'; +import { getLangText } from '../../../../../../utils/lang'; let IkonotvAccordionListItem = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_buttons/ikonotv_submit_button.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_buttons/ikonotv_submit_button.js index 24af1d0b..31db5d20 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_buttons/ikonotv_submit_button.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_buttons/ikonotv_submit_button.js @@ -7,7 +7,7 @@ import Button from 'react-bootstrap/lib/Button'; import LinkContainer from 'react-router-bootstrap/lib/LinkContainer'; -import { getLangText } from '../../../../../../utils/lang_utils'; +import { getLangText } from '../../../../../../utils/lang'; let IkonotvSubmitButton = React.createClass({ propTypes: { diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_contract_notifications.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_contract_notifications.js index a556ff30..09ed8dfd 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_contract_notifications.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_contract_notifications.js @@ -19,8 +19,8 @@ import { currentUserShape, routerShape, whitelabelShape } from '../../../../prop import AppConstants from '../../../../../constants/application_constants'; -import { setDocumentTitle } from '../../../../../utils/dom_utils'; -import { getLangText } from '../../../../../utils/lang_utils'; +import { setDocumentTitle } from '../../../../../utils/dom'; +import { getLangText } from '../../../../../utils/lang'; const IkonotvContractNotifications = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_detail/ikonotv_piece_container.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_detail/ikonotv_piece_container.js index 369ad8e3..4d51edb4 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_detail/ikonotv_piece_container.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_detail/ikonotv_piece_container.js @@ -24,9 +24,9 @@ import AscribeSpinner from '../../../../../ascribe_spinner'; import withContext from '../../../../../context/with_context'; import { routerShape } from '../../../../../prop_types'; -import { setDocumentTitle } from '../../../../../../utils/dom_utils'; -import { mergeOptions } from '../../../../../../utils/general_utils'; -import { getLangText } from '../../../../../../utils/lang_utils'; +import { setDocumentTitle } from '../../../../../../utils/dom'; +import { mergeOptions } from '../../../../../../utils/general'; +import { getLangText } from '../../../../../../utils/lang'; const IkonotvPieceContainer = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js index 49ead8ec..479c8ab8 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js @@ -15,7 +15,7 @@ import AscribeSpinner from '../../../../../ascribe_spinner'; import requests from '../../../../../../utils/requests'; -import { getLangText } from '../../../../../../utils/lang_utils'; +import { getLangText } from '../../../../../../utils/lang'; let IkonotvArtistDetailsForm = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js index 28c67c94..abdd54df 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js @@ -15,7 +15,7 @@ import AscribeSpinner from '../../../../../ascribe_spinner'; import requests from '../../../../../../utils/requests'; -import { getLangText } from '../../../../../../utils/lang_utils'; +import { getLangText } from '../../../../../../utils/lang'; let IkonotvArtworkDetailsForm = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js index 000180df..64eef598 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js @@ -9,8 +9,8 @@ import LinkContainer from 'react-router-bootstrap/lib/LinkContainer'; import withContext from '../../../../context/with_context'; import { locationShape } from '../../../../prop_types'; -import { setDocumentTitle } from '../../../../../utils/dom_utils'; -import { getLangText } from '../../../../../utils/lang_utils'; +import { setDocumentTitle } from '../../../../../utils/dom'; +import { getLangText } from '../../../../../utils/lang'; let IkonotvLanding = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js index 10ad82a6..eb7c2a6a 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js @@ -11,8 +11,8 @@ import IkonotvAccordionListItem from './ikonotv_accordion_list/ikonotv_accordion import withContext from '../../../../context/with_context'; import { currentUserShape, whitelabelShape } from '../../../../prop_types'; -import { setDocumentTitle } from '../../../../../utils/dom_utils'; -import { getLangText } from '../../../../../utils/lang_utils'; +import { setDocumentTitle } from '../../../../../utils/dom'; +import { getLangText } from '../../../../../utils/lang'; let IkonotvPieceList = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js index 5bf80658..c897a98e 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js @@ -26,8 +26,8 @@ import { currentUserShape, locationShape, routerShape, whitelabelShape } from '. import ApiUrls from '../../../../../constants/api_urls'; -import { mergeOptions } from '../../../../../utils/general_utils'; -import { getLangText } from '../../../../../utils/lang_utils'; +import { mergeOptions } from '../../../../../utils/general'; +import { getLangText } from '../../../../../utils/lang'; const IkonotvRegisterPiece = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/lumenus/lumenus_landing.js b/js/components/whitelabel/wallet/components/lumenus/lumenus_landing.js index 97cf9b32..68f372a0 100644 --- a/js/components/whitelabel/wallet/components/lumenus/lumenus_landing.js +++ b/js/components/whitelabel/wallet/components/lumenus/lumenus_landing.js @@ -8,8 +8,8 @@ import LinkContainer from 'react-router-bootstrap/lib/LinkContainer'; import withContext from '../../../../context/with_context'; import { whitelabelShape } from '../../../../prop_types'; -import { setDocumentTitle } from '../../../../../utils/dom_utils'; -import { getLangText } from '../../../../../utils/lang_utils'; +import { setDocumentTitle } from '../../../../../utils/dom'; +import { getLangText } from '../../../../../utils/lang'; let LumenusLanding = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/market/market_buttons/market_acl_button_list.js b/js/components/whitelabel/wallet/components/market/market_buttons/market_acl_button_list.js index b1b6365c..1cb4fc6c 100644 --- a/js/components/whitelabel/wallet/components/market/market_buttons/market_acl_button_list.js +++ b/js/components/whitelabel/wallet/components/market/market_buttons/market_acl_button_list.js @@ -4,12 +4,11 @@ import React from 'react'; import MarketSubmitButton from './market_submit_button'; -import DeleteButton from '../../../../../ascribe_buttons/delete_button'; import EmailButton from '../../../../../ascribe_buttons/acls/email_button'; import TransferButton from '../../../../../ascribe_buttons/acls/transfer_button'; import UnconsignButton from '../../../../../ascribe_buttons/acls/unconsign_button'; -import { selectFromObject } from '../../../../../../utils/general_utils'; +import { selectFromObject } from '../../../../../../utils/general'; let MarketAclButtonList = React.createClass({ propTypes: { diff --git a/js/components/whitelabel/wallet/components/market/market_buttons/market_submit_button.js b/js/components/whitelabel/wallet/components/market/market_buttons/market_submit_button.js index e9efdf64..37521d6c 100644 --- a/js/components/whitelabel/wallet/components/market/market_buttons/market_submit_button.js +++ b/js/components/whitelabel/wallet/components/market/market_buttons/market_submit_button.js @@ -17,8 +17,8 @@ import AclProxy from '../../../../../acl_proxy'; import withContext from '../../../../../context/with_context'; import { currentUserShape, whitelabelShape } from '../../../../../prop_types'; -import { getAclFormMessage, getAclFormDataId } from '../../../../../../utils/form_utils'; -import { getLangText } from '../../../../../../utils/lang_utils'; +import { getAclFormMessage, getAclFormDataId } from '../../../../../../utils/form'; +import { getLangText } from '../../../../../../utils/lang'; let MarketSubmitButton = React.createClass({ propTypes: { diff --git a/js/components/whitelabel/wallet/components/market/market_error_consign_unavailable.js b/js/components/whitelabel/wallet/components/market/market_error_consign_unavailable.js index 13fbc43e..eea3296b 100644 --- a/js/components/whitelabel/wallet/components/market/market_error_consign_unavailable.js +++ b/js/components/whitelabel/wallet/components/market/market_error_consign_unavailable.js @@ -2,7 +2,7 @@ import React from 'react'; -import { getLangText } from '../../../../../utils/lang_utils'; +import { getLangText } from '../../../../../utils/lang'; const MarketErrorConsignUnavailable = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/market/market_footer.js b/js/components/whitelabel/wallet/components/market/market_footer.js index 079216ad..9a121af1 100644 --- a/js/components/whitelabel/wallet/components/market/market_footer.js +++ b/js/components/whitelabel/wallet/components/market/market_footer.js @@ -2,7 +2,7 @@ import React from 'react'; -import { getLangText } from '../../../../../utils/lang_utils'; +import { getLangText } from '../../../../../utils/lang'; const MarketFooter = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js b/js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js index 242acf1a..b5f53c52 100644 --- a/js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js +++ b/js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js @@ -19,8 +19,7 @@ import { validationParts, validationTypes } from '../../../../../../constants/up import requests from '../../../../../../utils/requests'; import { formSubmissionValidation } from '../../../../../ascribe_uploader/react_s3_fine_uploader_utils'; -import { mergeOptions } from '../../../../../../utils/general_utils'; -import { getLangText } from '../../../../../../utils/lang_utils'; +import { getLangText } from '../../../../../../utils/lang'; let MarketAdditionalDataForm = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/market/market_landing.js b/js/components/whitelabel/wallet/components/market/market_landing.js index be6213fc..bbab2bc9 100644 --- a/js/components/whitelabel/wallet/components/market/market_landing.js +++ b/js/components/whitelabel/wallet/components/market/market_landing.js @@ -8,8 +8,8 @@ import LinkContainer from 'react-router-bootstrap/lib/LinkContainer'; import withContext from '../../../../context/with_context'; import { whitelabelShape } from '../../../../prop_types'; -import { setDocumentTitle } from '../../../../../utils/dom_utils'; -import { getLangText } from '../../../../../utils/lang_utils'; +import { setDocumentTitle } from '../../../../../utils/dom'; +import { getLangText } from '../../../../../utils/lang'; let MarketLanding = React.createClass({ diff --git a/js/components/whitelabel/wallet/components/market/market_piece_list.js b/js/components/whitelabel/wallet/components/market/market_piece_list.js index 3084fbc2..427a8567 100644 --- a/js/components/whitelabel/wallet/components/market/market_piece_list.js +++ b/js/components/whitelabel/wallet/components/market/market_piece_list.js @@ -8,8 +8,9 @@ import withContext from '../../../../context/with_context'; import PieceList from '../../../../piece_list'; import { currentUserShape, whitelabelShape } from '../../../../prop_types'; -import { setDocumentTitle } from '../../../../../utils/dom_utils'; -import { getLangText } from '../../../../../utils/lang_utils'; +import { setDocumentTitle } from '../../../../../utils/dom'; +import { getLangText } from '../../../../../utils/lang'; + let MarketPieceList = React.createClass({ propTypes: { diff --git a/js/components/whitelabel/wallet/components/market/market_register_piece.js b/js/components/whitelabel/wallet/components/market/market_register_piece.js index c5e326be..2d636ff0 100644 --- a/js/components/whitelabel/wallet/components/market/market_register_piece.js +++ b/js/components/whitelabel/wallet/components/market/market_register_piece.js @@ -19,9 +19,10 @@ import SlidesContainer from '../../../../ascribe_slides_container/slides_contain import withContext from '../../../../context/with_context'; import { locationShape, routerShape, whitelabelShape } from '../../../../prop_types'; -import { setDocumentTitle } from '../../../../../utils/dom_utils'; -import { mergeOptions } from '../../../../../utils/general_utils'; -import { getLangText } from '../../../../../utils/lang_utils'; +import { setDocumentTitle } from '../../../../../utils/dom'; +import { mergeOptions } from '../../../../../utils/general'; +import { getLangText } from '../../../../../utils/lang'; + let MarketRegisterPiece = React.createClass({ propTypes: { diff --git a/js/components/whitelabel/wallet/components/polline/polline_landing.js b/js/components/whitelabel/wallet/components/polline/polline_landing.js index 52b74529..f89710ee 100644 --- a/js/components/whitelabel/wallet/components/polline/polline_landing.js +++ b/js/components/whitelabel/wallet/components/polline/polline_landing.js @@ -8,8 +8,8 @@ import LinkContainer from 'react-router-bootstrap/lib/LinkContainer'; import withContext from '../../../../context/with_context'; import { whitelabelShape } from '../../../../prop_types'; -import { setDocumentTitle } from '../../../../../utils/dom_utils'; -import { getLangText } from '../../../../../utils/lang_utils'; +import { setDocumentTitle } from '../../../../../utils/dom'; +import { getLangText } from '../../../../../utils/lang'; let PollineLanding = React.createClass({ diff --git a/js/components/whitelabel/wallet/wallet_app.js b/js/components/whitelabel/wallet/wallet_app.js index a5e6acfd..04a8f44a 100644 --- a/js/components/whitelabel/wallet/wallet_app.js +++ b/js/components/whitelabel/wallet/wallet_app.js @@ -6,7 +6,7 @@ import withContext from '../../context/with_context'; import Header from '../../header'; import { routerShape } from '../../prop_types'; -import { getSubdomain } from '../../../utils/general_utils'; +import { getSubdomain } from '../../../utils/general'; let WalletApp = React.createClass({ diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js index 0b8e6703..e661e9b9 100644 --- a/js/components/whitelabel/wallet/wallet_routes.js +++ b/js/components/whitelabel/wallet/wallet_routes.js @@ -49,7 +49,7 @@ import ArtcityLanding from './components/artcity/artcity_landing'; import WalletApp from './wallet_app'; -import { getLangText } from '../../../utils/lang_utils'; +import { getLangText } from '../../../utils/lang'; const ROUTES = { diff --git a/js/constants/error_constants.js b/js/constants/error_constants.js index 2baeaf10..d962b0ed 100644 --- a/js/constants/error_constants.js +++ b/js/constants/error_constants.js @@ -1,9 +1,7 @@ -'use strict' - import { validationParts } from './uploader_constants'; -import { deepMatchObject } from '../utils/general_utils'; -import { getLangText } from '../utils/lang_utils'; +import { deepMatchObject } from '../utils/general'; +import { getLangText } from '../utils/lang'; /** * ErrorClasses diff --git a/js/fetchers/edition_list_fetcher.js b/js/fetchers/edition_list_fetcher.js index 4a97680f..5b23a15f 100644 --- a/js/fetchers/edition_list_fetcher.js +++ b/js/fetchers/edition_list_fetcher.js @@ -2,8 +2,8 @@ import requests from '../utils/requests'; -import { mergeOptions } from '../utils/general_utils'; -import { generateOrderingQueryParams } from '../utils/url_utils'; +import { mergeOptions } from '../utils/general'; +import { generateOrderingQueryParams } from '../utils/url'; let EditionListFetcher = { /** diff --git a/js/fetchers/license_fetcher.js b/js/fetchers/license_fetcher.js index d5b296be..8e1fdce8 100644 --- a/js/fetchers/license_fetcher.js +++ b/js/fetchers/license_fetcher.js @@ -2,7 +2,7 @@ import requests from '../utils/requests'; -import { getSubdomain } from '../utils/general_utils'; +import { getSubdomain } from '../utils/general'; let LicenseFetcher = { diff --git a/js/fetchers/piece_list_fetcher.js b/js/fetchers/piece_list_fetcher.js index 249d456e..ec0c4067 100644 --- a/js/fetchers/piece_list_fetcher.js +++ b/js/fetchers/piece_list_fetcher.js @@ -2,8 +2,8 @@ import requests from '../utils/requests'; -import { mergeOptions } from '../utils/general_utils'; -import { generateOrderingQueryParams } from '../utils/url_utils'; +import { mergeOptions } from '../utils/general'; +import { generateOrderingQueryParams } from '../utils/url'; let PieceListFetcher = { /** diff --git a/js/routes.js b/js/routes.js index 44214ff2..08b14c15 100644 --- a/js/routes.js +++ b/js/routes.js @@ -24,7 +24,7 @@ import Footer from './components/footer'; import { ProxyHandler, AuthRedirect } from './components/ascribe_routes/proxy_handler'; -import { getLangText } from './utils/lang_utils'; +import { getLangText } from './utils/lang'; const Routes = ( diff --git a/js/sources/whitelabel_source.js b/js/sources/whitelabel_source.js index 3d5770ad..c7749125 100644 --- a/js/sources/whitelabel_source.js +++ b/js/sources/whitelabel_source.js @@ -3,7 +3,7 @@ import requests from '../utils/requests'; import WhitelabelActions from '../actions/whitelabel_actions'; -import { getSubdomain } from '../utils/general_utils'; +import { getSubdomain } from '../utils/general'; const WhitelabelSource = { diff --git a/js/stores/edition_store.js b/js/stores/edition_store.js index ebb7ccf9..ac7d553f 100644 --- a/js/stores/edition_store.js +++ b/js/stores/edition_store.js @@ -7,7 +7,7 @@ import EditionActions from '../actions/edition_actions'; import EditionSource from '../sources/edition_source'; import CoaSource from '../sources/coa_source'; -import { mergeOptions } from '../utils/general_utils'; +import { mergeOptions } from '../utils/general'; class EditionStore { diff --git a/js/third_party/imports/audiojs.js b/js/third_party/imports/audiojs.js index 0b96d3f7..a5594dda 100644 --- a/js/third_party/imports/audiojs.js +++ b/js/third_party/imports/audiojs.js @@ -1,6 +1,6 @@ import AppConstants from '../../constants/application_constants'; -import { InjectInHeadUtils } from '../../utils/inject_utils'; +import { InjectInHeadUtils } from '../../utils/inject'; /** diff --git a/js/third_party/imports/shmui.js b/js/third_party/imports/shmui.js index 55873b9f..fccfa628 100644 --- a/js/third_party/imports/shmui.js +++ b/js/third_party/imports/shmui.js @@ -1,6 +1,6 @@ import AppConstants from '../../constants/application_constants'; -import { InjectInHeadUtils } from '../../utils/inject_utils'; +import { InjectInHeadUtils } from '../../utils/inject'; /** diff --git a/js/third_party/imports/videojs.js b/js/third_party/imports/videojs.js index d06e7004..3ec3ce42 100644 --- a/js/third_party/imports/videojs.js +++ b/js/third_party/imports/videojs.js @@ -1,6 +1,6 @@ import AppConstants from '../../constants/application_constants'; -import { InjectInHeadUtils } from '../../utils/inject_utils'; +import { InjectInHeadUtils } from '../../utils/inject'; /** diff --git a/js/third_party/intercom_handler.js b/js/third_party/intercom_handler.js index fc14ced2..b4486dc6 100644 --- a/js/third_party/intercom_handler.js +++ b/js/third_party/intercom_handler.js @@ -3,7 +3,7 @@ import { altThirdParty } from '../alt'; import EventActions from '../actions/event_actions'; -import { getSubdomain } from '../utils/general_utils'; +import { getSubdomain } from '../utils/general'; class IntercomHandler { diff --git a/js/third_party/notifications_handler.js b/js/third_party/notifications_handler.js index 8a3f478a..ea078953 100644 --- a/js/third_party/notifications_handler.js +++ b/js/third_party/notifications_handler.js @@ -1,14 +1,13 @@ 'use strict'; -import history from '../history'; import { altThirdParty } from '../alt'; - +import history from '../history'; import EventActions from '../actions/event_actions'; import NotificationActions from '../actions/notification_actions'; -import { getSubdomain } from '../utils/general_utils'; +import { getSubdomain } from '../utils/general'; class NotificationsHandler { diff --git a/js/utils/acl_utils.js b/js/utils/acl.js similarity index 96% rename from js/utils/acl_utils.js rename to js/utils/acl.js index dd39a380..91ca47b7 100644 --- a/js/utils/acl_utils.js +++ b/js/utils/acl.js @@ -1,6 +1,6 @@ 'use strict'; -import { sanitize, intersectLists } from './general_utils'; +import { sanitize, intersectLists } from './general'; export function getAvailableAcls(editions, filterFn) { let availableAcls = []; diff --git a/js/utils/constants_utils.js b/js/utils/constants.js similarity index 100% rename from js/utils/constants_utils.js rename to js/utils/constants.js diff --git a/js/utils/dom_utils.js b/js/utils/dom.js similarity index 98% rename from js/utils/dom_utils.js rename to js/utils/dom.js index f0cd852c..8809bbf8 100644 --- a/js/utils/dom_utils.js +++ b/js/utils/dom.js @@ -2,7 +2,7 @@ import React from 'react'; -import { getLinkRegex, isEmail } from './regex_utils'; +import { getLinkRegex, isEmail } from './regex'; /** * Set the title in the browser window. diff --git a/js/utils/error_utils.js b/js/utils/error.js similarity index 100% rename from js/utils/error_utils.js rename to js/utils/error.js diff --git a/js/utils/feature_detection_utils.js b/js/utils/feature_detection.js similarity index 100% rename from js/utils/feature_detection_utils.js rename to js/utils/feature_detection.js diff --git a/js/utils/fetch_api_utils.js b/js/utils/fetch_api.js similarity index 100% rename from js/utils/fetch_api_utils.js rename to js/utils/fetch_api.js diff --git a/js/utils/file_utils.js b/js/utils/file.js similarity index 98% rename from js/utils/file_utils.js rename to js/utils/file.js index 7557536d..12107e17 100644 --- a/js/utils/file_utils.js +++ b/js/utils/file.js @@ -4,7 +4,7 @@ import Q from 'q'; import SparkMD5 from 'spark-md5'; import Moment from 'moment'; -import { getLangText } from './lang_utils'; +import { getLangText } from './lang'; /** * Takes a string, creates a text file and returns the URL diff --git a/js/utils/form_utils.js b/js/utils/form.js similarity index 99% rename from js/utils/form_utils.js rename to js/utils/form.js index 0581b28b..e3d4f27e 100644 --- a/js/utils/form_utils.js +++ b/js/utils/form.js @@ -1,6 +1,6 @@ 'use strict'; -import { getLangText } from './lang_utils'; +import { getLangText } from './lang'; import GlobalNotificationActions from '../actions/global_notification_actions'; import GlobalNotificationModel from '../models/global_notification_model'; diff --git a/js/utils/general_utils.js b/js/utils/general.js similarity index 100% rename from js/utils/general_utils.js rename to js/utils/general.js diff --git a/js/utils/inject_utils.js b/js/utils/inject.js similarity index 100% rename from js/utils/inject_utils.js rename to js/utils/inject.js diff --git a/js/utils/lang_utils.js b/js/utils/lang.js similarity index 96% rename from js/utils/lang_utils.js rename to js/utils/lang.js index ee2d292c..2638bcd3 100644 --- a/js/utils/lang_utils.js +++ b/js/utils/lang.js @@ -2,7 +2,7 @@ import languages from '../constants/languages'; -import { formatText } from './general_utils'; +import { formatText } from './general'; export function getLang() { diff --git a/js/utils/react_utils.js b/js/utils/react.js similarity index 100% rename from js/utils/react_utils.js rename to js/utils/react.js diff --git a/js/utils/regex_utils.js b/js/utils/regex.js similarity index 100% rename from js/utils/regex_utils.js rename to js/utils/regex.js diff --git a/js/utils/requests.js b/js/utils/requests.js index 035cf598..fc88df3e 100644 --- a/js/utils/requests.js +++ b/js/utils/requests.js @@ -4,9 +4,9 @@ import Q from 'q'; import AppConstants from '../constants/application_constants'; -import { getCookie } from '../utils/fetch_api_utils'; -import { omitFromObject } from '../utils/general_utils'; -import { argsToQueryParams } from '../utils/url_utils'; +import { getCookie } from '../utils/fetch_api'; +import { omitFromObject } from '../utils/general'; +import { argsToQueryParams } from '../utils/url'; class Requests { diff --git a/js/utils/url_utils.js b/js/utils/url.js similarity index 97% rename from js/utils/url_utils.js rename to js/utils/url.js index 41306498..881ff5b0 100644 --- a/js/utils/url_utils.js +++ b/js/utils/url.js @@ -4,7 +4,7 @@ import camelCase from 'camelcase'; import decamelize from 'decamelize'; import queryString from 'query-string'; -import { sanitize } from './general_utils'; +import { sanitize } from './general'; // TODO: Create Unittests that test all functions