sforkowany z mirror/soapbox
Merge branch 'gabsocial' into 'master'
gabsocial --> soapbox paths See merge request soapbox-pub/soapbox-fe!34stable/1.0.x
Alex Gleason
commit
14f673cf7f
|
|
@ -194,7 +194,7 @@ module.exports = {
|
|||
{
|
||||
devDependencies: [
|
||||
'webpack/**',
|
||||
'app/gabsocial/test_setup.js',
|
||||
'app/soapbox/test_setup.js',
|
||||
'app/**/__tests__/**',
|
||||
],
|
||||
},
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
files:
|
||||
include: app/styles/**/*.scss
|
||||
ignore:
|
||||
- app/styles/gabsocial/reset.scss
|
||||
- app/styles/soapbox/reset.scss
|
||||
|
||||
rules:
|
||||
# Disallows
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@
|
|||
</head>
|
||||
<body class="app-body">
|
||||
<noscript>To use Soapbox, please enable JavaScript.</noscript>
|
||||
<div class="app-holder" id="gabsocial"></div>
|
||||
<div class="app-holder" id="soapbox"></div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
'use strict';
|
||||
|
||||
import loadPolyfills from '../gabsocial/load_polyfills';
|
||||
import { start } from '../gabsocial/common';
|
||||
import loadPolyfills from '../soapbox/load_polyfills';
|
||||
import { start } from '../soapbox/common';
|
||||
|
||||
start();
|
||||
|
||||
function loaded() {
|
||||
const TimelineContainer = require('../gabsocial/containers/timeline_container').default;
|
||||
const TimelineContainer = require('../soapbox/containers/timeline_container').default;
|
||||
const React = require('react');
|
||||
const ReactDOM = require('react-dom');
|
||||
const mountNode = document.getElementById('gabsocial-timeline');
|
||||
const mountNode = document.getElementById('soapbox-timeline');
|
||||
|
||||
if (mountNode !== null) {
|
||||
const props = JSON.parse(mountNode.getAttribute('data-props'));
|
||||
|
|
@ -18,7 +18,7 @@ function loaded() {
|
|||
}
|
||||
|
||||
function main() {
|
||||
const ready = require('../gabsocial/ready').default;
|
||||
const ready = require('../soapbox/ready').default;
|
||||
ready(loaded);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
import loadPolyfills from '../gabsocial/load_polyfills';
|
||||
import { start } from '../gabsocial/common';
|
||||
import loadPolyfills from '../soapbox/load_polyfills';
|
||||
import { start } from '../soapbox/common';
|
||||
|
||||
start();
|
||||
|
||||
loadPolyfills().then(() => {
|
||||
require('../gabsocial/main').default();
|
||||
require('../soapbox/main').default();
|
||||
}).catch(e => {
|
||||
console.error(e);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
'use strict';
|
||||
|
||||
import escapeTextContentForBrowser from 'escape-html';
|
||||
import loadPolyfills from '../gabsocial/load_polyfills';
|
||||
import ready from '../gabsocial/ready';
|
||||
import { start } from '../gabsocial/common';
|
||||
import loadPolyfills from '../soapbox/load_polyfills';
|
||||
import ready from '../soapbox/ready';
|
||||
import { start } from '../soapbox/common';
|
||||
|
||||
start();
|
||||
|
||||
|
|
@ -26,10 +26,10 @@ window.addEventListener('message', e => {
|
|||
function main() {
|
||||
const IntlMessageFormat = require('intl-messageformat').default;
|
||||
import('intl-pluralrules'); // eslint-disable-line
|
||||
const { timeAgoString } = require('../gabsocial/components/relative_timestamp');
|
||||
const { timeAgoString } = require('../soapbox/components/relative_timestamp');
|
||||
const { delegate } = require('rails-ujs');
|
||||
const emojify = require('../gabsocial/features/emoji/emoji').default;
|
||||
const { getLocale } = require('../gabsocial/locales');
|
||||
const emojify = require('../soapbox/features/emoji/emoji').default;
|
||||
const { getLocale } = require('../soapbox/locales');
|
||||
const { messages } = getLocale();
|
||||
//(Rjc) 2019-05-24 defined but never used
|
||||
// const React = require('react');
|
||||
|
|
@ -85,7 +85,7 @@ function main() {
|
|||
const reactComponents = document.querySelectorAll('[data-component]');
|
||||
|
||||
if (reactComponents.length > 0) {
|
||||
import(/* webpackChunkName: "containers/media_container" */ '../gabsocial/containers/media_container')
|
||||
import(/* webpackChunkName: "containers/media_container" */ '../soapbox/containers/media_container')
|
||||
.then(({ default: MediaContainer }) => {
|
||||
[].forEach.call(reactComponents, (component) => {
|
||||
[].forEach.call(component.children, (child) => {
|
||||
|
|
@ -155,7 +155,7 @@ function main() {
|
|||
href = e.target.href;
|
||||
}
|
||||
|
||||
window.open(href, 'gabsocial-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
|
||||
window.open(href, 'soapbox-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
|
||||
});
|
||||
|
||||
delegate(document, '#account_display_name', 'input', ({ target }) => {
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
'use strict';
|
||||
|
||||
import loadPolyfills from '../gabsocial/load_polyfills';
|
||||
import { start } from '../gabsocial/common';
|
||||
import loadPolyfills from '../soapbox/load_polyfills';
|
||||
import { start } from '../soapbox/common';
|
||||
|
||||
start();
|
||||
|
||||
function loaded() {
|
||||
const ComposeContainer = require('../gabsocial/containers/compose_container').default;
|
||||
const ComposeContainer = require('../soapbox/containers/compose_container').default;
|
||||
const React = require('react');
|
||||
const ReactDOM = require('react-dom');
|
||||
const mountNode = document.getElementById('gabsocial-compose');
|
||||
const mountNode = document.getElementById('soapbox-compose');
|
||||
|
||||
if (mountNode !== null) {
|
||||
const props = JSON.parse(mountNode.getAttribute('data-props'));
|
||||
|
|
@ -18,7 +18,7 @@ function loaded() {
|
|||
}
|
||||
|
||||
function main() {
|
||||
const ready = require('../gabsocial/ready').default;
|
||||
const ready = require('../soapbox/ready').default;
|
||||
ready(loaded);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import api from '../api';
|
||||
import { showAlert, showAlertForError } from 'gabsocial/actions/alerts';
|
||||
import { fetchMe } from 'gabsocial/actions/me';
|
||||
import { showAlert, showAlertForError } from 'soapbox/actions/alerts';
|
||||
import { fetchMe } from 'soapbox/actions/me';
|
||||
|
||||
export const AUTH_APP_CREATED = 'AUTH_APP_CREATED';
|
||||
export const AUTH_APP_AUTHORIZED = 'AUTH_APP_AUTHORIZED';
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
import { debounce } from 'lodash';
|
||||
import { showAlertForError } from './alerts';
|
||||
import { patchMe } from 'gabsocial/actions/me';
|
||||
import { patchMe } from 'soapbox/actions/me';
|
||||
import { Map as ImmutableMap } from 'immutable';
|
||||
|
||||
export const SETTING_CHANGE = 'SETTING_CHANGE';
|
||||
|
|
@ -2,7 +2,7 @@ import React from 'react';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import PropTypes from 'prop-types';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import Icon from 'gabsocial/components/icon';
|
||||
import Icon from 'soapbox/components/icon';
|
||||
|
||||
const filename = url => url.split('/').pop().split('#')[0].split('?')[0];
|
||||
|
||||
|
|
@ -2,7 +2,7 @@ import React from 'react';
|
|||
import { connect } from 'react-redux';
|
||||
import PropTypes from 'prop-types';
|
||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import { getSettings } from 'gabsocial/actions/settings';
|
||||
import { getSettings } from 'soapbox/actions/settings';
|
||||
|
||||
const mapStateToProps = state => ({
|
||||
animate: getSettings(state).get('autoPlayGif'),
|
||||
|
|
@ -2,7 +2,7 @@ import React from 'react';
|
|||
import { connect } from 'react-redux';
|
||||
import PropTypes from 'prop-types';
|
||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import { getSettings } from 'gabsocial/actions/settings';
|
||||
import { getSettings } from 'soapbox/actions/settings';
|
||||
|
||||
const mapStateToProps = state => ({
|
||||
animate: getSettings(state).get('autoPlayGif'),
|
||||
|
|
@ -2,7 +2,7 @@ import React from 'react';
|
|||
import { connect } from 'react-redux';
|
||||
import PropTypes from 'prop-types';
|
||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import { getSettings } from 'gabsocial/actions/settings';
|
||||
import { getSettings } from 'soapbox/actions/settings';
|
||||
|
||||
const mapStateToProps = state => ({
|
||||
animate: getSettings(state).get('autoPlayGif'),
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
import React from 'react';
|
||||
import { FormattedMessage } from 'react-intl';
|
||||
import PropTypes from 'prop-types';
|
||||
import Icon from 'gabsocial/components/icon';
|
||||
import Icon from 'soapbox/components/icon';
|
||||
|
||||
export default class ColumnBackButton extends React.PureComponent {
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
import React from 'react';
|
||||
import { FormattedMessage } from 'react-intl';
|
||||
import ColumnBackButton from './column_back_button';
|
||||
import Icon from 'gabsocial/components/icon';
|
||||
import Icon from 'soapbox/components/icon';
|
||||
|
||||
export default class ColumnBackButtonSlim extends ColumnBackButton {
|
||||
|
||||
|
|
@ -4,7 +4,7 @@ import React from 'react';
|
|||
import PropTypes from 'prop-types';
|
||||
import classNames from 'classnames';
|
||||
import { injectIntl, defineMessages } from 'react-intl';
|
||||
import Icon from 'gabsocial/components/icon';
|
||||
import Icon from 'soapbox/components/icon';
|
||||
|
||||
const messages = defineMessages({
|
||||
show: { id: 'column_header.show_settings', defaultMessage: 'Show settings' },
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { ALLOWED_EMOJI } from 'gabsocial/utils/emoji_reacts';
|
||||
import emojify from 'gabsocial/features/emoji/emoji';
|
||||
import { ALLOWED_EMOJI } from 'soapbox/utils/emoji_reacts';
|
||||
import emojify from 'soapbox/features/emoji/emoji';
|
||||
import classNames from 'classnames';
|
||||
|
||||
export default class EmojiSelector extends React.Component {
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { isIOS } from 'gabsocial/is_mobile';
|
||||
import { isIOS } from 'soapbox/is_mobile';
|
||||
|
||||
export default class ExtendedVideoPlayer extends React.PureComponent {
|
||||
|
||||
|
|
@ -7,8 +7,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import classNames from 'classnames';
|
||||
import { injectIntl, defineMessages } from 'react-intl';
|
||||
import { Link } from 'react-router-dom';
|
||||
import Icon from 'gabsocial/components/icon';
|
||||
import { fetchLists } from 'gabsocial/actions/lists';
|
||||
import Icon from 'soapbox/components/icon';
|
||||
import { fetchLists } from 'soapbox/actions/lists';
|
||||
import { createSelector } from 'reselect';
|
||||
|
||||
const messages = defineMessages({
|
||||
|
|
@ -3,8 +3,8 @@ import Motion from '../features/ui/util/optional_motion';
|
|||
import spring from 'react-motion/lib/spring';
|
||||
import PropTypes from 'prop-types';
|
||||
import classNames from 'classnames';
|
||||
import Icon from 'gabsocial/components/icon';
|
||||
import emojify from 'gabsocial/features/emoji/emoji';
|
||||
import Icon from 'soapbox/components/icon';
|
||||
import emojify from 'soapbox/features/emoji/emoji';
|
||||
|
||||
export default class IconButton extends React.PureComponent {
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { shortNumberFormat } from 'gabsocial/utils/numbers';
|
||||
import { shortNumberFormat } from 'soapbox/utils/numbers';
|
||||
|
||||
const IconWithBadge = ({ id, count, className }) => {
|
||||
if (count < 1) return null;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { injectIntl, defineMessages } from 'react-intl';
|
||||
import Icon from 'gabsocial/components/icon';
|
||||
import Icon from 'soapbox/components/icon';
|
||||
|
||||
const messages = defineMessages({
|
||||
load_more: { id: 'status.load_more', defaultMessage: 'Load more' },
|
||||
Some files were not shown because too many files have changed in this diff Show More
Ładowanie…
Reference in New Issue