Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Move shared components to components directory
  • Loading branch information
aduth committed May 9, 2017
commit 96b8af6a950ddbf54a49d474da05d2b975aa34ec
4 changes: 2 additions & 2 deletions blocks/components/editable/format-toolbar.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* WordPress dependencies
*/
import IconButton from 'editor/components/icon-button';
import Toolbar from 'editor/components/toolbar';
import IconButton from 'components/icon-button';
import Toolbar from 'components/toolbar';

const FORMATTING_CONTROLS = [
{
Expand Down
2 changes: 1 addition & 1 deletion blocks/components/editable/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import 'element-closest';
/**
* WordPress dependencies
*/
import Toolbar from 'editor/components/toolbar';
import Toolbar from 'components/toolbar';

/**
* Internal dependencies
Expand Down
2 changes: 1 addition & 1 deletion blocks/library/button/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* WordPress dependencies
*/
import IconButton from 'editor/components/icon-button';
import IconButton from 'components/icon-button';

/**
* Internal dependencies
Expand Down
4 changes: 2 additions & 2 deletions blocks/library/embed/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* WordPress dependencies
*/
import Dashicon from 'editor/components/dashicon';
import Button from 'editor/components/button';
import Dashicon from 'components/dashicon';
import Button from 'components/button';

/**
* Internal dependencies
Expand Down
4 changes: 2 additions & 2 deletions blocks/library/image/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* WordPress dependencies
*/
import Dashicon from 'editor/components/dashicon';
import Button from 'editor/components/button';
import Dashicon from 'components/dashicon';
import Button from 'components/button';

/**
* Internal dependencies
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 5 additions & 1 deletion editor/components/block-mover/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@
import { connect } from 'react-redux';
import { first, last } from 'lodash';

/**
* WordPress dependencies
*/
import IconButton from 'components/icon-button';

/**
* Internal dependencies
*/
import './style.scss';
import IconButton from '../icon-button';

function BlockMover( { onMoveUp, onMoveDown, isFirst, isLast } ) {
return (
Expand Down
6 changes: 5 additions & 1 deletion editor/components/block-switcher/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ import { connect } from 'react-redux';
import { uniq, get, reduce } from 'lodash';
import clickOutside from 'react-click-outside';

/**
* WordPress dependencies
*/
import IconButton from 'components/icon-button';

/**
* Internal dependencies
*/
import './style.scss';
import IconButton from '../icon-button';

class BlockSwitcher extends wp.element.Component {
constructor() {
Expand Down
6 changes: 5 additions & 1 deletion editor/components/inserter/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
*/
import clickOutside from 'react-click-outside';

/**
* WordPress dependencies
*/
import IconButton from 'components/icon-button';

/**
* Internal dependencies
*/
import InserterMenu from './menu';
import IconButton from '../icon-button';

class Inserter extends wp.element.Component {
constructor() {
Expand Down
6 changes: 5 additions & 1 deletion editor/components/inserter/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@
import { connect } from 'react-redux';
import { flow } from 'lodash';

/**
* WordPress dependencies
*/
import Dashicon from 'components/dashicon';

/**
* Internal dependencies
*/
import './style.scss';
import Dashicon from '../dashicon';

class InserterMenu extends wp.element.Component {
constructor() {
Expand Down
6 changes: 5 additions & 1 deletion editor/header/mode-switcher/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
*/
import { connect } from 'react-redux';

/**
* WordPress dependencies
*/
import Dashicon from 'components/dashicon';

/**
* Internal dependencies
*/
import './style.scss';
import Dashicon from '../../components/dashicon';

/**
* Set of available mode options.
Expand Down
6 changes: 5 additions & 1 deletion editor/header/saved-state/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@
import { connect } from 'react-redux';
import classNames from 'classnames';

/**
* WordPress dependencies
*/
import Dashicon from 'components/dashicon';

/**
* Internal dependencies
*/
import './style.scss';
import Dashicon from '../../components/dashicon';

function SavedState( { isDirty } ) {
const classes = classNames( 'editor-saved-state', {
Expand Down
10 changes: 7 additions & 3 deletions editor/header/tools/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@
*/
import { connect } from 'react-redux';

/**
* WordPress dependencies
*/
import Dashicon from 'components/dashicon';
import IconButton from 'components/icon-button';
import Button from 'components/button';

/**
* Internal dependencies
*/
import './style.scss';
import Dashicon from '../../components/dashicon';
import IconButton from '../../components/icon-button';
import Inserter from '../../components/inserter';
import Button from '../../components/button';
import PublishButton from './publish-button';

function Tools( { undo, redo, hasUndo, hasRedo, isSidebarOpened, toggleSidebar } ) {
Expand Down
6 changes: 5 additions & 1 deletion editor/header/tools/publish-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@
*/
import { connect } from 'react-redux';

/**
* WordPress dependencies
*/
import Button from 'components/button';

/**
* Internal dependencies
*/
import Button from '../../components/button';
import { savePost } from '../../actions';

function PublishButton( {
Expand Down
6 changes: 5 additions & 1 deletion editor/modes/visual-editor/block.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ import classnames from 'classnames';
import { Slot } from 'react-slot-fill';
import { partial } from 'lodash';

/**
* WordPress dependencies
*/
import Toolbar from 'components/toolbar';

/**
* Internal dependencies
*/
import Toolbar from '../../components/toolbar';
import BlockMover from '../../components/block-mover';
import BlockSwitcher from '../../components/block-switcher';

Expand Down