Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Themes: Move themes/helpers from lib/ to my-sites/ #3055

Merged
merged 1 commit into from
Feb 10, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { domainManagementEdit } from 'my-sites/upgrades/paths';
import { googleAppsSettingsUrl } from 'lib/google-apps';
import Gridicon from 'components/gridicon';
import { isBusiness, isGoogleApps, isPlan, isTheme } from 'lib/products-values';
import { getDetailsUrl as getThemeDetailsUrl } from 'lib/themes/helpers';
import { getDetailsUrl as getThemeDetailsUrl } from 'my-sites/themes/helpers';

const CancelPurchaseProductInformation = React.createClass( {
propTypes: {
Expand Down
2 changes: 1 addition & 1 deletion client/me/purchases/manage-purchase/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import HeaderCake from 'components/header-cake';
import Main from 'components/main';
import Notice from 'components/notice';
import NoticeAction from 'components/notice/notice-action';
import { getDetailsUrl as getThemeDetailsUrl } from 'lib/themes/helpers';
import { getDetailsUrl as getThemeDetailsUrl } from 'my-sites/themes/helpers';
import paths from '../paths';
import PaymentLogo from 'components/payment-logo';
import RemovePurchase from '../remove-purchase';
Expand Down
2 changes: 1 addition & 1 deletion client/my-sites/customize/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var Dispatcher = require( 'dispatcher' ),
page = require( 'page' ),
wpcom = require( 'lib/wp' ),
CartActions = require( 'lib/upgrades/actions' ),
ThemeHelper = require( 'lib/themes/helpers' ),
ThemeHelper = require( '../themes/helpers' ),
themeItem = require( 'lib/cart-values/cart-items' ).themeItem;

var CustomizeActions = {
Expand Down
2 changes: 1 addition & 1 deletion client/my-sites/sidebar/sidebar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var config = require( 'config' ),
PublishMenu = require( './publish-menu' ),
SiteStatsStickyLink = require( 'components/site-stats-sticky-link' ),
productsValues = require( 'lib/products-values' ),
getCustomizeUrl = require( 'lib/themes/helpers' ).getCustomizeUrl,
getCustomizeUrl = require( '../themes/helpers' ).getCustomizeUrl,
AdsUtils = require( 'lib/ads/utils' ),
Gridicon = require( 'components/gridicon' ),
Sidebar = require( 'layout/sidebar' ),
Expand Down
2 changes: 1 addition & 1 deletion client/my-sites/themes/current-theme/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var React = require( 'react' ),
* Internal dependencies
*/
var Card = require( 'components/card' ),
Helpers = require( 'lib/themes/helpers' ),
Helpers = require( '../helpers' ),
CurrentThemeButton = require( './button' );

/**
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion client/my-sites/themes/logged-out.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var Main = require( 'components/main' ),
Action = require( 'state/themes/actions' ),
ThemePreview = require( './theme-preview' ),
ThemesSelection = require( './themes-selection' ),
ThemeHelpers = require( 'lib/themes/helpers' ),
ThemeHelpers = require( './helpers' ),
actionLabels = require( './action-labels' ),
ThemesListSelectors = require( 'state/themes/themes-list/selectors' );

Expand Down
2 changes: 1 addition & 1 deletion client/my-sites/themes/multi-site.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var Main = require( 'components/main' ),
SidebarNavigation = require( 'my-sites/sidebar-navigation' ),
ThemesSiteSelectorModal = require( './themes-site-selector-modal' ),
ThemesSelection = require( './themes-selection' ),
ThemeHelpers = require( 'lib/themes/helpers' ),
ThemeHelpers = require( './helpers' ),
actionLabels = require( './action-labels' ),
ThemesListSelectors = require( 'state/themes/themes-list/selectors' ),
config = require( 'config' );
Expand Down
2 changes: 1 addition & 1 deletion client/my-sites/themes/single-site.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var Main = require( 'components/main' ),
JetpackUpgradeMessage = require( './jetpack-upgrade-message' ),
JetpackManageDisabledMessage = require( './jetpack-manage-disabled-message' ),
ThemesSelection = require( './themes-selection' ),
ThemeHelpers = require( 'lib/themes/helpers' ),
ThemeHelpers = require( './helpers' ),
actionLabels = require( './action-labels' ),
ThemesListSelectors = require( 'state/themes/themes-list/selectors' ),
getSelectedSite = require( 'state/ui/selectors' ).getSelectedSite;
Expand Down
2 changes: 1 addition & 1 deletion client/my-sites/themes/thanks-modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var React = require( 'react' );
*/
var Dialog = require( 'components/dialog' ),
PulsingDot = require( 'components/pulsing-dot' ),
Helpers = require( 'lib/themes/helpers' );
Helpers = require( './helpers' );

var ThanksModal = React.createClass( {
trackClick: Helpers.trackClick.bind( null, 'current theme' ),
Expand Down
2 changes: 1 addition & 1 deletion client/my-sites/themes/theme-preview.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import React from 'react';
*/
import WebPreview from 'components/web-preview';
import Button from 'components/button';
import { getPreviewUrl } from 'lib/themes/helpers';
import { getPreviewUrl } from './helpers';

export default React.createClass( {
displayName: 'ThemePreview',
Expand Down
2 changes: 1 addition & 1 deletion client/my-sites/themes/themes-search-card/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var Search = require( 'components/search' ),
SectionNav = require( 'components/section-nav' ),
NavTabs = require( 'components/section-nav/tabs' ),
NavItem = require( 'components/section-nav/item' ),
Helper = require( 'lib/themes/helpers' ),
Helper = require( '../helpers' ),
config = require( 'config' ),
isMobile = require( 'lib/viewport' ).isMobile;

Expand Down
2 changes: 1 addition & 1 deletion client/my-sites/themes/themes-selection.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import page from 'page';
/**
* Internal dependencies
*/
import Helper from 'lib/themes/helpers';
import Helper from './helpers';
import ThemesSearchCard from './themes-search-card';
import ThemesData from 'components/data/themes-list-fetcher';
import ThemesList from 'components/themes-list';
Expand Down
2 changes: 1 addition & 1 deletion client/my-sites/themes/themes-site-selector-modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import defer from 'lodash/function/defer';
*/
import Theme from 'components/theme';
import SiteSelectorModal from 'components/site-selector-modal';
import Helper from 'lib/themes/helpers';
import Helper from './helpers';

const ThemesSiteSelectorModal = React.createClass( {
propTypes: {
Expand Down
2 changes: 1 addition & 1 deletion client/state/themes/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const debug = debugFactory( 'calypso:themes:actions' ); //eslint-disable-line no
* Internal dependencies
*/
import ActionTypes from './action-types';
import ThemeHelpers from 'lib/themes/helpers';
import ThemeHelpers from 'my-sites/themes/helpers';
import { getCurrentTheme } from './current-theme/selectors';
import { isJetpack } from './themes-last-query/selectors';
import { getQueryParams } from './themes-list/selectors';
Expand Down