Fixed comments that were moved by jscodeshift

Author: jmkulwik

apps/src/applab/AppLabTooltipOverlay.jsx

@@ -1,6 +1,5 @@
-import $ from 'jquery';
-
 /** @file App Lab-specific Tooltip Overlay */
+import $ from 'jquery';
 import PropTypes from 'prop-types';
 import React from 'react';
 import TooltipOverlay, {coordinatesProvider} from '../templates/TooltipOverlay';

apps/src/applab/ImportScreensDialog.jsx

@@ -1,6 +1,5 @@
-import React from 'react';
-
 /* eslint-disable react/no-danger */
+import React from 'react';
 import PropTypes from 'prop-types';
 
 import Radium from 'radium';

apps/src/applab/ScreenSelector.jsx

@@ -1,8 +1,6 @@
-import React from 'react';
-
 /** @file Dropdown for selecting design mode screens */
 import PropTypes from 'prop-types';
-
+import React from 'react';
 import Radium from 'radium';
 import color from "../util/color";
 import commonStyles from '../commonStyles';

apps/src/code-studio/components/HiddenUploader.jsx

@@ -1,6 +1,5 @@
-import $ from 'jquery';
-
 /** @file Hidden file input with interface for handling uploads. */
+import $ from 'jquery';
 import PropTypes from 'prop-types';
 import React from 'react';
 import firehoseClient from "@cdo/apps/lib/util/firehose";

apps/src/code-studio/components/SmallFooter.jsx

@@ -1,7 +1,5 @@
-import $ from 'jquery';
-
 /* eslint-disable react/no-danger */
-
+import $ from 'jquery';
 import PropTypes from 'prop-types';
 import React from 'react';
 import debounce from 'lodash/debounce';

apps/src/code-studio/components/pairing/Pairing.jsx

@@ -1,7 +1,5 @@
-import $ from 'jquery';
-
 /* global $ */
-
+import $ from 'jquery';
 import PropTypes from 'prop-types';
 import React from 'react';
 import SectionSelector from './SectionSelector.jsx';

apps/src/code-studio/pd/workshop_dashboard/attendance/workshop_attendance.jsx

@@ -1,11 +1,9 @@
-import $ from 'jquery';
-
 /**
  * Display and edit attendance for a workshop.
  * It has a tab for each session which lists all enrolled teachers and their status.
  * Route: /workshops/:workshopId/attendance(/:sessionIndex)
  */
-
+import $ from 'jquery';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {connect} from 'react-redux';

apps/src/code-studio/pd/workshop_dashboard/components/session_form_part.jsx

@@ -1,10 +1,8 @@
-import _ from 'lodash';
-
 /**
  * Individual Session input for creating and editing workshops.
  * Sets date, startTime, and endTime for the session.
  */
-
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React from 'react';
 import moment from 'moment';

apps/src/code-studio/pd/workshop_dashboard/components/workshop_form.jsx

@@ -1,11 +1,9 @@
-import $ from 'jquery';
-
 /* global google */
 
 /**
  * Form for creating / editing workshop details.
  */
-
+import $ from 'jquery';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {connect} from 'react-redux';

apps/src/code-studio/pd/workshop_dashboard/components/workshop_table.jsx

@@ -1,9 +1,7 @@
-import _, { orderBy } from 'lodash';
-
 /**
  * Table displaying workshop summaries based on a supplied workshop query result.
  */
-
+import _, { orderBy } from 'lodash';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {Table, sort} from 'reactabular';

apps/src/gamelab/AnimationPicker/AnimationPickerBody.jsx

@@ -1,8 +1,6 @@
-import React from 'react';
-
 /** Body of the animation picker dialog */
 import PropTypes from 'prop-types';
-
+import React from 'react';
 import Radium from 'radium';
 import color from "../../util/color";
 import {AnimationCategories} from '../constants';

apps/src/gamelab/AnimationPicker/AnimationPickerListItem.jsx

@@ -1,8 +1,6 @@
-import React from 'react';
-
 /** @file A clickable item in the scroll area of the animation picker */
 import PropTypes from 'prop-types';
-
+import React from 'react';
 import Radium from 'radium';
 import color from "../../util/color";
 import {PlayBehavior} from '../constants';

apps/src/gamelab/AnimationTab/AnimationListItem.jsx

@@ -1,8 +1,6 @@
-import React from 'react';
-
 /** A single list item representing an animation. */
 import PropTypes from 'prop-types';
-
+import React from 'react';
 import Radium from 'radium';
 import {connect} from 'react-redux';
 import color from "../../util/color";

apps/src/gamelab/AnimationTab/AnimationTab.jsx

@@ -1,8 +1,6 @@
-import React from 'react';
-
 /** @file Root of the animation editor interface mode for GameLab */
 import PropTypes from 'prop-types';
-
+import React from 'react';
 import Radium from 'radium';
 import { connect } from 'react-redux';
 import color from "../../util/color";

apps/src/gamelab/AnimationTab/ScrollableList.jsx

@@ -1,8 +1,6 @@
-import React from 'react';
-
 /** @file Vertical scrolling list */
+import React from 'react';
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 
 const staticStyles = {

apps/src/gamelab/shapes.js

@@ -1,7 +1,5 @@
-import _ from 'lodash';
-
 /** @file Type definitions (React and otherwise) specific to Gamelab */
-
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 
 /**

apps/src/lib/kits/maker/ui/OverlayButton.jsx

@@ -1,6 +1,5 @@
-import React, { Component } from 'react';
-
 /** Button for use in Maker connection status overlays */
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 
 import Radium from 'radium';

apps/src/lib/ui/PopUpMenu.jsx

@@ -1,6 +1,5 @@
-import React, { Component, Children } from 'react';
-
 /** @file Pop-over menu component.  Combine with react-portal to use. */
+import React, { Component, Children } from 'react';
 import PropTypes from 'prop-types';
 
 import Radium from 'radium';

apps/src/lib/ui/SettingsCog.jsx

@@ -1,6 +1,5 @@
-import React, { Component } from 'react';
-
 /** @file Settings menu cog icon */
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 
 import Radium from 'radium';

apps/src/publicKeyCryptography/EqualColumns.jsx

@@ -1,8 +1,6 @@
-import React from 'react';
-
 /** @file Arranges child components as columns of equal width, filling available space */
 import PropTypes from 'prop-types';
-
+import React from 'react';
 import Radium from 'radium';
 import {AnyChildren} from './types';
 

apps/src/publicKeyCryptography/ModuloClock.jsx

@@ -1,6 +1,5 @@
-import _ from 'lodash';
-
 /** @file Centered animated Modulo Clock component for the Crypto widget levels */
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React from 'react';
 import color from "../util/color";

apps/src/publicKeyCryptography/ModuloClockWidget.jsx

@@ -1,6 +1,5 @@
-import _ from 'lodash';
-
 /** @file Root component for Modulo Clock widget */
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React from 'react';
 import color from "../util/color";

apps/src/publicKeyCryptography/cryptographyFields.jsx

@@ -1,6 +1,5 @@
-import _ from 'lodash';
-
 /** @file Input fields specific to the cryptography widget */
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React from 'react';
 import classNames from 'classnames';

apps/src/storage/dataBrowser/EditKeyRow.jsx

@@ -1,9 +1,6 @@
-import FirebaseStorage from '../firebaseStorage';
-
 /** @overview Component for editing a key/value pair row. */
-
+import FirebaseStorage from '../firebaseStorage';
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 import React from 'react';
 import PendingButton from '../../templates/PendingButton';

apps/src/templates/PaginationWrapper.jsx

@@ -1,6 +1,5 @@
-import React, { Component } from 'react';
-
 /** Pagination controls */
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 
 import Radium, {Style} from 'radium';

apps/src/templates/PaneHeader.jsx

@@ -1,13 +1,10 @@
-import React from 'react';
-
 /**
  * A collection of components for displaying the purple header used in a few
  * places in our apps. The parent component is a PaneHeader that can be toggled
  * as focused or not. We then have child components of PaneSection and PaneButton.
  */
-
+import React from 'react';
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 import commonStyles from '../commonStyles';
 import styleConstants from '../styleConstants';

apps/src/templates/PendingButton.jsx

@@ -1,9 +1,6 @@
-import FontAwesome from './FontAwesome';
-
 /** @overview a button which shows a spinner while an operation is pending */
-
+import FontAwesome from './FontAwesome';
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 import React from 'react';
 

apps/src/templates/ToggleButton.jsx

@@ -1,8 +1,6 @@
-import React, { Component } from 'react';
-
 /** @file Button that can be active or inactive, for use inside ToggleGroup */
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 import styles from './ToggleButtonStyles';
 

apps/src/templates/instructions/HeightResizer.jsx

@@ -1,13 +1,10 @@
-import React from 'react';
-
 /**
  * HeightResizer
  * A draggable, horizontal toolbar. As it is dragged, it calls back to onResize
  * which handles any movement.
  */
-
+import React from 'react';
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 import color from '../../util/color';
 import styleConstants from '../../styleConstants';

apps/src/templates/progress/ProgressBubbleSet.jsx

@@ -1,11 +1,8 @@
-import React from 'react';
-
 /**
  * An ordered set of progress bubbles.
  */
-
+import React from 'react';
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 import ProgressBubble from './ProgressBubble';
 import color from "@cdo/apps/util/color";