Progress

app/javascript/gabsocial/features/compose/components/compose_extra_button.js

@@ -70,7 +70,7 @@ export default class ComposeExtraButton extends PureComponent {
           onMouseEnter={() => this.handleOnMouseEnter()}
           onMouseLeave={() => this.handleOnMouseLeave()}
         >
-          <Icon id={icon} width={iconSize} height={iconSize} className={_s.fillcolorSecondary} />
+          <Icon id={icon} width={iconSize} height={iconSize} className={_s.fillColorSecondary} />
           {
             !small &&
             <span className={titleClasses}>

app/javascript/gabsocial/features/compose/components/compose_form/compose_form.js

@@ -316,13 +316,15 @@ class ComposeForm extends ImmutablePureComponent {
             small={shouldCondense}
             textarea
           >
-            { /*
-            !condensed &&
+
             <div className='compose-form__modifiers'>
               <UploadForm />
-              {!edit && <PollFormContainer />}
+              {
+                !edit &&
+                <PollFormContainer />
+              }
             </div>
-          */ }
+
           </AutosuggestTextbox>
 
           { /* quoteOfId && <QuotedStatusPreviewContainer id={quoteOfId} /> */}

app/javascript/gabsocial/features/compose/components/upload/upload.js

@@ -1,15 +1,15 @@
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { defineMessages, injectIntl } from 'react-intl';
-import classNames from 'classnames';
-import spring from 'react-motion/lib/spring';
-import Motion from '../../../ui/util/optional_motion';
-import IconButton from '../../../../components/icon_button';
+import ImmutablePropTypes from 'react-immutable-proptypes'
+import ImmutablePureComponent from 'react-immutable-pure-component'
+import { defineMessages, injectIntl } from 'react-intl'
+import classNames from 'classnames'
+import spring from 'react-motion/lib/spring'
+import Motion from '../../../ui/util/optional_motion'
+import Button from '../../../../components/button'
 
 const messages = defineMessages({
   description: { id: 'upload_form.description', defaultMessage: 'Describe for the visually impaired' },
   delete: { id: 'upload_form.undo', defaultMessage: 'Delete' },
-});
+})
 
 export default
 @injectIntl
@@ -17,82 +17,76 @@ class Upload extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
-  };
+  }
 
   static propTypes = {
     media: ImmutablePropTypes.map.isRequired,
     intl: PropTypes.object.isRequired,
     onUndo: PropTypes.func.isRequired,
     onDescriptionChange: PropTypes.func.isRequired,
-    onOpenFocalPoint: PropTypes.func.isRequired,
     onSubmit: PropTypes.func.isRequired,
-  };
+  }
 
   state = {
     hovered: false,
     focused: false,
     dirtyDescription: null,
-  };
+  }
 
   handleKeyDown = (e) => {
     if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
-      this.handleSubmit();
+      this.handleSubmit()
     }
   }
 
   handleSubmit = () => {
-    this.handleInputBlur();
-    this.props.onSubmit(this.context.router.history);
+    this.handleInputBlur()
+    this.props.onSubmit(this.context.router.history)
   }
 
   handleUndoClick = e => {
-    e.stopPropagation();
-    this.props.onUndo(this.props.media.get('id'));
-  }
-
-  handleFocalPointClick = e => {
-    e.stopPropagation();
-    this.props.onOpenFocalPoint(this.props.media.get('id'));
+    e.stopPropagation()
+    this.props.onUndo(this.props.media.get('id'))
   }
 
   handleInputChange = e => {
-    this.setState({ dirtyDescription: e.target.value });
+    this.setState({ dirtyDescription: e.target.value })
   }
 
   handleMouseEnter = () => {
-    this.setState({ hovered: true });
+    this.setState({ hovered: true })
   }
 
   handleMouseLeave = () => {
-    this.setState({ hovered: false });
+    this.setState({ hovered: false })
   }
 
   handleInputFocus = () => {
-    this.setState({ focused: true });
+    this.setState({ focused: true })
   }
 
   handleClick = () => {
-    this.setState({ focused: true });
+    this.setState({ focused: true })
   }
 
   handleInputBlur = () => {
-    const { dirtyDescription } = this.state;
+    const { dirtyDescription } = this.state
 
-    this.setState({ focused: false, dirtyDescription: null });
+    this.setState({ focused: false, dirtyDescription: null })
 
     if (dirtyDescription !== null) {
-      this.props.onDescriptionChange(this.props.media.get('id'), dirtyDescription);
+      this.props.onDescriptionChange(this.props.media.get('id'), dirtyDescription)
     }
   }
 
-  render () {
-    const { intl, media } = this.props;
-    const active          = this.state.hovered || this.state.focused;
-    const description     = this.state.dirtyDescription || (this.state.dirtyDescription !== '' && media.get('description')) || '';
-    const focusX = media.getIn(['meta', 'focus', 'x']);
-    const focusY = media.getIn(['meta', 'focus', 'y']);
-    const x = ((focusX /  2) + .5) * 100;
-    const y = ((focusY / -2) + .5) * 100;
+  render() {
+    const { intl, media } = this.props
+    const active = this.state.hovered || this.state.focused
+    const description = this.state.dirtyDescription || (this.state.dirtyDescription !== '' && media.get('description')) || ''
+    const focusX = media.getIn(['meta', 'focus', 'x'])
+    const focusY = media.getIn(['meta', 'focus', 'y'])
+    const x = ((focusX / 2) + .5) * 100
+    const y = ((focusY / -2) + .5) * 100
 
     return (
       <div className='compose-form-upload' tabIndex='0' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave} onClick={this.handleClick} role='button'>
@@ -100,13 +94,18 @@ class Upload extends ImmutablePureComponent {
           {({ scale }) => (
             <div className='compose-form__upload-thumbnail' style={{ transform: `scale(${scale})`, backgroundImage: `url(${media.get('preview_url')})`, backgroundPosition: `${x}% ${y}%` }}>
               <div className={classNames('compose-form__upload__actions', { active })}>
-                <button className='icon-button' title={intl.formatMessage(messages.delete)} onClick={this.handleUndoClick}><Icon id='times'/></button>
-                {media.get('type') === 'image' && <button className='icon-button' onClick={this.handleFocalPointClick}><Icon id='crosshairs' /> <FormattedMessage id='upload_form.focus' defaultMessage='Crop' /></button>}
+                <Button
+                  title={intl.formatMessage(messages.delete)}
+                  onClick={this.handleUndoClick}
+                  icon='cancel'
+                />
               </div>
 
               <div className={classNames('compose-form-upload__description', { active })}>
                 <label>
-                  <span style={{ display: 'none' }}>{intl.formatMessage(messages.description)}</span>
+                  <span style={{ display: 'none' }}>
+                    {intl.formatMessage(messages.description)}
+                  </span>
 
                   <textarea
                     placeholder={intl.formatMessage(messages.description)}
@@ -123,7 +122,7 @@ class Upload extends ImmutablePureComponent {
           )}
         </Motion>
       </div>
-    );
+    )
   }
 
 }