conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
.then((credentials) => {
const seed = getSeed(credentials.data, seedIndex);
=======
.then(credentials => {
const seed = getSeed(credentials.data, 0);
>>>>>>>
.then(credentials => {
const seed = getSeed(credentials.data, seedIndex); |
<<<<<<<
onQRRead={(data) => this.onQRRead(data)}
hideModal={() => this._hideModal()}
backgroundColor={THEMES.getHSL(backgroundColor)}
=======
onQRRead={data => this.onQRRead(data)}
hideModal={() => this.hideModal()}
backgroundColor={backgroundColor}
>>>>>>>
onQRRead={(data) => this.onQRRead(data)}
hideModal={() => this.hideModal()}
backgroundColor={backgroundColor}
<<<<<<<
hideModal={(callback) => this._hideModal(callback)}
backgroundColor={THEMES.getHSL(backgroundColor)}
=======
hideModal={callback => this.hideModal(callback)}
backgroundColor={backgroundColor}
>>>>>>>
hideModal={(callback) => this.hideModal(callback)}
backgroundColor={backgroundColor}
<<<<<<<
onChangeText={(text) => this.props.setSendAddressField(text.toUpperCase())}
=======
onChangeText={text => this.props.setSendAddressField(text)}
>>>>>>>
onChangeText={(text) => this.props.setSendAddressField(text)}
<<<<<<<
onDenominationPress={(event) => this.onDenominationPress()}
=======
onDenominationPress={() => this.onDenominationPress()}
>>>>>>>
onDenominationPress={() => this.onDenominationPress()}
<<<<<<<
<TouchableOpacity onPress={(event) => this.onMaxPress()}>
=======
<TouchableOpacity onPress={() => this.onMaxPress()}>
>>>>>>>
<TouchableOpacity onPress={() => this.onMaxPress()}>
<<<<<<<
const styles = StyleSheet.create({
container: {
flex: 1,
justifyContent: 'center',
},
activityIndicator: {
flex: 1,
justifyContent: 'center',
alignItems: 'center',
height: height / 5,
},
topContainer: {
flex: 3.6,
justifyContent: 'flex-start',
alignItems: 'center',
},
bottomContainer: {
flex: 2.1,
justifyContent: 'flex-start',
alignItems: 'center',
},
fieldContainer: {
alignItems: 'center',
justifyContent: 'flex-start',
flex: 0.7,
},
maxContainer: {
justifyContent: 'flex-start',
alignItems: 'flex-end',
width: width / 1.2,
paddingRight: 1,
flex: 0.8,
},
messageFieldContainer: {
flex: 0.7,
justifyContent: 'flex-start',
alignItems: 'center',
},
conversionText: {
fontFamily: 'Lato-Light',
backgroundColor: 'transparent',
position: 'absolute',
bottom: height / 10.2,
right: width / 7.8,
},
maxButtonText: {
fontFamily: 'Lato-Regular',
fontSize: width / 31.8,
backgroundColor: 'transparent',
marginRight: width / 50,
},
infoText: {
fontFamily: 'Lato-Regular',
fontSize: width / 29.6,
textAlign: 'center',
backgroundColor: 'transparent',
},
infoIcon: {
width: width / 25,
height: width / 25,
marginRight: width / 60,
},
info: {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'center',
},
});
const mapStateToProps = (state) => ({
=======
const mapStateToProps = state => ({
>>>>>>>
const mapStateToProps = (state) => ({ |
<<<<<<<
import { assert } from 'ember-data/-debug';
import cloneNull from "./clone-null";
=======
import { assert } from '@ember/debug';
>>>>>>>
import cloneNull from "./clone-null";
import { assert } from '@ember/debug'; |
<<<<<<<
import { getNewAddress, formatAddressData, syncAddresses } from '../libs/iota/addresses';
import { DEFAULT_MIN_WEIGHT_MAGNITUDE, DEFAULT_DEPTH } from '../config';
=======
import { setActiveStepIndex, startTrackingProgress, reset as resetProgress } from '../actions/progress';
import {
getNewAddress,
syncAddresses,
getLatestAddress,
accumulateBalance,
attachAndFormatAddress,
} from '../libs/iota/addresses';
>>>>>>>
import { setActiveStepIndex, startTrackingProgress, reset as resetProgress } from '../actions/progress';
import { accumulateBalance, attachAndFormatAddress, getNewAddress, syncAddresses } from '../libs/iota/addresses'; |
<<<<<<<
import { translate } from 'react-i18next';
import { Navigation } from 'react-native-navigation';
=======
import { withNamespaces } from 'react-i18next';
>>>>>>>
import { withNamespaces } from 'react-i18next';
import { Navigation } from 'react-native-navigation';
<<<<<<<
import i18next from 'i18next';
import SingleFooterButton from 'ui/components/SingleFooterButton';
import { Styling } from 'ui/theme/general';
=======
import i18next from 'shared-modules/libs/i18next';
import Button from 'ui/components/Button';
import GENERAL from 'ui/theme/general';
>>>>>>>
import i18next from 'shared-modules/libs/i18next';
import SingleFooterButton from 'ui/components/SingleFooterButton';
import { Styling } from 'ui/theme/general'; |
<<<<<<<
app.use(webpackDevMiddleware(compiler, {
noInfo: false,
publicPath: config.output.publicPath,
stats: {
colors: true
}
}));
=======
app.use(
webpackDevMiddleware(compiler, {
noInfo: false,
publicPath: config.output.publicPath
})
);
>>>>>>>
app.use(
webpackDevMiddleware(compiler, {
noInfo: false,
publicPath: config.output.publicPath,
stats: {
colors: true
}
})
); |
<<<<<<<
import Modal from 'ui/components/modal/Modal';
import { connect } from 'react-redux';
=======
import Confirm from 'ui/components/modal/Confirm';
>>>>>>>
import Confirm from 'ui/components/modal/Confirm';
<<<<<<<
deepLinkAmount: PropTypes.object.isRequired,
/** Current seed state value */
seeds: PropTypes.object.isRequired,
=======
/** Current seed value */
seed: PropTypes.string.isRequired,
>>>>>>>
/** Current seed value */
deepLinkAmount: PropTypes.object.isRequired,
seed: PropTypes.string.isRequired,
<<<<<<<
<form onSubmit={this.validateInputs}>
<Modal
variant="confirm"
isOpen={isModalVisible}
onClose={() => this.setState({ isModalVisible: false })}
>
<h1>
You are about to send <strong>{`${formatValue(amount)} ${formatUnit(amount)}`}</strong> to the
address: <br />
<strong>{address}</strong>
</h1>
<Button onClick={() => this.setState({ isModalVisible: false })} variant="secondary">
{t('global:no')}
</Button>
<Button onClick={this.confirmTransfer} variant="primary">
{t('global:yes')}
</Button>
</Modal>
<AddressInput
address={address}
onChange={(value) => this.setState({ address: value })}
label={t('send:recipientAddress')}
closeLabel={t('global:back')}
/>
<AmountInput
amount={amount.toString()}
settings={settings}
label={t('send:amount')}
labelMax={t('send:max')}
balance={balance}
onChange={(value) => this.setState({ amount: value })}
/>
<MessageInput
message={message}
label={t('send:message')}
onChange={(value) => this.setState({ message: value })}
/>
<fieldset>
<Button onClick={() => this.setState({ isModalVisible: true })} loading={isSending} className="outline" variant="primary">
{t('send:send')}
</Button>
</fieldset>
</form>
=======
<form onSubmit={(e) => this.validateInputs(e)}>
<Confirm
category="primary"
isOpen={isModalVisible}
onCancel={() => this.setState({ isModalVisible: false })}
onConfirm={() => this.confirmTransfer()}
content={{
title: `You are about to send ${formatValue(amount)} ${formatUnit(amount)} to the address`,
message: address,
confirm: 'confirm',
cancel: 'Cancel',
}}
/>
<AddressInput
address={address}
onChange={(value) => this.setState({ address: value })}
label={t('send:recipientAddress')}
closeLabel={t('global:back')}
/>
<AmountInput
amount={amount.toString()}
settings={settings}
label={t('send:amount')}
labelMax={t('send:max')}
balance={balance}
onChange={(value) => this.setState({ amount: value })}
/>
<MessageInput
message={message}
label={t('send:message')}
onChange={(value) => this.setState({ message: value })}
/>
<fieldset>
<Button type="submit" loading={isSending} className="outline" variant="primary">
{t('send:send')}
</Button>
</fieldset>
</form>
>>>>>>>
<form onSubmit={(e) => this.validateInputs(e)}>
<Confirm
category="primary"
isOpen={isModalVisible}
onCancel={() => this.setState({ isModalVisible: false })}
onConfirm={() => this.confirmTransfer()}
content={{
title: `You are about to send ${formatValue(amount)} ${formatUnit(amount)} to the address`,
message: address,
confirm: 'confirm',
cancel: 'Cancel',
}}
/>
<AddressInput
address={address}
onChange={(value) => this.setState({ address: value })}
label={t('send:recipientAddress')}
closeLabel={t('global:back')}
/>
<AmountInput
amount={amount.toString()}
settings={settings}
label={t('send:amount')}
labelMax={t('send:max')}
balance={balance}
onChange={(value) => this.setState({ amount: value })}
/>
<MessageInput
message={message}
label={t('send:message')}
onChange={(value) => this.setState({ message: value })}
/>
<fieldset>
<Button type="submit" loading={isSending} className="outline" variant="primary">
{t('send:send')}
</Button>
</fieldset>
</form> |
<<<<<<<
seedCount: state.accounts.accountNames.length,
=======
seedCount: state.account.accountNames.length,
isGenerated: state.seeds.isGenerated,
>>>>>>>
seedCount: state.accounts.accountNames.length,
isGenerated: state.seeds.isGenerated, |
<<<<<<<
import { clearIOTA } from '../../shared/actions/iotaActions';
import store from '../../shared/store';
import { persistStore } from 'redux-persist';
import Modal from 'react-native-modal';
import AddNewSeedModal from '../components/addNewSeedModal';
=======
import { logoutFromWallet } from '../../shared/actions/app';
>>>>>>>
import { clearIOTA } from '../../shared/actions/iotaActions';
import store from '../../shared/store';
import { persistStore } from 'redux-persist';
import Modal from 'react-native-modal';
import AddNewSeedModal from '../components/addNewSeedModal';
import { logoutFromWallet } from '../../shared/actions/app';
<<<<<<<
<TouchableOpacity onPress={event => this.onChangePasswordPress()}>
<View style={styles.item}>
=======
<TouchableOpacity onPress={this.onChangePasswordPress}>
<View style={styles.dividingItem}>
>>>>>>>
<TouchableOpacity onPress={event => this.onChangePasswordPress()}>
<View style={styles.item}> |
<<<<<<<
import { withNamespaces } from 'react-i18next';
import { getSelectedAccountName } from 'shared-modules/selectors/accounts';
=======
import { translate } from 'react-i18next';
import {
getAccountNamesFromState,
getSelectedAccountName,
getSelectedAccountType,
} from 'shared-modules/selectors/accounts';
>>>>>>>
import { withNamespaces } from 'react-i18next';
import {
getAccountNamesFromState,
getSelectedAccountName,
getSelectedAccountType,
} from 'shared-modules/selectors/accounts'; |
<<<<<<<
import FingerprintScanner from 'react-native-fingerprint-scanner';
import THEMES from '../theme/themes';
=======
>>>>>>>
import FingerprintScanner from 'react-native-fingerprint-scanner'; |
<<<<<<<
transfers: PropTypes.object.isRequired,
/** @ignore */
=======
transfers: PropTypes.array.isRequired,
/** Create a notification message
* @param {string} type - notification type - success, error
* @param {string} title - notification title
* @param {string} text - notification explanation
* @ignore
*/
generateAlert: PropTypes.func.isRequired,
>>>>>>>
transfers: PropTypes.array.isRequired,
/** @ignore */ |
<<<<<<<
<Template>
<Main>
=======
<Template headline={t('title')}>
<Content>
>>>>>>>
<Template>
<Content>
<<<<<<<
<SeedGenerator seed={seed} onUpdatedSeed={this.onUpdatedSeed} />
<p>{this.state.seed ? t('newSeedSetup:individualLetters') : '\u00A0'}</p>
</Main>
=======
<div className={css.seedGenerator}>
<SeedGenerator seed={seed} onUpdatedSeed={this.onUpdatedSeed} />
</div>
<p>{t('text1')}</p>
</Content>
>>>>>>>
<SeedGenerator seed={seed} onUpdatedSeed={this.onUpdatedSeed} />
<p>{this.state.seed ? t('newSeedSetup:individualLetters') : '\u00A0'}</p>
</Content> |
<<<<<<<
import merge from 'lodash/merge';
import pickBy from 'lodash/pickBy';
=======
>>>>>>>
import pickBy from 'lodash/pickBy'; |
<<<<<<<
const isValid = this.isValidAddress(address);
const dropdown = DropdownHolder.getDropdown();
=======
const addressIsValid = this.isValidAddress(address);
const tagIsValid = this.isValidTag(tag);
const messageIsValid = this.isValidMessage(message);
>>>>>>>
const dropdown = DropdownHolder.getDropdown();
const addressIsValid = this.isValidAddress(address);
const tagIsValid = this.isValidTag(tag);
const messageIsValid = this.isValidMessage(message);
<<<<<<<
if (sendTransaction(seed.seed, address, value, message) == false) {
dropdown.alertWithType(
=======
if (sendTransaction(seed.seed, address, value, tag, message) == false) {
this.dropdown.alertWithType(
>>>>>>>
if (sendTransaction(seed.seed, address, value, message) == false) {
dropdown.alertWithType( |
<<<<<<<
navStack: PropTypes.array,
=======
currentRoute: PropTypes.string.isRequired,
/** @ignore */
forceUpdate: PropTypes.bool.isRequired,
/** @ignore */
shouldUpdate: PropTypes.bool.isRequired,
>>>>>>>
navStack: PropTypes.array,
/** @ignore */
forceUpdate: PropTypes.bool.isRequired,
/** @ignore */
shouldUpdate: PropTypes.bool.isRequired,
<<<<<<<
const { onRef, theme: { positive, negative }, navStack, dismissAlert } = this.props;
=======
const { onRef, theme: { positive, negative }, currentRoute, dismissAlert, forceUpdate } = this.props;
>>>>>>>
const { onRef, theme: { positive, negative }, navStack, dismissAlert, forceUpdate } = this.props; |
<<<<<<<
<View style={styles.container}>
<View style={styles.topContainer}>
<View style={{ zIndex: 2 }}>
<Dropdown
ref={c => {
this.dropdown = c;
}}
title="Theme"
dropdownWidth={{ width: width / 1.45 }}
background
shadow
defaultOption={themeName}
options={themes}
saveSelection={t => {
const newTHEMES = cloneDeep(THEMES);
let newTheme = newTHEMES.themes[t];
if (t === 'Custom' && this.props.themeName === 'Custom') {
newTheme = this.props.theme;
}
this.setState({ themeName: t, theme: newTheme });
}}
/>
</View>
<View
style={[
styles.demoContainer,
{ backgroundColor: THEMES.getHSL(backgroundColor), shadowColor: THEMES.getHSL(barColor) },
]}
>
<View style={{ alignItems: 'center', justifyContent: 'center', marginBottom: height / 44 }}>
<Text style={{ fontFamily: 'Lato-Regular', fontSize: width / 29.6, color: 'white' }}>
MOCKUP
</Text>
</View>
=======
<TouchableWithoutFeedback
onPress={() => {
if (this.dropdown) {
this.dropdown.closeDropdown();
}
}}
>
<View style={styles.container}>
<View style={styles.topContainer}>
<View style={{ zIndex: 2 }}>
<Dropdown
onRef={c => {
this.dropdown = c;
}}
title="Theme"
dropdownWidth={{ width: width / 1.45 }}
background
shadow
defaultOption={themeName}
options={themes}
saveSelection={t => {
this.setState({ themeName: t, theme: THEMES.themes[t] });
}}
/>
</View>
>>>>>>>
<TouchableWithoutFeedback
onPress={() => {
if (this.dropdown) {
this.dropdown.closeDropdown();
}
}}
>
<View style={styles.container}>
<View style={styles.topContainer}>
<View style={{ zIndex: 2 }}>
<Dropdown
onRef={c => {
this.dropdown = c;
}}
title="Theme"
dropdownWidth={{ width: width / 1.45 }}
background
shadow
defaultOption={themeName}
options={themes}
saveSelection={t => {
const newTHEMES = cloneDeep(THEMES);
let newTheme = newTHEMES.themes[t];
if (t === 'Custom' && this.props.themeName === 'Custom') {
newTheme = this.props.theme;
}
this.setState({ themeName: t, theme: newTheme });
}}
/>
</View>
<<<<<<<
<Text style={styles.frameBarTitle}>MAIN ACCOUNT</Text>
<Image style={styles.chevron} source={chevronDownImagePath} />
</View>
{/*
=======
<View
style={[
styles.frameBar,
{ backgroundColor: THEMES.getHSL(barColor), shadowColor: THEMES.getHSL(barColor) },
]}
>
<Text style={styles.frameBarTitle}>Frame Bar</Text>
<Image style={styles.chevron} source={chevronDownImagePath} />
</View>
{/*
>>>>>>>
<View style={{ alignItems: 'center', justifyContent: 'center', marginBottom: height / 44 }}>
<Text style={{ fontFamily: 'Lato-Regular', fontSize: width / 29.6, color: 'white' }}>
MOCKUP
</Text>
</View>
<View
style={[
styles.frameBar,
{
backgroundColor: THEMES.getHSL(backgroundColor),
shadowColor: THEMES.getHSL(barColor),
},
]}
>
<Text style={styles.frameBarTitle}>MAIN ACCOUNT</Text>
<Image style={styles.chevron} source={chevronDownImagePath} />
</View>
{/*
<<<<<<<
<TouchableOpacity onPress={() => this.onAdvancedPress()} style={styles.advancedButton}>
<Text style={styles.advancedText}>ADVANCED</Text>
</TouchableOpacity>
</View>
<View style={styles.bottomContainer}>
<TouchableOpacity onPress={() => this.props.backPress()}>
<View style={styles.itemLeft}>
<Image source={arrowLeftImagePath} style={styles.iconLeft} />
<Text style={styles.titleTextLeft}>Back</Text>
</View>
</TouchableOpacity>
<TouchableOpacity onPress={() => this.onApplyPress(theme, themeName)}>
<View style={styles.itemRight}>
<Text style={styles.titleTextRight}>Apply</Text>
<Image source={tickImagePath} style={styles.iconRight} />
</View>
</TouchableOpacity>
=======
>>>>>>> |
<<<<<<<
import { isValidSeed } from '../../../../shared/libs/util';
import { createRandomSeed } from 'libs/util';
import Template, { Content, Footer } from './Template';
=======
import { isValidSeed } from 'libs/util';
import { createRandomSeed } from 'libs/seedUtil';
import Template, { Main, Footer } from './Template';
>>>>>>>
import Template, { Content, Footer } from './Template';
import { isValidSeed } from 'libs/util';
import { createRandomSeed } from 'libs/seedUtil'; |
<<<<<<<
static isValidAmount(amount, multiplier) {
=======
static isValidMessage(message) {
return iota.utils.fromTrytes(iota.utils.toTrytes(message)) === message;
}
static isValidAmount(amount) {
>>>>>>>
static isValidMessage(message) {
return iota.utils.fromTrytes(iota.utils.toTrytes(message)) === message;
}
static isValidAmount(amount, multiplier) {
<<<<<<<
const { t, amount, address } = this.props;
const multiplier = this.getUnitMultiplier();
=======
const { t, amount, address, message } = this.props;
>>>>>>>
const { t, amount, address, message } = this.props;
const multiplier = this.getUnitMultiplier(); |
<<<<<<<
=======
/** Determines if wallet is broadcasting bundle */
isBroadcastingBundle: PropTypes.bool.isRequired,
/** Current transaction retry state */
isRetryingFailedTransaction: PropTypes.bool.isRequired,
>>>>>>>
/** Current transaction retry state */
isRetryingFailedTransaction: PropTypes.bool.isRequired,
<<<<<<<
=======
/** Broadcast bundle
* @param {string} bundle - bundle hash
*/
broadcastBundle: PropTypes.func.isRequired,
/** Retry failed bundle
* @param {string} bundle - bundle hash
* @param {func} powFn - local Proof of Work function
*/
retryFailedTransaction: PropTypes.func.isRequired,
>>>>>>>
/** Retry failed bundle
* @param {string} bundle - bundle hash
* @param {func} powFn - local Proof of Work function
*/
retryFailedTransaction: PropTypes.func.isRequired,
<<<<<<<
=======
retryFailedTransaction(e, bundle) {
e.stopPropagation();
const { generateAlert, t } = this.props;
let powFn = null;
if (!this.props.remotePoW) {
try {
powFn = getPoWFn();
} catch (e) {
return generateAlert('error', t('pow:noWebGLSupport'), t('pow:noWebGLSupportExplanation'));
}
}
this.props.retryFailedTransaction(bundle, powFn);
}
broadcastBundle(e, bundle) {
e.stopPropagation();
this.props.broadcastBundle(bundle);
}
>>>>>>>
retryFailedTransaction(e, bundle) {
e.stopPropagation();
const { generateAlert, t } = this.props;
let powFn = null;
if (!this.props.remotePoW) {
try {
powFn = getPoWFn();
} catch (e) {
return generateAlert('error', t('pow:noWebGLSupport'), t('pow:noWebGLSupportExplanation'));
}
}
this.props.retryFailedTransaction(bundle, powFn);
}
<<<<<<<
=======
isBroadcastingBundle,
isRetryingFailedTransaction,
>>>>>>>
isRetryingFailedTransaction,
<<<<<<<
: activeTransfer.incoming ? t('received') : t('sent')}
<em>{formatModalTime(convertUnixTimeToJSDate(activeTransfer.timestamp))}</em>
=======
: activeTransfer.incoming ? t('received') : t('sent')}
<em>{formatModalTime(navigator.language, convertUnixTimeToJSDate(activeTransfer.timestamp))}</em>
>>>>>>>
: activeTransfer.incoming ? t('received') : t('sent')}
<em>
{formatModalTime(
navigator.language,
convertUnixTimeToJSDate(activeTransfer.timestamp),
)}
</em>
<<<<<<<
<Button
className="small"
loading={currentlyPromotingBundleHash === activeTransfer.bundle}
onClick={(e) => this.promoteTransaction(e, activeTransfer.bundle)}
>
{t('retry')}
</Button>
=======
{isActiveFailed && (
<Button
className="small"
loading={isRetryingFailedTransaction}
onClick={(e) => this.retryFailedTransaction(e, activeTransfer.bundle)}
>
{t('retry')}
</Button>
)}
{!isActiveFailed && (
<Button
className="small"
loading={currentlyPromotingBundleHash === activeTransfer.bundle}
onClick={(e) => this.promoteTransaction(e, activeTransfer.bundle)}
>
{t('retry')}
</Button>
)}
{!isActiveFailed &&
mode === 'Expert' && (
<Button
variant="secondary"
className="small"
loading={isBroadcastingBundle}
onClick={(e) => this.broadcastBundle(e, activeTransfer.bundle)}
>
{t('rebroadcast')}
</Button>
)}
>>>>>>>
{isActiveFailed && (
<Button
className="small"
loading={isRetryingFailedTransaction}
onClick={(e) => this.retryFailedTransaction(e, activeTransfer.bundle)}
>
{t('retry')}
</Button>
)}
{!isActiveFailed && (
<Button
className="small"
loading={currentlyPromotingBundleHash === activeTransfer.bundle}
onClick={(e) => this.promoteTransaction(e, activeTransfer.bundle)}
>
{t('retry')}
</Button>
)} |
<<<<<<<
import Button from '../UI/Button';
=======
import ButtonLink from '../UI/ButtonLink';
import css from './OnboardingTemplate.css';
>>>>>>>
import Button from '../UI/Button';
import css from './OnboardingTemplate.css';
<<<<<<<
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
<Button to="/" variant="warning">
{t('Go Back')}
</Button>
<Button to="/" variant="success">
{t('Next')}
</Button>
=======
<div className={css['options-links']}>
<ButtonLink to="/" variant="warning">
{t(toUpper('Go Back'))}
</ButtonLink>
<ButtonLink to="/" variant="success">
{t(toUpper('Next'))}
</ButtonLink>
>>>>>>>
<div className={css['options-links']}>
<Button to="/" variant="warning">
{t('Go Back')}
</Button>
<Button to="/" variant="success">
{t('Next')}
</Button> |
<<<<<<<
_showModal = () => this.setState({ isModalVisible: true });
_hideModal = () => this.setState({ isModalVisible: false });
_renderModalContent = () => (
<QRScanner
backgroundColor={COLORS.backgroundGreen}
ctaColor={COLORS.greenLight}
onQRRead={(data) => this.onQRRead(data)}
hideModal={() => this._hideModal()}
secondaryCtaColor="white"
/>
);
=======
>>>>>>>
<<<<<<<
handleKeyPress = (event) => {
=======
showModal = () => this.setState({ isModalVisible: true });
hideModal = () => this.setState({ isModalVisible: false });
handleKeyPress = event => {
>>>>>>>
showModal = () => this.setState({ isModalVisible: true });
hideModal = () => this.setState({ isModalVisible: false });
handleKeyPress = (event) => {
<<<<<<<
onChangeText={(seed) => this.setState({ seed: seed.toUpperCase() })}
containerStyle={{ width: width / 1.36 }}
autoCapitalize={'none'}
=======
onChangeText={text => this.setState({ seed: text.toUpperCase() })}
containerStyle={{ width: width / 1.2 }}
autoCapitalize={'characters'}
>>>>>>>
onChangeText={(text) => this.setState({ seed: text.toUpperCase() })}
containerStyle={{ width: width / 1.2 }}
autoCapitalize={'characters'} |
<<<<<<<
import { Switch, Route } from 'react-router-dom';
=======
import { connect } from 'react-redux';
>>>>>>>
import { Switch, Route } from 'react-router-dom';
import { connect } from 'react-redux'; |
<<<<<<<
import RNShakeEvent from 'react-native-shake-event'; // For HockeyApp bug reporting
import { DetectNavbar } from '../theme/androidSoftKeys';
=======
import { DetectNavbar } from '../theme/androidSoftKeys'
>>>>>>>
import { DetectNavbar } from '../theme/androidSoftKeys';
<<<<<<<
return true;
}
componentWillMount() {
RNShakeEvent.addEventListener('shake', () => {
// HockeyApp.feedback(); //Could possibly cause a crash
});
}
componentWillUnmount() {
RNShakeEvent.removeEventListener('shake');
=======
return false;
>>>>>>>
return false; |
<<<<<<<
secondaryBarColor: PropTypes.string.isRequired,
barColor: PropTypes.string.isRequired,
=======
buttonsOpacity: PropTypes.shape({ opacity: PropTypes.number.isRequired }).isRequired,
>>>>>>>
secondaryBarColor: PropTypes.string.isRequired,
barColor: PropTypes.string.isRequired,
buttonsOpacity: PropTypes.shape({ opacity: PropTypes.number.isRequired }).isRequired, |
<<<<<<<
import { translate } from 'react-i18next';
import { Styling } from 'ui/theme/general';
import { isAndroid, isIPhoneX } from 'libs/device';
=======
import { withNamespaces } from 'react-i18next';
import GENERAL from 'ui/theme/general';
import { isAndroid } from 'libs/device';
>>>>>>>
import { withNamespaces } from 'react-i18next';
import { Styling } from 'ui/theme/general';
import { isAndroid, isIPhoneX } from 'libs/device'; |
<<<<<<<
componentWillReceiveProps(newProps) {
const { wallet } = this.props;
const hasError =
!wallet.hasErrorFetchingAccountInfoOnLogin && newProps.wallet.hasErrorFetchingAccountInfoOnLogin;
if (hasError) {
this.setState({
loading: false,
});
}
}
=======
>>>>>>> |
<<<<<<<
update: {
done: true,
error: false,
version: DESKTOP_VERSION,
notes: [],
},
=======
remotePoW: false,
>>>>>>>
update: {
done: true,
error: false,
version: DESKTOP_VERSION,
notes: [],
},
remotePoW: false, |
<<<<<<<
import {
ActivityIndicator,
StyleSheet,
View,
Text,
Image,
ListView,
Dimensions,
TouchableOpacity,
Clipboard,
} from 'react-native';
=======
import {
StyleSheet,
View,
Text,
Image,
ListView,
Dimensions,
TouchableOpacity,
Clipboard,
StatusBar,
} from 'react-native';
>>>>>>>
import {
ActivityIndicator,
StyleSheet,
View,
Text,
Image,
ListView,
Dimensions,
TouchableOpacity,
Clipboard,
StatusBar,
} from 'react-native'; |
<<<<<<<
import { clearTempData } from 'actions/tempAccount';
import { loadSeeds, clearSeeds } from 'actions/seeds';
=======
import { loadSeeds } from 'actions/seeds';
import { runTask } from 'worker';
>>>>>>>
import { clearTempData } from 'actions/tempAccount';
import { loadSeeds, clearSeeds } from 'actions/seeds';
import { runTask } from 'worker';
<<<<<<<
getAccountInfo: PropTypes.func.isRequired,
getFullAccountInfo: PropTypes.func.isRequired,
clearTempData: PropTypes.func.isRequired,
clearSeeds: PropTypes.func.isRequired,
=======
>>>>>>>
clearTempData: PropTypes.func.isRequired,
clearSeeds: PropTypes.func.isRequired,
<<<<<<<
getFullAccountInfo,
getAccountInfo,
clearTempData,
clearSeeds,
=======
>>>>>>>
clearTempData,
clearSeeds, |
<<<<<<<
var get = Ember.get, set = Ember.set, getPath = Ember.getPath, fmt = Ember.String.fmt,
removeObject = Ember.EnumerableUtils.removeObject, forEach = Ember.EnumerableUtils.forEach;
=======
var get = Ember.get, set = Ember.set, fmt = Ember.String.fmt,
removeObject = Ember.EnumerableUtils.removeObject;
>>>>>>>
var get = Ember.get, set = Ember.set, fmt = Ember.String.fmt,
removeObject = Ember.EnumerableUtils.removeObject, forEach = Ember.EnumerableUtils.forEach; |
<<<<<<<
import Updates from 'ui/global/Updates';
=======
import Updates from 'ui/global/Updates';
>>>>>>>
import Updates from 'ui/global/Updates';
<<<<<<<
import { sendAmount } from 'actions/deepLinks';
import { ADDRESS_LENGTH } from 'libs/util';
=======
>>>>>>>
import { sendAmount } from 'actions/deepLinks';
import { ADDRESS_LENGTH } from 'libs/util';
<<<<<<<
sendAmount: PropTypes.func.isRequired,
};
componentWillMount() {
const { generateAlert, t } = this.props;
Electron.onEvent('url-params', (data) => {
let regexAddress = /\:\/\/(.*?)\/\?/;
let regexAmount = /amount=(.*?)\&/;
let regexMessage = /message=([^\n\r]*)/;
let address = data.match(regexAddress);
if (address !== null) {
let amount = data.match(regexAmount);
let message = data.match(regexMessage);
if (address[1].length !== ADDRESS_LENGTH) {
generateAlert('error', t('send:invalidAddress'), t('send:invalidAddressExplanation1'));
this.props.sendAmount(0, '', '');
} else {
this.setState({
address: address[1],
amount: amount[1],
message: message[1],
});
this.props.sendAmount(this.state.amount, this.state.address, this.state.message);
if(this.props.tempAccount.ready === true) {
const { generateAlert} = this.props;
generateAlert('success', 'Link', 'Send amount was updated.');
this.props.history.push('/wallet/send');
}
}
}
});
=======
};
componentDidMount() {
>>>>>>>
sendAmount: PropTypes.func.isRequired,
};
componentWillMount() {
const { generateAlert, t } = this.props;
Electron.onEvent('url-params', (data) => {
let regexAddress = /\:\/\/(.*?)\/\?/;
let regexAmount = /amount=(.*?)\&/;
let regexMessage = /message=([^\n\r]*)/;
let address = data.match(regexAddress);
if (address !== null) {
let amount = data.match(regexAmount);
let message = data.match(regexMessage);
if (address[1].length !== ADDRESS_LENGTH) {
generateAlert('error', t('send:invalidAddress'), t('send:invalidAddressExplanation1'));
this.props.sendAmount(0, '', '');
} else {
this.setState({
address: address[1],
amount: amount[1],
message: message[1],
});
this.props.sendAmount(this.state.amount, this.state.address, this.state.message);
if(this.props.tempAccount.ready === true) {
const { generateAlert} = this.props;
generateAlert('success', 'Link', 'Send amount was updated.');
this.props.history.push('/wallet/send');
}
}
}
});
}
componentDidMount() {
<<<<<<<
sendAmount,
getUpdateData,
generateAlert,
=======
getUpdateData,
>>>>>>>
sendAmount,
getUpdateData,
generateAlert, |
<<<<<<<
extraColor: PropTypes.object.isRequired,
negativeColor: PropTypes.object.isRequired,
=======
setCurrency: PropTypes.func.isRequired,
setTimeframe: PropTypes.func.isRequired,
extraColor: PropTypes.string.isRequired,
negativeColor: PropTypes.string.isRequired,
>>>>>>>
setCurrency: PropTypes.func.isRequired,
setTimeframe: PropTypes.func.isRequired,
extraColor: PropTypes.string.isRequired,
negativeColor: PropTypes.string.isRequired,
<<<<<<<
=======
chartLineColorPrimary: PropTypes.string.isRequired,
chartLineColorSecondary: PropTypes.string.isRequired,
t: PropTypes.func.isRequired,
closeTopBar: PropTypes.func.isRequired,
>>>>>>>
chartLineColorPrimary: PropTypes.string.isRequired,
chartLineColorSecondary: PropTypes.string.isRequired,
t: PropTypes.func.isRequired,
closeTopBar: PropTypes.func.isRequired,
<<<<<<<
<Text style={[styles.iotaBalance, textColor]} onPress={(event) => this.onBalanceClick()}>
=======
<Text style={[styles.iotaBalance, textColor]} onPress={() => this.onBalanceClick()}>
>>>>>>>
<Text style={[styles.iotaBalance, textColor]} onPress={() => this.onBalanceClick()}> |
<<<<<<<
navStack: PropTypes.array,
=======
currentRoute: PropTypes.string.isRequired,
/** @ignore */
forceUpdate: PropTypes.bool.isRequired,
/** @ignore */
shouldUpdate: PropTypes.bool.isRequired,
>>>>>>>
navStack: PropTypes.array.isRequired,
/** @ignore */
forceUpdate: PropTypes.bool.isRequired,
/** @ignore */
shouldUpdate: PropTypes.bool.isRequired,
<<<<<<<
const { onRef, theme: { positive, negative }, navStack, dismissAlert } = this.props;
=======
const { onRef, theme: { positive, negative }, currentRoute, dismissAlert, forceUpdate } = this.props;
>>>>>>>
const { onRef, theme: { positive, negative }, navStack, dismissAlert, forceUpdate } = this.props; |
<<<<<<<
<Main>
<p>{t('setPassword:nowWeNeedTo')}</p>
=======
<Content>
<p>{t('text')}</p>
>>>>>>>
<Content>
<p>{t('setPassword:nowWeNeedTo')}</p>
<<<<<<<
<p>{t('setPassword:anEncryptedCopy')}</p>
=======
<p>{t('explanation')}</p>
<p>
<strong>{t('reminder')}</strong>
</p>
>>>>>>>
<p>{t('setPassword:anEncryptedCopy')}</p> |
<<<<<<<
/** Determines if user has activated fingerprint auth */
isFingerprintEnabled: PropTypes.bool.isRequired,
=======
/** Allow deny application to minimize
* @param {boolean} status
*/
setDoNotMinimise: PropTypes.func.isRequired
>>>>>>>
/** Determines if user has activated fingerprint auth */
isFingerprintEnabled: PropTypes.bool.isRequired,
/** Allow deny application to minimize
* @param {boolean} status
*/
setDoNotMinimise: PropTypes.func.isRequired |
<<<<<<<
json_main = serializer_main.extractSingle(env.store, env.store.modelFor('home-planet'), json_hash_main);
equal(env.store.hasRecordForId('super-villain', "1"), true, "superVillain should exist in store:main");
=======
json_main = serializer_main.extractSingle(env.store, HomePlanet, json_hash_main);
equal(env.store.hasRecordForId("superVillain", "1"), true, "superVillain should exist in store:application");
>>>>>>>
json_main = serializer_main.extractSingle(env.store, env.store.modelFor('home-planet'), json_hash_main);
equal(env.store.hasRecordForId('super-villain', "1"), true, "superVillain should exist in store:application"); |
<<<<<<<
import { width, height } from '../util/dimensions';
import { isAndroid, isIOS } from '../util/device';
=======
import { height } from '../util/dimensions';
import { isAndroid } from '../util/device';
>>>>>>>
import { height } from '../util/dimensions';
import { isAndroid, isIOS } from '../util/device'; |
<<<<<<<
import { generateAlert } from 'actions/alerts';
=======
import { disposeOffAlert } from 'actions/alerts';
>>>>>>>
import { disposeOffAlert } from 'actions/alerts';
import { generateAlert } from 'actions/alerts';
<<<<<<<
componentWillMount() {
const { generateAlert, t } = this.props;
Electron.onEvent('url-params', (data) => {
let regexAddress = /\:\/\/(.*?)\/\?/;
let regexAmount = /amount=(.*?)\&/;
let regexMessage = /message=([^\n\r]*)/;
let address = data.match(regexAddress);
if (address !== null) {
let amount = data.match(regexAmount);
let message = data.match(regexMessage);
if (address[1].length !== ADDRESS_LENGTH) {
generateAlert('error', t('send:invalidAddress'), t('send:invalidAddressExplanation1'));
this.props.sendAmount(0, '', '');
} else {
this.setState({
address: address[1],
amount: amount[1],
message: message[1],
});
this.props.sendAmount(this.state.amount, this.state.address, this.state.message);
if(this.props.tempAccount.ready === true) {
const { generateAlert} = this.props;
generateAlert('success', 'Autofill', 'Transaction data autofilled from link.');
this.props.history.push('/wallet/send');
}
}
}
});
}
=======
constructor(props) {
super(props);
this.state = { uuid: null };
}
>>>>>>>
componentWillMount() {
const { generateAlert, t } = this.props;
Electron.onEvent('url-params', (data) => {
let regexAddress = /\:\/\/(.*?)\/\?/;
let regexAmount = /amount=(.*?)\&/;
let regexMessage = /message=([^\n\r]*)/;
let address = data.match(regexAddress);
if (address !== null) {
let amount = data.match(regexAmount);
let message = data.match(regexMessage);
if (address[1].length !== ADDRESS_LENGTH) {
generateAlert('error', t('send:invalidAddress'), t('send:invalidAddressExplanation1'));
this.props.sendAmount(0, '', '');
} else {
this.setState({
address: address[1],
amount: amount[1],
message: message[1],
});
this.props.sendAmount(this.state.amount, this.state.address, this.state.message);
if(this.props.tempAccount.ready === true) {
const { generateAlert} = this.props;
generateAlert('success', 'Autofill', 'Transaction data autofilled from link.');
this.props.history.push('/wallet/send');
}
}
}
});
}
constructor(props) {
super(props);
this.state = { uuid: null };
}
<<<<<<<
deepLinks: state.deepLinks,
=======
activationCode: state.app.activationCode,
>>>>>>>
deepLinks: state.deepLinks,
activationCode: state.app.activationCode,
<<<<<<<
generateAlert,
=======
disposeOffAlert,
>>>>>>>
disposeOffAlert,
generateAlert, |
<<<<<<<
acceptedTerms: false
=======
hasVisitedSeedShareTutorial: false,
>>>>>>>
acceptedTerms: false,
hasVisitedSeedShareTutorial: false,
<<<<<<<
case ActionTypes.ACCEPT_TERMS:
return {
...state,
acceptedTerms: true,
};
=======
case ActionTypes.SET_SEED_SHARE_TUTORIAL_VISITATION_STATUS:
return {
...state,
hasVisitedSeedShareTutorial: action.payload,
};
>>>>>>>
case ActionTypes.ACCEPT_TERMS:
return {
...state,
acceptedTerms: true,
};
case ActionTypes.SET_SEED_SHARE_TUTORIAL_VISITATION_STATUS:
return {
...state,
hasVisitedSeedShareTutorial: action.payload,
}; |
<<<<<<<
navStack: [],
=======
forceUpdate: false,
shouldUpdate: false
>>>>>>>
navStack: [],
forceUpdate: false,
shouldUpdate: false, |
<<<<<<<
var seedArray = parse(value);
for (var item of seedArray) {
if (item.name == name) {
alertFn(
'error',
'Account name already in use',
'This account name is already linked to your wallet. Please use a different one.',
);
return;
} else if (item.seed == seed) {
alertFn(
'error',
'Seed already in use',
'This seed is already linked to your wallet. Please use a different one.',
);
return;
}
}
=======
var seedArray = JSON.parse(value);
>>>>>>>
var seedArray = parse(value); |
<<<<<<<
=======
import keychain, { getSeed } from '../util/keychain';
import { TextField } from 'react-native-material-textfield';
import OnboardingButtons from '../components/onboardingButtons.js';
import DropdownAlert from '../node_modules/react-native-dropdownalert/DropdownAlert';
import Modal from 'react-native-modal';
import { Navigation } from 'react-native-navigation';
>>>>>>>
<<<<<<<
_renderModalContent = () => {
const { t } = this.props;
return (
<View style={{ width: width / 1.15, alignItems: 'center', backgroundColor: COLORS.backgroundGreen }}>
<View style={styles.modalContent}>
<Text style={styles.questionText}>{t('selectDifferentNode')}</Text>
<OnboardingButtons
onLeftButtonPress={() => this._hideModal()}
onRightButtonPress={() => this.navigateToNodeSelection()}
leftText={t('global:no')}
rightText={t('global:yes')}
/>
</View>
=======
_renderModalContent = () => (
<View style={{ width: width / 1.15, alignItems: 'center', backgroundColor: COLORS.backgroundGreen }}>
<View style={styles.modalContent}>
<Text style={styles.questionText}>Cannot connect to IOTA node.</Text>
<Text style={styles.infoText}>Do you want to select a different node?</Text>
<OnboardingButtons
onLeftButtonPress={() => this._hideModal()}
onRightButtonPress={() => this.navigateToNodeSelection()}
leftText={'NO'}
rightText={'YES'}
/>
>>>>>>>
_renderModalContent = () => {
return (
<View style={{ width: width / 1.15, alignItems: 'center', backgroundColor: COLORS.backgroundGreen }}>
<View style={styles.modalContent}>
<Text style={styles.questionText}>Cannot connect to IOTA node.</Text>
<Text style={styles.infoText}>Do you want to select a different node?</Text>
<OnboardingButtons
onLeftButtonPress={() => this._hideModal()}
onRightButtonPress={() => this.navigateToNodeSelection()}
leftText={'NO'}
rightText={'YES'}
/>
</View>
<<<<<<<
onUseSeedPress() {
const { t } = this.props;
this.dropdown.alertWithType('error', t('global:notAvailable'), t('global:notAvailableExplanation'));
{
/* this.props.navigator.push({
screen: 'useSeed',
navigatorStyle: {
navBarHidden: true,
},
animated: false,
overrideBackPress: true
}); */
}
}
=======
>>>>>>>
<<<<<<<
questionText: {
color: 'white',
fontFamily: 'Lato-Regular',
fontSize: width / 20.25,
textAlign: 'center',
paddingLeft: width / 7,
paddingRight: width / 7,
paddingTop: height / 25,
backgroundColor: 'transparent',
},
=======
topContainer: {
flex: 1.2,
alignItems: 'center',
justifyContent: 'flex-start',
paddingTop: height / 22,
},
midContainer: {
flex: 4.8,
alignItems: 'center',
paddingTop: height / 4.2,
},
bottomContainer: {
flex: 0.7,
alignItems: 'center',
justifyContent: 'flex-end',
},
titleContainer: {
justifyContent: 'center',
alignItems: 'center',
paddingTop: height / 15,
},
title: {
color: 'white',
fontFamily: 'Lato-Regular',
fontSize: width / 20.7,
textAlign: 'center',
backgroundColor: 'transparent',
},
iotaLogo: {
height: width / 5,
width: width / 5,
},
>>>>>>>
<<<<<<<
const mapDispatchToProps = {
setPassword,
getAccountInfo,
getFullAccountInfo,
changeHomeScreenRoute,
getMarketData,
getPrice,
getChartData,
clearTempData,
getCurrencyData,
setReady,
setFullNode,
};
=======
const mapDispatchToProps = dispatch => ({
setPassword: password => {
dispatch(setPassword(password));
},
getAccountInfo: (accountName, seedIndex, accountInfo, cb) => {
dispatch(getAccountInfo(accountName, seedIndex, accountInfo, cb));
},
getFullAccountInfo: (seed, accountName, cb) => {
dispatch(getFullAccountInfo(seed, accountName, cb));
},
changeHomeScreenRoute: tab => {
dispatch(changeHomeScreenRoute(tab));
},
getMarketData: () => {
dispatch(getMarketData());
},
getPrice: () => {
dispatch(getPrice());
},
getChartData: () => {
dispatch(getChartData());
},
clearTempData: () => dispatch(clearTempData()),
getCurrencyData: currency => dispatch(getCurrencyData(currency)),
setReady: () => dispatch(setReady()),
setFullNode: node => dispatch(setFullNode(node)),
});
>>>>>>>
const mapDispatchToProps = {
setPassword,
getAccountInfo,
getFullAccountInfo,
changeHomeScreenRoute,
getMarketData,
getPrice,
getChartData,
clearTempData,
getCurrencyData,
setReady,
setFullNode,
}; |
<<<<<<<
const dropdown = DropdownHolder.getDropdown();
getFromKeychain(this.props.iota.password, value => {
=======
this.props.generateNewAddressRequest();
const seedIndex = this.props.tempAccount.seedIndex;
const seedName = this.props.account.seedNames[seedIndex];
const accountInfo = this.props.account.accountInfo;
const addresses = accountInfo[Object.keys(accountInfo)[seedIndex]].addresses;
getFromKeychain(this.props.tempAccount.password, value => {
>>>>>>>
this.props.generateNewAddressRequest();
const dropdown = DropdownHolder.getDropdown();
const seedIndex = this.props.tempAccount.seedIndex;
const seedName = this.props.account.seedNames[seedIndex];
const accountInfo = this.props.account.accountInfo;
const addresses = accountInfo[Object.keys(accountInfo)[seedIndex]].addresses;
getFromKeychain(this.props.tempAccount.password, value => {
<<<<<<<
const generate = seed => this.props.generateNewAddress(seed);
const error = () => dropdown.alertWithType('error', 'Something went wrong', 'Please restart the app.');
=======
const generate = (seed, seedName, addresses) => this.props.generateNewAddress(seed, seedName, addresses);
const error = () => this.dropdown.alertWithType('error', 'Something went wrong', 'Please restart the app.');
>>>>>>>
const generate = (seed, seedName, addresses) => this.props.generateNewAddress(seed, seedName, addresses);
const error = () => this.dropdown.alertWithType('error', 'Something went wrong', 'Please restart the app.'); |
<<<<<<<
import { showError } from 'actions/notifications';
import Template, { Main, Footer } from './Template';
=======
import Template, { Content, Footer } from './Template';
>>>>>>>
import { showError } from 'actions/notifications';
import Template, { Content, Footer } from './Template';
<<<<<<<
<Main>
<p>{t('addAdditionalSeed:enterAccountName')}</p>
=======
<Content>
<p>{t('text')}</p>
>>>>>>>
<Content>
<p>{t('addAdditionalSeed:enterAccountName')}</p> |
<<<<<<<
<Image source={require('../../shared/images/iota-glow.png')} style={styles.iotaLogo} />
<View style={styles.textContainer}>
=======
<Image source={require('../images/iota-glow.png')} style={styles.iotaLogo} />
<View style={styles.titleContainer}>
>>>>>>>
<Image source={require('../../shared/images/iota-glow.png')} style={styles.iotaLogo} />
<View style={styles.titleContainer}> |
<<<<<<<
var clientIds = Ember.EnumerableUtils.map(ids, function(id) {
return store.clientIdForId(association.type, id);
});
=======
var clientIds;
if(association.options.embedded) {
clientIds = store.loadMany(association.type, ids).clientIds;
} else {
clientIds = Ember.ArrayUtils.map(ids, function(id) {
return store.clientIdForId(association.type, id);
});
}
>>>>>>>
var clientIds;
if(association.options.embedded) {
clientIds = store.loadMany(association.type, ids).clientIds;
} else {
clientIds = Ember.EnumerableUtils.map(ids, function(id) {
return store.clientIdForId(association.type, id);
});
} |
<<<<<<<
cb();
=======
// Keep track of this transfer in unconfirmed tails so that it can be picked up for promotion
// Would be the tail anyways.
// Also check if it was a value transfer
if (value) {
const bundle = get(success, `[${0}].bundle`);
dispatch(
updateUnconfirmedBundleTails({ [bundle]: filter(success, tx => tx.currentIndex === 0) }),
);
}
>>>>>>>
cb();
// Keep track of this transfer in unconfirmed tails so that it can be picked up for promotion
// Would be the tail anyways.
// Also check if it was a value transfer
if (value) {
const bundle = get(success, `[${0}].bundle`);
dispatch(
updateUnconfirmedBundleTails({ [bundle]: filter(success, tx => tx.currentIndex === 0) }),
);
} |
<<<<<<<
seed: '',
seedValid: this.props.selectedSeed.seed,
=======
seed: '',
>>>>>>>
seed: '',
seedValid: this.props.selectedSeed.seed,
<<<<<<<
<Main>
<SeedInput
seed={seed}
onChange={this.onChange}
placeholder={t('global:seed')}
closeLabel={t('global:back')}
/>
=======
<Content>
<div className={css.formGroup}>
<textarea
name="seed"
className={css.seed}
placeholder={t('placeholder')}
value={seed}
onChange={this.onChange}
maxLength={MAX_SEED_LENGTH}
rows={6}
/>
<p>
{seed.length}/{MAX_SEED_LENGTH}
</p>
</div>
{/* TODO: prettier fucks this whole part up. maybe we can find a better solution here */}
{!showScanner && (
<Button type="button" onClick={this.openScanner} variant="cta">
{t('scan_code')}
</Button>
)}
<Modal
isOpen={showScanner}
onStateChange={showScanner => this.setState({ showScanner })}
hideCloseButton
>
{/* prevent qrscanner from scanning if not shown */}
{showScanner && (
<QrReader
delay={350}
className={css.qrScanner}
onError={this.onScanError}
onScan={this.onScanEvent}
/>
)}
<Button type="button" onClick={this.closeScanner} variant="cta">
{t('close')}
</Button>
</Modal>
>>>>>>>
<Content>
<SeedInput
seed={seed}
onChange={this.onChange}
placeholder={t('global:seed')}
closeLabel={t('global:back')}
/> |
<<<<<<<
import { selectLocale } from '../components/locale';
import { Icon } from '../theme/icons.js';
=======
import { selectLocale } from 'iota-wallet-shared-modules/libs/locale';
>>>>>>>
import { Icon } from '../theme/icons.js'; |
<<<<<<<
import { translate } from 'react-i18next';
import { StyleSheet, View, Text, ListView, Dimensions, StatusBar, Platform } from 'react-native';
=======
import {
StyleSheet,
View,
Text,
ListView,
Dimensions,
StatusBar,
Platform,
TouchableWithoutFeedback,
} from 'react-native';
>>>>>>>
import {
StyleSheet,
View,
Text,
ListView,
Dimensions,
StatusBar,
Platform,
TouchableWithoutFeedback,
} from 'react-native';
import { translate } from 'react-i18next'; |
<<<<<<<
<Main>
<p>{t('welcome:thankYou')}</p>
<p>{t('welcome:weWillSpend')}</p>
=======
<Content>
<p>{t('text1')}</p>
<p>{t('text2')}</p>
>>>>>>>
<Content>
<p>{t('welcome:thankYou')}</p>
<p>{t('welcome:weWillSpend')}</p> |
<<<<<<<
de: require('../../../shared/locales/de/translation.json'),
=======
// de: { 'Common': require('../../../shared/locales/de/translation.json') },
// en: { 'Common': require('../../../shared/locales/en/translation.json') },
// 'es-ES': { 'Common': require('../../../shared/locales/es-ES/translation.json') },
// fr: { 'Common': require('../../../shared/locales/fr/translation.json') },
ar: require('../../../shared/locales/ar/translation.json'),
da: require('../../../shared/locales/da/translation.json'),
de: require('../../../shared/locales/de/translation.json'),
el: require('../../../shared/locales/el/translation.json'),
>>>>>>>
ar: require('../../../shared/locales/ar/translation.json'),
da: require('../../../shared/locales/da/translation.json'),
de: require('../../../shared/locales/de/translation.json'),
el: require('../../../shared/locales/el/translation.json'),
<<<<<<<
es: require('../../../shared/locales/es/translation.json'),
},
=======
es_ES: require('../../../shared/locales/es-ES/translation.json'),
es_LA: require('../../../shared/locales/es-LA/translation.json'),
fi: require('../../../shared/locales/fi/translation.json'),
fr: require('../../../shared/locales/fr/translation.json'),
he: require('../../../shared/locales/he/translation.json'),
hi: require('../../../shared/locales/hi/translation.json'),
id: require('../../../shared/locales/id/translation.json'),
it: require('../../../shared/locales/it/translation.json'),
ja: require('../../../shared/locales/ja/translation.json'),
ko: require('../../../shared/locales/ko/translation.json'),
lv: require('../../../shared/locales/lv/translation.json'),
nl: require('../../../shared/locales/nl/translation.json'),
no: require('../../../shared/locales/no/translation.json'),
pl: require('../../../shared/locales/pl/translation.json'),
pt_BR: require('../../../shared/locales/pt-BR/translation.json'),
pt_PT: require('../../../shared/locales/pt-PT/translation.json'),
ro: require('../../../shared/locales/ro/translation.json'),
ru: require('../../../shared/locales/ru/translation.json'),
sl: require('../../../shared/locales/sl/translation.json'),
sv_SE: require('../../../shared/locales/sv-SE/translation.json'),
tr: require('../../../shared/locales/tr/translation.json'),
ur: require('../../../shared/locales/ur/translation.json'),
zh_CN: require('../../../shared/locales/zh-CN/translation.json'),
zh_TW: require('../../../shared/locales/zh-TW/translation.json'),
},
>>>>>>>
es_ES: require('../../../shared/locales/es-ES/translation.json'),
es_LA: require('../../../shared/locales/es-LA/translation.json'),
fi: require('../../../shared/locales/fi/translation.json'),
fr: require('../../../shared/locales/fr/translation.json'),
he: require('../../../shared/locales/he/translation.json'),
hi: require('../../../shared/locales/hi/translation.json'),
id: require('../../../shared/locales/id/translation.json'),
it: require('../../../shared/locales/it/translation.json'),
ja: require('../../../shared/locales/ja/translation.json'),
ko: require('../../../shared/locales/ko/translation.json'),
lv: require('../../../shared/locales/lv/translation.json'),
nl: require('../../../shared/locales/nl/translation.json'),
no: require('../../../shared/locales/no/translation.json'),
pl: require('../../../shared/locales/pl/translation.json'),
pt_BR: require('../../../shared/locales/pt-BR/translation.json'),
pt_PT: require('../../../shared/locales/pt-PT/translation.json'),
ro: require('../../../shared/locales/ro/translation.json'),
ru: require('../../../shared/locales/ru/translation.json'),
sl: require('../../../shared/locales/sl/translation.json'),
sv_SE: require('../../../shared/locales/sv-SE/translation.json'),
tr: require('../../../shared/locales/tr/translation.json'),
ur: require('../../../shared/locales/ur/translation.json'),
zh_CN: require('../../../shared/locales/zh-CN/translation.json'),
zh_TW: require('../../../shared/locales/zh-TW/translation.json'),
}, |
<<<<<<<
var Comment, Post, env;
var run = Ember.run;
=======
var env;
>>>>>>>
var Post, env;
var run = Ember.run;
<<<<<<<
run(function(){
post.save().then(function() {}, async(function() {
ok(true, 'save operation was rejected');
}));
});
=======
Ember.run(function(){
post.save().then(function() {}, async(function() {
ok(true, 'save operation was rejected');
}));
});
>>>>>>>
run(function(){
post.save().then(function() {}, async(function() {
ok(true, 'save operation was rejected');
}));
}); |
<<<<<<<
var allowNegative = options.allowNegative;
// skip everything that isn't a number
// and also skip the left zeroes
function to_numbers (str)
{
var formatted = '';
for (var i=0;i<(str.length);i++)
{
char_ = str.charAt(i);
if (formatted.length==0 && char_==0) char_ = false;
if (char_ && char_.match(is_number))
{
if (limit)
{
if (formatted.length < limit) formatted = formatted+char_;
}
else
{
formatted = formatted+char_;
}
}
}
return formatted;
}
// format to fill with zeros to complete cents chars
function fill_with_zeroes (str)
{
while (str.length<(centsLimit+1)) str = '0'+str;
return str;
}
// format as price
function price_format (str)
{
// formatting settings
var formatted = fill_with_zeroes(to_numbers(str));
var thousandsFormatted = '';
var thousandsCount = 0;
// split integer from cents
var centsVal = formatted.substr(formatted.length-centsLimit,centsLimit);
var integerVal = formatted.substr(0,formatted.length-centsLimit);
// apply cents pontuation
formatted = integerVal+centsSeparator+centsVal;
// apply thousands pontuation
if (thousandsSeparator)
{
for (var j=integerVal.length;j>0;j--)
{
char_ = integerVal.substr(j-1,1);
thousandsCount++;
if (thousandsCount%3==0) char_ = thousandsSeparator+char_;
thousandsFormatted = char_+thousandsFormatted;
}
// Verify CentsLimit
if(centsLimit == 0)
{
centsSeparator = "";
centsVal = "";
}
// Clean if first char is the thousandSeparator
if (thousandsFormatted.substr(0,1)==thousandsSeparator) thousandsFormatted = thousandsFormatted.substring(1,thousandsFormatted.length);
formatted = thousandsFormatted+centsSeparator+centsVal;
}
// if the string contains a dash, it is negative - add it to the begining (except for zero)
if (allowNegative && str.indexOf('-') != -1 && (integerVal != 0 || centsVal != 0)) formatted = '-' + formatted;
// apply the prefix
if (prefix) formatted = prefix+formatted;
=======
var allowNegative = options.allowNegative;
// skip everything that isn't a number
// and also skip the left zeroes
function to_numbers (str)
{
var formatted = '';
for (var i=0;i<(str.length);i++)
{
char_ = str.charAt(i);
if (formatted.length==0 && char_==0) char_ = false;
if (char_ && char_.match(is_number))
{
if (limit)
{
if (formatted.length < limit) formatted = formatted+char_;
}
else
{
formatted = formatted+char_;
}
}
}
return formatted;
}
// format to fill with zeros to complete cents chars
function fill_with_zeroes (str)
{
while (str.length<(centsLimit+1)) str = '0'+str;
return str;
}
// format as price
function price_format (str)
{
// formatting settings
var formatted = fill_with_zeroes(to_numbers(str));
var thousandsFormatted = '';
var thousandsCount = 0;
// split integer from cents
var centsVal = formatted.substr(formatted.length-centsLimit,centsLimit);
var integerVal = formatted.substr(0,formatted.length-centsLimit);
// apply cents pontuation
formatted = integerVal+centsSeparator+centsVal;
// apply thousands pontuation
if (thousandsSeparator)
{
for (var j=integerVal.length;j>0;j--)
{
char_ = integerVal.substr(j-1,1);
thousandsCount++;
if (thousandsCount%3==0) char_ = thousandsSeparator+char_;
thousandsFormatted = char_+thousandsFormatted;
}
if (thousandsFormatted.substr(0,1)==thousandsSeparator) thousandsFormatted = thousandsFormatted.substring(1,thousandsFormatted.length);
formatted = thousandsFormatted+centsSeparator+centsVal;
}
// if the string contains a dash, it is negative - add it to the begining (except for zero)
if (allowNegative && str.indexOf('-') != -1 && (integerVal != 0 || centsVal != 0)) formatted = '-' + formatted;
// apply the prefix
if (prefix) formatted = prefix+formatted;
>>>>>>>
var allowNegative = options.allowNegative;
// skip everything that isn't a number
// and also skip the left zeroes
function to_numbers (str)
{
var formatted = '';
for (var i=0;i<(str.length);i++)
{
char_ = str.charAt(i);
if (formatted.length==0 && char_==0) char_ = false;
if (char_ && char_.match(is_number))
{
if (limit)
{
if (formatted.length < limit) formatted = formatted+char_;
}
else
{
formatted = formatted+char_;
}
}
}
return formatted;
}
// format to fill with zeros to complete cents chars
function fill_with_zeroes (str)
{
while (str.length<(centsLimit+1)) str = '0'+str;
return str;
}
// format as price
function price_format (str)
{
// formatting settings
var formatted = fill_with_zeroes(to_numbers(str));
var thousandsFormatted = '';
var thousandsCount = 0;
// split integer from cents
var centsVal = formatted.substr(formatted.length-centsLimit,centsLimit);
var integerVal = formatted.substr(0,formatted.length-centsLimit);
// apply cents pontuation
formatted = integerVal+centsSeparator+centsVal;
// apply thousands pontuation
if (thousandsSeparator)
{
for (var j=integerVal.length;j>0;j--)
{
char_ = integerVal.substr(j-1,1);
thousandsCount++;
if (thousandsCount%3==0) char_ = thousandsSeparator+char_;
thousandsFormatted = char_+thousandsFormatted;
}
// Verify CentsLimit
if(centsLimit == 0)
{
centsSeparator = "";
centsVal = "";
}
// Clean if first char is the thousandSeparator
if (thousandsFormatted.substr(0,1)==thousandsSeparator) thousandsFormatted = thousandsFormatted.substring(1,thousandsFormatted.length);
formatted = thousandsFormatted+centsSeparator+centsVal;
}
// if the string contains a dash, it is negative - add it to the begining (except for zero)
if (allowNegative && str.indexOf('-') != -1 && (integerVal != 0 || centsVal != 0)) formatted = '-' + formatted;
// apply the prefix
if (prefix) formatted = prefix+formatted;
var allowNegative = options.allowNegative;
// skip everything that isn't a number
// and also skip the left zeroes
function to_numbers (str)
{
var formatted = '';
for (var i=0;i<(str.length);i++)
{
char_ = str.charAt(i);
if (formatted.length==0 && char_==0) char_ = false;
if (char_ && char_.match(is_number))
{
if (limit)
{
if (formatted.length < limit) formatted = formatted+char_;
}
else
{
formatted = formatted+char_;
}
}
}
return formatted;
}
// format to fill with zeros to complete cents chars
function fill_with_zeroes (str)
{
while (str.length<(centsLimit+1)) str = '0'+str;
return str;
}
// format as price
function price_format (str)
{
// formatting settings
var formatted = fill_with_zeroes(to_numbers(str));
var thousandsFormatted = '';
var thousandsCount = 0;
// split integer from cents
var centsVal = formatted.substr(formatted.length-centsLimit,centsLimit);
var integerVal = formatted.substr(0,formatted.length-centsLimit);
// apply cents pontuation
formatted = integerVal+centsSeparator+centsVal;
// apply thousands pontuation
if (thousandsSeparator)
{
for (var j=integerVal.length;j>0;j--)
{
char_ = integerVal.substr(j-1,1);
thousandsCount++;
if (thousandsCount%3==0) char_ = thousandsSeparator+char_;
thousandsFormatted = char_+thousandsFormatted;
}
if (thousandsFormatted.substr(0,1)==thousandsSeparator) thousandsFormatted = thousandsFormatted.substring(1,thousandsFormatted.length);
formatted = thousandsFormatted+centsSeparator+centsVal;
}
// if the string contains a dash, it is negative - add it to the begining (except for zero)
if (allowNegative && str.indexOf('-') != -1 && (integerVal != 0 || centsVal != 0)) formatted = '-' + formatted;
// apply the prefix
if (prefix) formatted = prefix+formatted; |
<<<<<<<
getLatestAddresses,
formatAddressesAndBalance,
=======
formatFullAddressData,
calculateBalance,
>>>>>>>
formatAddressesAndBalance, |
<<<<<<<
/**
* Navigation stack
*/
navStack: [],
=======
/**
* Determines whether user should update
*/
shouldUpdate: false,
/**
* Determines whether user is forced to update
*/
forceUpdate: false,
>>>>>>>
/**
* Navigation stack
*/
navStack: [],
/**
* Determines whether user should update
*/
shouldUpdate: false,
/**
* Determines whether user is forced to update
*/
forceUpdate: false,
<<<<<<<
case ActionTypes.PUSH_ROUTE:
return {
...state,
navStack: state.navStack.slice().concat(action.payload),
};
case ActionTypes.POP_ROUTE:
return {
...state,
navStack: state.navStack.slice(0, state.navStack.length - 1),
};
case ActionTypes.RESET_ROUTE:
return {
...state,
navStack: [action.payload],
};
=======
case ActionTypes.SHOULD_UPDATE:
return {
...state,
shouldUpdate: true,
};
case ActionTypes.FORCE_UPDATE:
return {
...state,
forceUpdate: true,
};
>>>>>>>
case ActionTypes.PUSH_ROUTE:
return {
...state,
navStack: state.navStack.slice().concat(action.payload),
};
case ActionTypes.POP_ROUTE:
return {
...state,
navStack: state.navStack.slice(0, state.navStack.length - 1),
};
case ActionTypes.RESET_ROUTE:
return {
...state,
navStack: [action.payload],
};
case ActionTypes.SHOULD_UPDATE:
return {
...state,
shouldUpdate: true,
};
case ActionTypes.FORCE_UPDATE:
return {
...state,
forceUpdate: true,
}; |
<<<<<<<
=======
import { changePowSettings, changeAutoPromotionSettings, setLockScreenTimeout } from 'actions/settings';
import { completeSnapshotTransition, setBalanceCheckFlag } from 'actions/wallet';
import { generateAlert } from 'actions/alerts';
>>>>>>>
<<<<<<<
this.props.toggleModalActivity();
const { wallet, transitionAddresses, selectedAccountName, settings} = this.props;
=======
this.props.setBalanceCheckFlag(false);
const { wallet, transitionAddresses, selectedAccountName, settings, t } = this.props;
>>>>>>>
this.props.setBalanceCheckFlag(false);
const { wallet, transitionAddresses, selectedAccountName, settings } = this.props;
<<<<<<<
manuallySyncAccount,
transitionForSnapshot,
generateAddressesAndGetBalance
=======
setBalanceCheckFlag,
>>>>>>>
manuallySyncAccount,
transitionForSnapshot,
generateAddressesAndGetBalance,
setBalanceCheckFlag, |
<<<<<<<
EMPTY_ADDRESS_DATA: 'Empty address data.',
=======
INVALID_INPUT: 'Invalid input.',
INVALID_TRANSFER: 'Invalid transfer.',
CANNOT_SWEEP_TO_SAME_ADDRESS: 'Cannot sweep to same address.',
BALANCE_MISMATCH: 'Balance mismatch.',
PROMOTIONS_LIMIT_REACHED: 'Promotions limit reached.',
EMPTY_BUNDLE_PROVIDED: 'Empty bundle provided.',
DETECTED_INPUT_WITH_ZERO_BALANCE: 'Detected input with zero balance.',
>>>>>>>
EMPTY_ADDRESS_DATA: 'Empty address data.',
INVALID_INPUT: 'Invalid input.',
INVALID_TRANSFER: 'Invalid transfer.',
CANNOT_SWEEP_TO_SAME_ADDRESS: 'Cannot sweep to same address.',
BALANCE_MISMATCH: 'Balance mismatch.',
PROMOTIONS_LIMIT_REACHED: 'Promotions limit reached.',
EMPTY_BUNDLE_PROVIDED: 'Empty bundle provided.',
DETECTED_INPUT_WITH_ZERO_BALANCE: 'Detected input with zero balance.', |
<<<<<<<
=======
minispade.register('ember-data/~test-setup', function() {
Ember.RSVP.configure('onerror', function(reason) {
// only print error messages if they're exceptions;
// otherwise, let a future turn of the event loop
// handle the error.
if (reason && reason instanceof Error) {
Ember.Logger.log(reason, reason.stack)
throw reason;
}
});
Ember.RSVP.resolve = syncForTest(Ember.RSVP.resolve);
Ember.View.reopen({
_insertElementLater: syncForTest()
});
DS.Store.reopen({
save: syncForTest(),
createRecord: syncForTest(),
deleteRecord: syncForTest(),
push: syncForTest(),
pushMany: syncForTest(),
filter: syncForTest(),
find: syncForTest(),
findMany: syncForTest(),
findByIds: syncForTest(),
didSaveRecord: syncForTest(),
didSaveRecords: syncForTest(),
didUpdateAttribute: syncForTest(),
didUpdateAttributes: syncForTest(),
didUpdateRelationship: syncForTest(),
didUpdateRelationships: syncForTest()
});
DS.Model.reopen({
save: syncForTest(),
reload: syncForTest(),
deleteRecord: syncForTest(),
dataDidChange: Ember.observer(syncForTest(), 'data'),
updateRecordArraysLater: syncForTest()
});
DS.Errors.reopen({
add: syncForTest(),
remove: syncForTest(),
clear: syncForTest()
});
var transforms = {
'boolean': DS.BooleanTransform.create(),
'date': DS.DateTransform.create(),
'number': DS.NumberTransform.create(),
'string': DS.StringTransform.create()
};
// Prevent all tests involving serialization to require a container
DS.JSONSerializer.reopen({
transformFor: function(attributeType) {
return this._super(attributeType, true) || transforms[attributeType];
}
});
Ember.RSVP.Promise.prototype.then = syncForTest(Ember.RSVP.Promise.prototype.then);
});
EmberDev.distros = {
spade: 'ember-data-spade.js',
build: 'ember-data.js'
};
>>>>>>>
Ember.RSVP.configure('onerror', function(reason) {
// only print error messages if they're exceptions;
// otherwise, let a future turn of the event loop
// handle the error.
if (reason && reason instanceof Error) {
Ember.Logger.log(reason, reason.stack)
throw reason;
}
});
Ember.RSVP.resolve = syncForTest(Ember.RSVP.resolve);
Ember.View.reopen({
_insertElementLater: syncForTest()
});
DS.Store.reopen({
save: syncForTest(),
createRecord: syncForTest(),
deleteRecord: syncForTest(),
push: syncForTest(),
pushMany: syncForTest(),
filter: syncForTest(),
find: syncForTest(),
findMany: syncForTest(),
findByIds: syncForTest(),
didSaveRecord: syncForTest(),
didSaveRecords: syncForTest(),
didUpdateAttribute: syncForTest(),
didUpdateAttributes: syncForTest(),
didUpdateRelationship: syncForTest(),
didUpdateRelationships: syncForTest()
});
DS.Model.reopen({
save: syncForTest(),
reload: syncForTest(),
deleteRecord: syncForTest(),
dataDidChange: Ember.observer(syncForTest(), 'data'),
updateRecordArraysLater: syncForTest()
});
DS.Errors.reopen({
add: syncForTest(),
remove: syncForTest(),
clear: syncForTest()
});
var transforms = {
'boolean': DS.BooleanTransform.create(),
'date': DS.DateTransform.create(),
'number': DS.NumberTransform.create(),
'string': DS.StringTransform.create()
};
// Prevent all tests involving serialization to require a container
DS.JSONSerializer.reopen({
transformFor: function(attributeType) {
return this._super(attributeType, true) || transforms[attributeType];
}
});
Ember.RSVP.Promise.prototype.then = syncForTest(Ember.RSVP.Promise.prototype.then); |
<<<<<<<
import { clearTempData, setPassword, setSetting, setSeedIndex } from '../../shared/actions/tempAccount';
import {
setFirstUse,
getAccountInfoNewSeed,
increaseSeedCount,
addAccountName,
changeAccountName,
removeAccount,
} from '../../shared/actions/account';
import { setNode, getCurrencyData } from '../../shared/actions/settings';
import { changeIotaNode } from '../../shared/libs/iota';
=======
import { clearTempData, setPassword, setSetting, setSeedIndex} from '../../shared/actions/tempAccount';
import { setFirstUse, getAccountInfoNewSeed, increaseSeedCount, addAccountName, changeAccountName, removeAccount } from '../../shared/actions/account';
import { setNode, getCurrencyData } from '../../shared/actions/settings'
import { renameKeys } from '../../shared/libs/util'
import store from '../../shared/store';
>>>>>>>
import { clearTempData, setPassword, setSetting, setSeedIndex } from '../../shared/actions/tempAccount';
import {
setFirstUse,
getAccountInfoNewSeed,
increaseSeedCount,
addAccountName,
changeAccountName,
removeAccount,
} from '../../shared/actions/account';
import { setNode, getCurrencyData } from '../../shared/actions/settings';
import { renameKeys } from '../../shared/libs/util';
import { changeIotaNode } from '../../shared/libs/iota';
<<<<<<<
_renderSettingsContent = content => {
const accountInfo = this.props.account.accountInfo;
const seedIndex = this.props.tempAccount.seedIndex;
const currentSeedAccountInfo = accountInfo[Object.keys(accountInfo)[seedIndex]];
const addressesWithBalance = currentSeedAccountInfo.addresses;
const transfers = currentSeedAccountInfo.transfers;
=======
_renderSettingsContent = (content) => {
let accountInfo = this.props.account.accountInfo;
let seedIndex = this.props.tempAccount.seedIndex;
let currentSeedAccountInfo = accountInfo[Object.keys(accountInfo)[seedIndex]];
let addressesWithBalance = currentSeedAccountInfo.addresses || {};
let transfers = currentSeedAccountInfo.transfers || [];
const dropdown = DropdownHolder.getDropdown();
>>>>>>>
_renderSettingsContent = content => {
let accountInfo = this.props.account.accountInfo;
let seedIndex = this.props.tempAccount.seedIndex;
let currentSeedAccountInfo = accountInfo[Object.keys(accountInfo)[seedIndex]];
let addressesWithBalance = currentSeedAccountInfo.addresses || {};
let transfers = currentSeedAccountInfo.transfers || [];
const dropdown = DropdownHolder.getDropdown();
<<<<<<<
=======
>>>>>>>
<<<<<<<
// Update accountInfo
const oldAccountName = accountNameArray[seedIndex];
accountInfo[accountName] = accountInfo[oldAccountName];
delete accountInfo[oldAccountName];
// Update account names array
accountNameArray.splice(seedIndex, 1);
accountNameArray.push(accountName);
this.props.setSeedIndex(accountNameArray.length - 1);
// Update store
this.props.changeAccountName(accountInfo, accountNameArray);
dropdown.alertWithType('success', 'Account name changed', `Your account name has been changed.`);
=======
const currentAccountName = accountNameArray[seedIndex];
const keyMap = {[currentAccountName]: accountName};
const newAccountInfo = renameKeys(accountInfo, keyMap);
accountNameArray[seedIndex] = accountName;
this.props.changeAccountName(newAccountInfo, accountNameArray);
this.props.setSetting('accountManagement')
dropdown.alertWithType(
'success',
'Account name changed',
`Your account name has been changed.`,
);
>>>>>>>
const currentAccountName = accountNameArray[seedIndex];
const keyMap = { [currentAccountName]: accountName };
const newAccountInfo = renameKeys(accountInfo, keyMap);
accountNameArray[seedIndex] = accountName;
this.props.changeAccountName(newAccountInfo, accountNameArray);
this.props.setSetting('accountManagement');
dropdown.alertWithType('success', 'Account name changed', `Your account name has been changed.`);
<<<<<<<
dropdown.alertWithType('success', 'Account deleted', `Your account has been removed from the wallet.`);
=======
this.props.removeAccount(newAccountInfo, accountNames);
this.props.setSetting('accountManagement');
dropdown.alertWithType(
'success',
'Account deleted',
`Your account has been removed from the wallet.`,
);
>>>>>>>
this.props.removeAccount(newAccountInfo, accountNames);
this.props.setSetting('accountManagement');
dropdown.alertWithType('success', 'Account deleted', `Your account has been removed from the wallet.`);
<<<<<<<
onViewSeedPress() {}
onViewAddressesPress() {}
onEditAccountNamePress() {
const dropdown = DropdownHolder.getDropdown();
dropdown.alertWithType('error', 'This function is not available', 'It will be added at a later stage.');
}
onDeleteAccountPress() {
=======
onDeleteAccountPress(){
>>>>>>>
onDeleteAccountPress() {
<<<<<<<
<View style={styles.container}>
<StatusBar barStyle="light-content" />
<View style={{ flex: 1 }} />
<View style={styles.settingsContainer}>
{this._renderSettingsContent(this.props.tempAccount.currentSetting)}
</View>
<View style={{ flex: 1 }} />
<Modal
animationIn={'bounceInUp'}
animationOut={'bounceOut'}
animationInTiming={1000}
animationOutTiming={200}
backdropTransitionInTiming={500}
backdropTransitionOutTiming={200}
backdropColor={'#132d38'}
backdropOpacity={0.8}
style={{ alignItems: 'center' }}
isVisible={this.state.isModalVisible}
>
{this._renderModalContent()}
</Modal>
</View>
=======
<TouchableWithoutFeedback style={{ flex: 1 }} onPress={() => this.props.closeTopBar()}>
<View style={styles.container}>
<StatusBar barStyle="light-content" />
<View style={{flex:1}}/>
<View style={styles.settingsContainer}>{this._renderSettingsContent(this.props.tempAccount.currentSetting)}</View>
<View style={{flex:1}}/>
<Modal
animationIn={'bounceInUp'}
animationOut={'bounceOut'}
animationInTiming={1000}
animationOutTiming={200}
backdropTransitionInTiming={500}
backdropTransitionOutTiming={200}
backdropColor={'#132d38'}
backdropOpacity={0.8}
style={{ alignItems: 'center' }}
isVisible={this.state.isModalVisible}
>
{this._renderModalContent()}
</Modal>
</View>
</TouchableWithoutFeedback>
>>>>>>>
<TouchableWithoutFeedback style={{ flex: 1 }} onPress={() => this.props.closeTopBar()}>
<View style={styles.container}>
<StatusBar barStyle="light-content" />
<View style={{ flex: 1 }} />
<View style={styles.settingsContainer}>
{this._renderSettingsContent(this.props.tempAccount.currentSetting)}
</View>
<View style={{ flex: 1 }} />
<Modal
animationIn={'bounceInUp'}
animationOut={'bounceOut'}
animationInTiming={1000}
animationOutTiming={200}
backdropTransitionInTiming={500}
backdropTransitionOutTiming={200}
backdropColor={'#132d38'}
backdropOpacity={0.8}
style={{ alignItems: 'center' }}
isVisible={this.state.isModalVisible}
>
{this._renderModalContent()}
</Modal>
</View>
</TouchableWithoutFeedback>
<<<<<<<
setSeedIndex: number => dispatch(setSeedIndex(number)),
setNode: node => dispatch(setNode(node)),
getCurrencyData: currency => dispatch(getCurrencyData(currency)),
=======
setSeedIndex: (number) => dispatch(setSeedIndex(number)),
setNode: (node) => dispatch(setNode(node)),
getCurrencyData: (currency) => dispatch(getCurrencyData(currency)),
setPassword: password => dispatch(setPassword(password)),
>>>>>>>
setSeedIndex: number => dispatch(setSeedIndex(number)),
setNode: node => dispatch(setNode(node)),
getCurrencyData: currency => dispatch(getCurrencyData(currency)),
setPassword: password => dispatch(setPassword(password)), |
<<<<<<<
});
/**
* Dispatch to push to navigation stack
*
* @method pushRoute
* @param {string} payload
*
* @returns {{ type: {string}, payload: {string} }}
*/
export const pushRoute = (payload) => {
return {
type: ActionTypes.PUSH_ROUTE,
payload,
};
};
/**
* Dispatch to pop from navigation stack
*
* @method popRoute
*
* @returns {{type: {string}}}
*/
export const popRoute = () => {
return {
type: ActionTypes.POP_ROUTE,
};
};
/**
* Dispatch to set navigation root
*
* @method resetRoute
* @param {string} payload
*
* @returns {{ type: {string}, payload: {string} }}
*/
export const resetRoute = (payload) => {
return {
type: ActionTypes.RESET_ROUTE,
payload,
};
};
=======
});
/**
* Dispatch to suggest that user should update
*
* @method shouldUpdate
*
* @returns {{type: {string} }}
*/
export const shouldUpdate = () => ({
type: ActionTypes.SHOULD_UPDATE,
});
/**
* Dispatch to force user to update
*
* @method forceUpdate
*
* @returns {{type: {string} }}
*/
export const forceUpdate = () => ({
type: ActionTypes.FORCE_UPDATE,
});
>>>>>>>
});
/**
* Dispatch to push to navigation stack
*
* @method pushRoute
* @param {string} payload
*
* @returns {{ type: {string}, payload: {string} }}
*/
export const pushRoute = (payload) => {
return {
type: ActionTypes.PUSH_ROUTE,
payload,
};
};
/**
* Dispatch to pop from navigation stack
*
* @method popRoute
*
* @returns {{type: {string}}}
*/
export const popRoute = () => {
return {
type: ActionTypes.POP_ROUTE,
};
};
/**
* Dispatch to set navigation root
*
* @method resetRoute
* @param {string} payload
*
* @returns {{ type: {string}, payload: {string} }}
*/
export const resetRoute = (payload) => {
return {
type: ActionTypes.RESET_ROUTE,
payload,
};
};
/**
* Dispatch to suggest that user should update
*
* @method shouldUpdate
*
* @returns {{type: {string} }}
*/
export const shouldUpdate = () => ({
type: ActionTypes.SHOULD_UPDATE,
});
/**
* Dispatch to force user to update
*
* @method forceUpdate
*
* @returns {{type: {string} }}
*/
export const forceUpdate = () => ({
type: ActionTypes.FORCE_UPDATE,
}); |
<<<<<<<
const { remotePoW, updatePowSettings, lockScreenTimeout, ui, t } = this.props;
// snapshot transition
const { isTransitioning, isAttachingToTangle, isModalActive, transitionBalance } = this.props;
=======
const { remotePoW, changePowSettings, lockScreenTimeout, ui, t } = this.props;
>>>>>>>
const { remotePoW, changePowSettings, lockScreenTimeout, ui, t } = this.props;
// snapshot transition
const { isTransitioning, isAttachingToTangle, isModalActive, transitionBalance } = this.props; |
<<<<<<<
keychain
.get()
.then((credentials) => {
const hasData = get(credentials, 'data');
const hasCorrectPassword = get(credentials, 'password') === password;
if (hasData && hasCorrectPassword) {
=======
getPasswordFromKeychain()
.then(passwordFromKeychain => {
const hasCorrectPassword = passwordFromKeychain === password;
if (hasCorrectPassword) {
>>>>>>>
getPasswordFromKeychain()
.then((passwordFromKeychain) => {
const hasCorrectPassword = passwordFromKeychain === password;
if (hasCorrectPassword) {
<<<<<<<
.catch((err) => console.log(err)); // Dropdown
=======
.catch(err => console.log(err)); // Generate an alert.
>>>>>>>
.catch((err) => console.log(err)); // Generate an alert. |
<<<<<<<
import { clearWalletData } from 'actions/wallet';
import { getUpdateData } from 'actions/settings';
=======
import { parseAddress } from 'libs/util';
import { clearTempData } from 'actions/tempAccount';
import { getUpdateData, updateTheme } from 'actions/settings';
>>>>>>>
import { parseAddress } from 'libs/iota/utils';
import { clearWalletData } from 'actions/wallet';
import { getUpdateData, updateTheme } from 'actions/settings';
<<<<<<<
wallet: PropTypes.object.isRequired,
=======
tempAccount: PropTypes.object.isRequired,
/** Create a notification message
* @param {String} type - notification type - success, error
* @param {String} title - notification title
* @param {String} text - notification explanation
* @ignore
*/
generateAlert: PropTypes.func.isRequired,
>>>>>>>
wallet: PropTypes.object.isRequired,
/** Create a notification message
* @param {String} type - notification type - success, error
* @param {String} title - notification title
* @param {String} text - notification explanation
* @ignore
*/
generateAlert: PropTypes.func.isRequired,
<<<<<<<
componentWillMount() {
const { generateAlert, t } = this.props;
Electron.onEvent('url-params', (data) => {
let regexAddress = /\:\/\/(.*?)\/\?/;
let regexAmount = /amount=(.*?)\&/;
let regexMessage = /message=([^\n\r]*)/;
let address = data.match(regexAddress);
if (address !== null) {
let amount = data.match(regexAmount);
let message = data.match(regexMessage);
if (address[1].length !== ADDRESS_LENGTH) {
generateAlert('error', t('send:invalidAddress'), t('send:invalidAddressExplanation1'));
this.props.sendAmount(0, '', '');
} else {
this.setState({
address: address[1],
amount: amount[1],
message: message[1],
});
this.props.sendAmount(this.state.amount, this.state.address, this.state.message);
if (this.props.tempAccount.ready === true) {
this.props.history.push('/wallet/send');
}
}
}
});
}
=======
>>>>>>>
<<<<<<<
if (!this.props.wallet.ready && nextProps.wallet.ready) {
=======
if (!this.props.tempAccount.ready && nextProps.tempAccount.ready && currentKey === 'onboarding') {
>>>>>>>
if (!this.props.wallet.ready && nextProps.wallet.ready && currentKey === 'onboarding') {
<<<<<<<
const { accounts, location, activationCode } = this.props;
=======
const { account, location, activationCode, themeName, updateTheme } = this.props;
>>>>>>>
const { accounts, location, activationCode, themeName, updateTheme } = this.props; |
<<<<<<<
});
/**
* Dispatch to push to navigation stack
*
* @method pushRoute
* @param {string} payload
*
* @returns {{ type: {string}, payload: {string} }}
*/
export const pushRoute = (payload) => {
return {
type: ActionTypes.PUSH_ROUTE,
payload,
};
};
/**
* Dispatch to pop from navigation stack
*
* @method popRoute
*
* @returns {{type: {string}}}
*/
export const popRoute = () => {
return {
type: ActionTypes.POP_ROUTE,
};
};
/**
* Dispatch to set navigation root
*
* @method resetRoute
* @param {string} payload
*
* @returns {{ type: {string}, payload: {string} }}
*/
export const resetRoute = (payload) => {
return {
type: ActionTypes.RESET_ROUTE,
payload,
};
};
=======
});
/**
* Dispatch to suggest that user should update
*
* @method shouldUpdate
*
* @returns {{type: {string} }}
*/
export const shouldUpdate = () => ({
type: ActionTypes.SHOULD_UPDATE,
});
/**
* Dispatch to force user to update
*
* @method forceUpdate
*
* @returns {{type: {string} }}
*/
export const forceUpdate = () => ({
type: ActionTypes.FORCE_UPDATE,
});
>>>>>>>
});
/**
* Dispatch to push to navigation stack
*
* @method pushRoute
* @param {string} payload
*
* @returns {{ type: {string}, payload: {string} }}
*/
export const pushRoute = (payload) => {
return {
type: ActionTypes.PUSH_ROUTE,
payload,
};
};
/**
* Dispatch to pop from navigation stack
*
* @method popRoute
*
* @returns {{type: {string}}}
*/
export const popRoute = () => {
return {
type: ActionTypes.POP_ROUTE,
};
};
/**
* Dispatch to set navigation root
*
* @method resetRoute
* @param {string} payload
*
* @returns {{ type: {string}, payload: {string} }}
*/
export const resetRoute = (payload) => {
return {
type: ActionTypes.RESET_ROUTE,
payload,
};
};
/**
* Dispatch to suggest that user should update
*
* @method shouldUpdate
*
* @returns {{type: {string} }}
*/
export const shouldUpdate = () => ({
type: ActionTypes.SHOULD_UPDATE,
});
/**
* Dispatch to force user to update
*
* @method forceUpdate
*
* @returns {{type: {string} }}
*/
export const forceUpdate = () => ({
type: ActionTypes.FORCE_UPDATE,
}); |
<<<<<<<
/*
Copyright 2012 Adobe Systems, Incorporated
This work is licensed under a Creative Commons Attribution-Noncommercial-Share Alike 3.0 Unported License http://creativecommons.org/licenses/by-nc-sa/3.0/ .
Permissions beyond the scope of this license, pertaining to the examples of code included within this work are available at Adobe http://www.adobe.com/communities/guidelines/ccplus/commercialcode_plus_permission.html .
*/
!function(){
function CSSExclusions(){}
// basic feature detection
CSSExclusions.prototype.isSupported = (function(prop){
var el = document.createElement("div"),
style = el.style;
if (!el){
return false
}
=======
!function(){
var isEnabled = function() {
var el = document.createElement('div');
if (!el)
return;
>>>>>>>
/*
Copyright 2012 Adobe Systems, Incorporated
This work is licensed under a Creative Commons Attribution-Noncommercial-Share Alike 3.0 Unported License http://creativecommons.org/licenses/by-nc-sa/3.0/ .
Permissions beyond the scope of this license, pertaining to the examples of code included within this work are available at Adobe http://www.adobe.com/communities/guidelines/ccplus/commercialcode_plus_permission.html .
*/
!function(){
var isEnabled = function() {
var el = document.createElement('div');
if (!el)
return; |
<<<<<<<
window.open('call-tool.html?phoneNumber=' + phoneNumber, "Call congress", "width=786,height=900");
=======
window.open('call-tool.html?phoneNumber=' + phoneNumber, "_blank", "width=800,height=800");
>>>>>>>
window.open('call-tool.html?phoneNumber=' + phoneNumber, "_blank", "width=786,height=900");
<<<<<<<
window.open('email-tool.html?email=' + userEmail, "Email congress", "width=786,height=900");
=======
window.open('email-tool.html?email=' + userEmail, "_blank", "width=800,height=800");
>>>>>>>
window.open('email-tool.html?email=' + userEmail, "_blank", "width=786,height=900"); |
<<<<<<<
},
'test .parseComments() on single star comments with singleStar=false': function (done) {
fixture('single.js', function(err, str){
var comments = dox.parseComments(str, { singleStar: false });
comments.should.have.lengthOf(1);
comments[0].tags.should.be.empty;
comments[0].code.should.be.equal(str.trim());
comments[0].description.full.should.be.empty;
done();
});
},
'test .parseComments() on single star comments no options': function (done) {
fixture('single.js', function(err, str){
var comments = dox.parseComments(str);
comments.should.have.lengthOf(1);
comments[0].tags[0].should.be.eql({
type: 'return'
, types: [ 'Object' ]
, description: 'description'
});
comments[0].description.full.should.be.equal('<p>foo description</p>');
done();
});
=======
},
'test .api() with @alias flag': function(done){
fixture('alias.js', function(err, str){
var comments = dox.parseComments(str);
var apiDocs = dox.api(comments);
apiDocs.should.startWith(" - [hello()](#hello)\n - [window.hello()](#windowhello)\n\n");
done();
});
},
'test .api() still includes parameters using functions': function(done){
fixture('functions.js', function(err, str){
var comments = dox.parseComments(str);
var apiDocs = dox.api(comments);
apiDocs.should.containEql("## fnName(a:String, b:Number)");
done();
});
},
'test .parseComments() does not interpret jshint directives as jsdoc': function (done) {
fixture('jshint.js', function (err, str){
var comments = dox.parseComments(str);
comments.length.should.equal(1);
comments[0].description.full.should.equal("<p>something else</p>");
done();
});
},
'test skipPrefix': function (done) {
fixture('skip_prefix.js', function (err, str){
var comments = dox.parseComments(str, {skipPrefixes: ["myspecialawesomelinter"]});
comments.length.should.equal(1);
comments[0].description.full.should.equal("<p>something else</p>");
done();
});
},
'test that */* combinations in code do not cause failures': function (done) {
fixture('asterik.js', function (err, str){
var comments = dox.parseComments(str);
comments.length.should.equal(2);
comments[0].description.full.should.equal("<p>One</p>");
comments[1].description.full.should.equal("<p>Two</p>");
done();
});
},
'test event tags': function (done) {
fixture('event.js', function (err, str){
var comments = dox.parseComments(str);
//console.log(comments);
comments.length.should.equal(2);
comments[0].description.full.should.equal("<p>Throw a snowball.</p>");
comments[1].description.full.should.equal("<p>Snowball event.</p>");
comments[0].isEvent.should.be.false;
comments[1].isEvent.should.be.true;
done();
});
>>>>>>>
},
'test .parseComments() on single star comments with singleStar=false': function (done) {
fixture('single.js', function(err, str){
var comments = dox.parseComments(str, { singleStar: false });
comments.should.have.lengthOf(1);
comments[0].tags.should.be.empty;
comments[0].code.should.be.equal(str.trim());
comments[0].description.full.should.be.empty;
done();
});
},
'test .parseComments() on single star comments no options': function (done) {
fixture('single.js', function(err, str){
var comments = dox.parseComments(str);
comments.should.have.lengthOf(1);
comments[0].tags[0].should.be.eql({
type: 'return'
, types: [ 'Object' ]
, description: 'description'
});
comments[0].description.full.should.be.equal('<p>foo description</p>');
done();
});
},
'test .api() with @alias flag': function(done){
fixture('alias.js', function(err, str){
var comments = dox.parseComments(str);
var apiDocs = dox.api(comments);
apiDocs.should.startWith(" - [hello()](#hello)\n - [window.hello()](#windowhello)\n\n");
done();
});
},
'test .api() still includes parameters using functions': function(done){
fixture('functions.js', function(err, str){
var comments = dox.parseComments(str);
var apiDocs = dox.api(comments);
apiDocs.should.containEql("## fnName(a:String, b:Number)");
done();
});
},
'test .parseComments() does not interpret jshint directives as jsdoc': function (done) {
fixture('jshint.js', function (err, str){
var comments = dox.parseComments(str);
comments.length.should.equal(1);
comments[0].description.full.should.equal("<p>something else</p>");
done();
});
},
'test skipPrefix': function (done) {
fixture('skip_prefix.js', function (err, str){
var comments = dox.parseComments(str, {skipPrefixes: ["myspecialawesomelinter"]});
comments.length.should.equal(1);
comments[0].description.full.should.equal("<p>something else</p>");
done();
});
},
'test that */* combinations in code do not cause failures': function (done) {
fixture('asterik.js', function (err, str){
var comments = dox.parseComments(str);
comments.length.should.equal(2);
comments[0].description.full.should.equal("<p>One</p>");
comments[1].description.full.should.equal("<p>Two</p>");
done();
});
},
'test event tags': function (done) {
fixture('event.js', function (err, str){
var comments = dox.parseComments(str);
//console.log(comments);
comments.length.should.equal(2);
comments[0].description.full.should.equal("<p>Throw a snowball.</p>");
comments[1].description.full.should.equal("<p>Snowball event.</p>");
comments[0].isEvent.should.be.false;
comments[1].isEvent.should.be.true;
done();
}); |
<<<<<<<
return 'private' == tag.visibility;
});
=======
return 'api' == tag.type && 'private' == tag.visibility;
})
comment.isConstructor = comment.tags.some(function(tag){
return 'constructor' == tag.type || 'augments' == tag.type;
})
>>>>>>>
return 'private' == tag.visibility;
});
comment.isConstructor = comment.tags.some(function(tag){
return 'constructor' == tag.type || 'augments' == tag.type;
}) |
<<<<<<<
},
'test .parseTag() @augments': function(){
var tag = dox.parseTag('@augments otherClass');
tag.type.should.equal('augments');
tag.otherClass.should.equal('otherClass')
},
'test .parseTag() @author': function(){
var tag = dox.parseTag('@author Bob Bobson');
tag.type.should.equal('author');
tag.name.should.equal('Bob Bobson');
},
'test .parseTag() @borrows': function(){
var tag = dox.parseTag('@borrows foo as bar');
tag.type.should.equal('borrows');
tag.otherMemberName.should.equal('foo');
tag.thisMemberName.should.equal('bar');
},
'test .parseTag() @memberOf': function(){
var tag = dox.parseTag('@memberOf Foo.bar')
tag.type.should.equal('memberOf')
tag.parent.should.equal('Foo.bar')
=======
},
'test .parseTag() default': function(){
var tag = dox.parseTag('@hello universe is better than world');
tag.type.should.equal('hello');
tag.string.should.equal('universe is better than world');
>>>>>>>
},
'test .parseTag() @augments': function(){
var tag = dox.parseTag('@augments otherClass');
tag.type.should.equal('augments');
tag.otherClass.should.equal('otherClass')
},
'test .parseTag() @author': function(){
var tag = dox.parseTag('@author Bob Bobson');
tag.type.should.equal('author');
tag.name.should.equal('Bob Bobson');
},
'test .parseTag() @borrows': function(){
var tag = dox.parseTag('@borrows foo as bar');
tag.type.should.equal('borrows');
tag.otherMemberName.should.equal('foo');
tag.thisMemberName.should.equal('bar');
},
'test .parseTag() @memberOf': function(){
var tag = dox.parseTag('@memberOf Foo.bar')
tag.type.should.equal('memberOf')
tag.parent.should.equal('Foo.bar')
},
'test .parseTag() default': function(){
var tag = dox.parseTag('@hello universe is better than world');
tag.type.should.equal('hello');
tag.string.should.equal('universe is better than world'); |
<<<<<<<
var sql = this.QueryGenerator.selectQuery(tableName, options, factory)
=======
// See if we need to merge options and factory.scopeObj
// we're doing this on the QueryInterface level because it's a bridge between
// sequelize and the databases
if (Object.keys(factory.scopeObj).length > 0) {
if (!!options) {
Utils.injectScope.call(factory, options, true)
}
var scopeObj = buildScope.call(factory)
Object.keys(scopeObj).forEach(function(method) {
if (typeof scopeObj[method] === "number" || !Utils._.isEmpty(scopeObj[method])) {
options[method] = scopeObj[method]
}
})
}
var sql = this.QueryGenerator.selectQuery(tableName, options)
>>>>>>>
// See if we need to merge options and factory.scopeObj
// we're doing this on the QueryInterface level because it's a bridge between
// sequelize and the databases
if (Object.keys(factory.scopeObj).length > 0) {
if (!!options) {
Utils.injectScope.call(factory, options, true)
}
var scopeObj = buildScope.call(factory)
Object.keys(scopeObj).forEach(function(method) {
if (typeof scopeObj[method] === "number" || !Utils._.isEmpty(scopeObj[method])) {
options[method] = scopeObj[method]
}
})
}
var sql = this.QueryGenerator.selectQuery(tableName, options, factory)
<<<<<<<
var queryAndEmit = QueryInterface.prototype.queryAndEmit = function(sqlOrQueryParams, methodName, options, emitter) {
=======
// private
var buildScope = function() {
var smart
// Use smartWhere to convert several {where} objects into a single where object
smart = Utils.smartWhere(this.scopeObj.where || [], this.daoFactoryManager.sequelize.options.dialect)
smart = Utils.compileSmartWhere.call(this, smart, this.daoFactoryManager.sequelize.options.dialect)
return {limit: this.scopeObj.limit || null, offset: this.scopeObj.offset || null, where: smart, order: (this.scopeObj.order || []).join(', ')}
}
var queryAndEmit = function(sqlOrQueryParams, methodName, options, emitter) {
>>>>>>>
// private
var buildScope = function() {
var smart
// Use smartWhere to convert several {where} objects into a single where object
smart = Utils.smartWhere(this.scopeObj.where || [], this.daoFactoryManager.sequelize.options.dialect)
smart = Utils.compileSmartWhere.call(this, smart, this.daoFactoryManager.sequelize.options.dialect)
return {limit: this.scopeObj.limit || null, offset: this.scopeObj.offset || null, where: smart, order: (this.scopeObj.order || []).join(', ')}
}
var queryAndEmit = QueryInterface.prototype.queryAndEmit = function(sqlOrQueryParams, methodName, options, emitter) { |
<<<<<<<
=======
if(!this._duration) this._duration = this.tag.duration * 1000;
>>>>>>> |
<<<<<<<
if (this.$options && this.$options.include && this.$options.includeNames.indexOf(key) !== -1 && value) {
=======
if (this.options && this.options.include && this.options.includeNames.indexOf(key) !== -1) {
>>>>>>>
if (this.$options && this.$options.include && this.$options.includeNames.indexOf(key) !== -1) { |
<<<<<<<
associatedObject[self.__factory.identifier] = null
return associatedObject[associationKey]
=======
associatedObject[self.__factory.identifier] = (newAssociations.length < 1 ? null : self.instance.id)
return associatedObject.id
>>>>>>>
associatedObject[self.__factory.identifier] = (newAssociations.length < 1 ? null : self.instance.id)
return associatedObject[associationKey] |
<<<<<<<
if (typeof prepend === 'undefined')
prepend = true
if (Utils.isHash(smth)) {
if (prepend) {
smth = Utils.prependTableNameToHash(tableName, smth)
}
=======
result = "(" + result + ")"
} else if (Utils.isHash(smth)) {
smth = Utils.prependTableNameToHash(tableName, smth)
>>>>>>>
result = "(" + result + ")"
} else if (Utils.isHash(smth)) {
if (prepend) {
smth = Utils.prependTableNameToHash(tableName, smth)
} |
<<<<<<<
ssl: undefined,
pool: {}
=======
pool: {},
quoteIdentifiers: true,
language: 'en'
>>>>>>>
ssl: undefined,
pool: {},
quoteIdentifiers: true,
language: 'en' |
<<<<<<<
/**
* Builds a new model instance and calls save on it.
* @see {DAO#build}
* @see {DAO#save}
*
* @param {Object} values
* @param {Object} [options]
* @param {Boolean} [options.raw=false] If set to true, values will ignore field and virtual setters.
* @param {Boolean} [options.isNewRecord=true]
* @param {Boolean} [options.isDirty=true]
* @param {Array} [options.fields] If set, only columns matching those in fields will be saved
* @param {Array} [options.include] an array of include options - Used to build prefetched/included model instances
* @param {Transaction} [options.transaction]
*
* @return {EventEmitter} Fires `success`, `error` and `sql`. Upon success, the DAO will be passed to the success listener
*/
DAOFactory.prototype.create = function(values, fieldsOrOptions) {
=======
DAOFactory.prototype.create = function(values, options) {
>>>>>>>
/**
* Builds a new model instance and calls save on it.
* @see {DAO#build}
* @see {DAO#save}
*
* @param {Object} values
* @param {Object} [options]
* @param {Boolean} [options.raw=false] If set to true, values will ignore field and virtual setters.
* @param {Boolean} [options.isNewRecord=true]
* @param {Boolean} [options.isDirty=true]
* @param {Array} [options.fields] If set, only columns matching those in fields will be saved
* @param {Array} [options.include] an array of include options - Used to build prefetched/included model instances
* @param {Transaction} [options.transaction]
*
* @return {EventEmitter}
*/
DAOFactory.prototype.create = function(values, options) { |
<<<<<<<
* @param {Object} [options]
* @param {Boolean} [options.cascade=false] Also drop all objects depending on this table, such as views. Only works in postgres
* @param {Function} [options.logging=false] A function that gets executed while running the query to log the sql.
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
=======
* @param {Object} [options]
* @param {Boolean} [options.cascade=false] Also drop all objects depending on this table, such as views. Only works in postgres
* @param {Function} [options.logging=false] A function that gets executed while running the query to log the sql.
>>>>>>>
* @param {Object} [options]
* @param {Boolean} [options.cascade=false] Also drop all objects depending on this table, such as views. Only works in postgres
* @param {Function} [options.logging=false] A function that gets executed while running the query to log the sql.
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
<<<<<<<
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
=======
>>>>>>>
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
<<<<<<<
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
=======
>>>>>>>
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
<<<<<<<
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
=======
>>>>>>>
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
<<<<<<<
* @param {Boolean} [options.plain] When `true`, the first returned value of `aggregateFunction` is cast to `dataType` and returned. If additional attributes are specified, along with `group` clauses, set `plain` to `false` to return all values of all returned rows. Defaults to `true`
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
=======
* @param {boolean} [options.plain] When `true`, the first returned value of `aggregateFunction` is cast to `dataType` and returned. If additional attributes are specified, along with `group` clauses, set `plain` to `false` to return all values of all returned rows. Defaults to `true`
>>>>>>>
* @param {Boolean} [options.plain] When `true`, the first returned value of `aggregateFunction` is cast to `dataType` and returned. If additional attributes are specified, along with `group` clauses, set `plain` to `false` to return all values of all returned rows. Defaults to `true`
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
<<<<<<<
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
=======
>>>>>>>
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
<<<<<<<
* @param {String} [options.searchPath=DEFAULT] An optional parameter to specify the schema search_path (Postgres only)
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
=======
* @param {String} [options.searchPath=DEFAULT] An optional parameter to specify the schema search_path (Postgres only)
>>>>>>>
* @param {String} [options.searchPath=DEFAULT] An optional parameter to specify the schema search_path (Postgres only)
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
<<<<<<<
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
=======
>>>>>>>
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
<<<<<<<
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
=======
>>>>>>>
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
<<<<<<<
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
=======
>>>>>>>
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
<<<<<<<
* @param {String} [options.searchPath=DEFAULT] An optional parameter to specify the schema search_path (Postgres only)
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
*
=======
* @param {String} [options.searchPath=DEFAULT] An optional parameter to specify the schema search_path (Postgres only)
>>>>>>>
* @param {String} [options.searchPath=DEFAULT] An optional parameter to specify the schema search_path (Postgres only)
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
*
<<<<<<<
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
=======
>>>>>>>
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
<<<<<<<
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
=======
>>>>>>>
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
<<<<<<<
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL.
=======
>>>>>>>
* @param {Boolean} [options.benchmark=false] Print query execution time in milliseconds when logging SQL. |
<<<<<<<
if(dataType.references) {
template += " REFERENCES " + this.quoteIdentifier(dataType.references)
if(dataType.referencesKey) {
template += " (" + this.quoteIdentifier(dataType.referencesKey) + ")"
} else {
template += " (" + this.quoteIdentifier('id') + ")"
}
if(dataType.onDelete) {
template += " ON DELETE " + dataType.onDelete.toUpperCase()
}
if(dataType.onUpdate) {
template += " ON UPDATE " + dataType.onUpdate.toUpperCase()
}
}
result[name] = template
=======
if (dataType.comment && Utils._.isString(dataType.comment) && dataType.comment.length) {
template += " COMMENT <%= commentValue %>"
replacements.commentValue = Utils.escape(dataType.comment)
}
result[name] = Utils._.template(template)(replacements)
>>>>>>>
if(dataType.references) {
template += " REFERENCES " + this.quoteIdentifier(dataType.references)
if(dataType.referencesKey) {
template += " (" + this.quoteIdentifier(dataType.referencesKey) + ")"
} else {
template += " (" + this.quoteIdentifier('id') + ")"
}
if(dataType.onDelete) {
template += " ON DELETE " + dataType.onDelete.toUpperCase()
}
if(dataType.onUpdate) {
template += " ON UPDATE " + dataType.onUpdate.toUpperCase()
}
}
if (dataType.comment && Utils._.isString(dataType.comment) && dataType.comment.length) {
template += " COMMENT " + Utils.escape(dataType.comment)
}
result[name] = template |
<<<<<<<
self.connections[options.uuid] = new self.lib.Database(self.sequelize.options.storage || self.sequelize.options.host || ':memory:', function(err) {
=======
self.connections[options.inMemory || options.uuid] = new self.lib.Database(self.sequelize.options.storage || ':memory:', function(err) {
>>>>>>>
self.connections[options.inMemory || options.uuid] = new self.lib.Database(self.sequelize.options.storage || self.sequelize.options.host || ':memory:', function(err) { |
<<<<<<<
=======
>>>>>>>
<<<<<<<
// Test simple writing
=======
// Test simple writing
>>>>>>>
// Test simple writing
<<<<<<<
testWrite('Handles closed self-closing tags that\'re closed w/ a slash.', function(ctx) {
ctx.writeln(
'<div><object><param name="allowFullScreen" value="true" /><param></param></object></div>'
);
});
=======
>>>>>>>
testWrite('Handles closed self-closing tags that\'re closed w/ a slash.', function(ctx) {
ctx.writeln(
'<div><object><param name="allowFullScreen" value="true" /><param></param></object></div>'
);
}); |
<<<<<<<
const {
MsWorkspaceCategory,
} = Me.imports.src.layout.msWorkspace.msWorkspaceCategory;
=======
const { getSettings } = Me.imports.src.utils.settings;
>>>>>>>
const {
MsWorkspaceCategory,
} = Me.imports.src.layout.msWorkspace.msWorkspaceCategory;
const { getSettings } = Me.imports.src.utils.settings; |
<<<<<<<
this.callSafely(metaWindow, () => {
const actor = metaWindow.get_compositor_private();
const oldRect = metaWindow.get_frame_rect();
=======
this.callSafely(metaWindow, metaWindowInside => {
const actor = metaWindowInside.get_compositor_private();
let {
x: oldX,
y: oldY,
width: oldWidth,
height: oldHeight
} = actor;
>>>>>>>
this.callSafely(metaWindow, () => {
const actor = metaWindow.get_compositor_private();
let {
x: oldX,
y: oldY,
width: oldWidth,
height: oldHeight
} = actor; |
<<<<<<<
=======
app.set('views', __dirname + '/views');
app.engine('html', require('ejs').renderFile);
app.use(function(req, res, next) {
req.headers['if-none-match'] = 'no-match-for-this';
next();
});
>>>>>>>
app.set('views', __dirname + '/views');
app.engine('html', require('ejs').renderFile);
app.use(function(req, res, next) {
req.headers['if-none-match'] = 'no-match-for-this';
next();
}); |
<<<<<<<
import MainContainer from '../src/components/MainContainer.jsx'
=======
import 'animate.css/animate.min.css';
import './styles/styles.css';
import Features from './components/Features.jsx';
import Hero from './components/Hero.jsx';
import TopNavBar from './components/TopNavBar.jsx';
import 'bootstrap/dist/css/bootstrap.min.css';
>>>>>>>
import MainContainer from '../src/components/MainContainer.jsx'
import 'animate.css/animate.min.css';
import './styles/styles.css';
import Features from './components/Features.jsx';
import Hero from './components/Hero.jsx';
import TopNavBar from './components/TopNavBar.jsx';
import 'bootstrap/dist/css/bootstrap.min.css';
<<<<<<<
{/* <h1>arteMetrics under construction...</h1> */}
<MainContainer />
=======
<Particles
className="landing-bg"
params={{
particles: {
number: {
value: 200
},
size: {
value: 3
}
},
interactivity: {
events: {
onhover: {
enable: true,
mode: 'repulse'
}
}
}
}}
/>
<TopNavBar />
<Hero />
<Features />
>>>>>>>
{/* <h1>arteMetrics under construction...</h1> */}
<MainContainer />
<Particles
className="landing-bg"
params={{
particles: {
number: {
value: 200
},
size: {
value: 3
}
},
interactivity: {
events: {
onhover: {
enable: true,
mode: 'repulse'
}
}
}
}}
/>
<TopNavBar />
<Hero />
<Features /> |
<<<<<<<
<legend>Setup Mode</legend>
<input
type="checkbox"
name="showSetup"
id="showSetup"
defaultChecked={config.showSetup}
onChange={this.handleConfig}
/>
<label htmlFor="showSetup">Toggle</label>
</fieldset>
<fieldset>
=======
>>>>>>> |
<<<<<<<
if( params && params[ "filterSele" ] ){
what[ "index" ] = true;
}
=======
if( params && params[ "volume" ] !== undefined ){
what[ "color" ] = true;
}
>>>>>>>
if( params && params[ "filterSele" ] ){
what[ "index" ] = true;
}
if( params && params[ "volume" ] !== undefined ){
what[ "color" ] = true;
} |
<<<<<<<
media_overlay : {
duration : packageDocJson.metadata.mediaDuration,
narrator : packageDocJson.metadata.mediaNarrator,
activeClass : packageDocJson.metadata.mediaActiveClass,
playbackActiveClass : packageDocJson.metadata.mediaPlaybackActiveClass,
smil_models : _mo_map,
skippables: ["sidebar", "practice", "marginalia", "annotation", "help", "note", "footnote", "rearnote", "table", "table-row", "table-cell", "list", "list-item", "pagebreak"],
escapables: ["sidebar", "bibliography", "toc", "loi", "appendix", "landmarks", "lot", "index", "colophon", "epigraph", "conclusion", "afterword", "warning", "epilogue", "foreword", "introduction", "prologue", "preface", "preamble", "notice", "errata", "copyright-page", "acknowledgments", "other-credits", "titlepage", "imprimatur", "contributors", "halftitlepage", "dedication", "help", "annotation", "marginalia", "practice", "note", "footnote", "rearnote", "footnotes", "rearnotes", "bridgehead", "page-list", "table", "table-row", "table-cell", "list", "list-item", "glossary"]
},
=======
rendition_flow : packageDocJson.metadata.flow,
media_overlay : getMediaOverlay(),
>>>>>>>
rendition_flow : packageDocJson.metadata.flow,
media_overlay : {
duration : packageDocJson.metadata.mediaDuration,
narrator : packageDocJson.metadata.mediaNarrator,
activeClass : packageDocJson.metadata.mediaActiveClass,
playbackActiveClass : packageDocJson.metadata.mediaPlaybackActiveClass,
smil_models : _mo_map,
skippables: ["sidebar", "practice", "marginalia", "annotation", "help", "note", "footnote", "rearnote", "table", "table-row", "table-cell", "list", "list-item", "pagebreak"],
escapables: ["sidebar", "bibliography", "toc", "loi", "appendix", "landmarks", "lot", "index", "colophon", "epigraph", "conclusion", "afterword", "warning", "epilogue", "foreword", "introduction", "prologue", "preface", "preamble", "notice", "errata", "copyright-page", "acknowledgments", "other-credits", "titlepage", "imprimatur", "contributors", "halftitlepage", "dedication", "help", "annotation", "marginalia", "practice", "note", "footnote", "rearnote", "footnotes", "rearnotes", "bridgehead", "page-list", "table", "table-row", "table-cell", "list", "list-item", "glossary"]
}, |
<<<<<<<
=======
componentDidMount() {
document.title = "Home";
var self = this;
// var api = "https://phodal.github.io/mole-test/api/all.json";
// fetch(api)
// .then(function (response) {
// return response.json();
// })
// .then(function (data) {
// localStorage.setItem("base_url", data.source);
// localStorage.setItem("content", JSON.stringify(data.content));
//
// self.setState({
// articles: data.content
// });
// })
this.props.loadNotes();
}
>>>>>>> Get articles from reducer
renderTime(time) {
return moment(time).fromNow();
}
render() {
if (this.props.articles) {
let _articles = this.props.articles.toArray();
return (
<Layout className={s.content}>
<div className="note-list">
<<<<<<< /mnt/batch/tasks/workitems/adfv2-General_1/job-1/f7d865de-5168-4011-8917-69481430eb30/wd/.temp/athenacommon/676be1c9-7e22-4fdd-914e-f04a30b52e88.js
<<<<<<< 2765259946592b09df28f23cc6b75dc6ec199d17
{this.state.articles.map((article, i) =>
<Card shadow={0} key={i} style={{ width: '100%', margin: '0 auto 16px' }}>
=======
{ _articles.map((a, i) => {
let article = a.toObject();
return (
=======
{ _articles.map((a, i) => {
let article = a.toObject();
return (
>>>>>>>
componentDidMount() {
document.title = "Home";
var self = this;
// var api = "https://phodal.github.io/mole-test/api/all.json";
// fetch(api)
// .then(function (response) {
// return response.json();
// })
// .then(function (data) {
// localStorage.setItem("base_url", data.source);
// localStorage.setItem("content", JSON.stringify(data.content));
//
// self.setState({
// articles: data.content
// });
// })
this.props.loadNotes();
}
renderTime(time) {
return moment(time).fromNow();
}
render() {
if (this.props.articles) {
let _articles = this.props.articles.toArray();
return (
<Layout className={s.content}>
<div className="note-list">
{ _articles.map((a, i) => {
let article = a.toObject();
return (
<<<<<<<
export default NoteCreatePage;
=======
function mapStateToProps(state) {
return {
articles: state.notes
}
}
<<<<<<< /mnt/batch/tasks/workitems/adfv2-General_1/job-1/f7d865de-5168-4011-8917-69481430eb30/wd/.temp/athenacommon/676be1c9-7e22-4fdd-914e-f04a30b52e88.js
export default connect(mapStateToProps, { loadNotes })(NoteListPage);
>>>>>>> Get articles from reducer
=======
function mapStateToProps(state) {
return {
articles: state.notes
}
}
export default connect(mapStateToProps, { loadNotes })(NoteListPage);
>>>>>>>
function mapStateToProps(state) {
return {
articles: state.notes
}
}
export default connect(mapStateToProps, { loadNotes })(NoteListPage); |
<<<<<<<
atomname1 = ccb.atom_id_1[ i ];
atomname2 = ccb.atom_id_2[ i ];
bondOrder = getBondOrder( ccb.value_order[ i ] );
=======
atomname1 = ccb.atom_id_1[ i ].replace( reDoubleQuote, '' );
atomname2 = ccb.atom_id_2[ i ].replace( reDoubleQuote, '' );
valueOrder = ccb.value_order[ i ].toLowerCase();
if( valueOrder === "?" ){
bondOrder = 1; // assume single bond
}else if( valueOrder === "sing" ){
bondOrder = 1;
}else if( valueOrder === "doub" ){
bondOrder = 2;
}else if( valueOrder === "trip" ){
bondOrder = 3;
}else if( valueOrder === "quad" ){
bondOrder = 4;
}
>>>>>>>
atomname1 = ccb.atom_id_1[ i ].replace( reDoubleQuote, '' );
atomname2 = ccb.atom_id_2[ i ].replace( reDoubleQuote, '' );
bondOrder = getBondOrder( ccb.value_order[ i ] ); |
<<<<<<<
this._handleShowThumbnailsChanged();
=======
this._handleWraparoundModeChanged();
>>>>>>>
this._handleShowThumbnailsChanged();
this._handleWraparoundModeChanged();
<<<<<<<
this.settingsHandlerShowThumbnails = this.settings.connect(
'changed::show-thumbnails',
this._handleShowThumbnailsChanged.bind(this)
);
=======
this.settingsHandlerWraparoundMode = this.settings.connect(
'changed::wraparound-mode',
this._handleWraparoundModeChanged.bind(this)
);
>>>>>>>
this.settingsHandlerShowThumbnails = this.settings.connect(
'changed::show-thumbnails',
this._handleShowThumbnailsChanged.bind(this)
);
this.settingsHandlerWraparoundMode = this.settings.connect(
'changed::wraparound-mode',
this._handleWraparoundModeChanged.bind(this)
);
<<<<<<<
this.settings.disconnect(this.settingsHandlerShowThumbnails);
=======
this.settings.disconnect(this.settingsHandlerWrapAroundMode);
>>>>>>>
this.settings.disconnect(this.settingsHandlerShowThumbnails);
this.settings.disconnect(this.settingsHandlerWrapAroundMode);
<<<<<<<
_handleShowThumbnailsChanged() {
this.showThumbnails = this.settings.get_boolean('show-thumbnails');
}
=======
_handleWraparoundModeChanged() {
this.wraparoundMode = this.settings.get_enum('wraparound-mode');
}
>>>>>>>
_handleShowThumbnailsChanged() {
this.showThumbnails = this.settings.get_boolean('show-thumbnails');
}
_handleWraparoundModeChanged() {
this.wraparoundMode = this.settings.get_enum('wraparound-mode');
}
<<<<<<<
this.wm._workspaceSwitcherPopup = new WsmatrixPopup(this.rows, this.columns, this.scale, this.showThumbnails);
=======
this.wm._workspaceSwitcherPopup = new WsmatrixPopup(
this.rows,
this.columns,
this.scale,
this.popupTimeout
);
>>>>>>>
this.wm._workspaceSwitcherPopup = new WsmatrixPopup(
this.rows,
this.columns,
this.scale,
this.popupTimeout,
this.showThumbnails
); |
<<<<<<<
import {Box, Heading, Text, Absolute, Relative} from '@primer/components'
=======
import {Box, Heading, Text, Link, FlexItem} from '@primer/components'
>>>>>>>
import {Box, Heading, Text, FlexItem, Absolute, Relative} from '@primer/components'
<<<<<<<
</Box>
</Box>
</Box>
)
}
=======
</FlexItem>
<FlexItem px={4} my={[4,3,0]} width={[1, 1, 6/12, 7/12]}>
<Heading color="blue.4" mb={2} fontSize={[48, 56, 84]} fontWeight='bold'>Primer</Heading>
<Text color="blue.2" fontSize={[4,5,5,7]} lineHeight={1.25}>Resources, tooling, and design guidelines for building interfaces with GitHub’s design system</Text>
<Text is="p" color="blue.3" mt={4} className="text-mono">
<LinkLight fontSize={[0,1,2]}
href='https://styleguide.github.com/primer/'>
Style guide
</LinkLight> ・
<LinkLight ml={2} fontSize={[0,1,2]}
href='https://spectrum.chat/primer'>
Community
</LinkLight> ・
<LinkLight ml={2} fontSize={[0,1,2]}
href='https://github.com/primer/'>
Open-source
</LinkLight>
</Text>
</FlexItem>
</IndexGrid>
</Box>
)
export default Hero
>>>>>>>
)
} |
<<<<<<<
var value;
=======
var value;
>>>>>>>
var value;
<<<<<<<
value = options.value;
if (options.debounce) HOTDRINK_DEBOUNCE_THRESHOLD = options.debounce;
if (options.toView || options.toModel || options.validate) {
if (!hd.isScratch(value)) {
value = hd.scratch(value);
}
if (options.validate) {
value.validate.prependOutgoing(options.validate);
}
if (options.toModel) {
value.validate.prependOutgoing(options.toModel);
}
if (options.toView) {
value.validate.incoming(options.toView);
}
}
}
else {
value = options;
=======
value = options.value;
if (options.debounce) {
HOTDRINK_DEBOUNCE_THRESHOLD = options.debounce;
}
} else {
value = options;
>>>>>>>
value = options.value;
if (options.debounce) {
HOTDRINK_DEBOUNCE_THRESHOLD = options.debounce;
}
if (options.toView || options.toModel || options.validate) {
if (!hd.isScratch(value)) {
value = hd.scratch(value);
}
if (options.validate) {
value.validate.prependOutgoing(options.validate);
}
if (options.toModel) {
value.validate.prependOutgoing(options.toModel);
}
if (options.toView) {
value.validate.incoming(options.toView);
}
}
}
else {
value = options; |
<<<<<<<
dest: 'dist',
themeConfig: {
sidebar: [
['/', '前言'],
{
title: '第一章 准备工作',
children: [
['/准备工作/React理念', 'React理念']
]
}
]
}
=======
dest: 'dist',
serviceWorker: false,
themeConfig: {
repo: 'BetaSu/just-react',
editLinks: true,
docsDir: 'docs',
editLinkText: '在 GitHub 上编辑此页',
lastUpdated: '上次更新',
nav: [
{
text: '配套代码',
link: 'https://github.com/BetaSu/react-on-the-way'
}
],
sidebar: [
{
title: '设计思想',
collapsable: false,
children: [
]
}
]
}
>>>>>>>
dest: 'dist',
serviceWorker: false,
themeConfig: {
repo: 'BetaSu/just-react',
editLinks: true,
docsDir: 'docs',
editLinkText: '在 GitHub 上编辑此页',
lastUpdated: '上次更新',
nav: [
{
text: '配套代码',
link: 'https://github.com/BetaSu/react-on-the-way'
}
],
sidebar: [
['/', '前言'],
{
title: '第一章 准备工作',
children: [
['/准备工作/React理念', 'React理念']
]
}
]
} |
<<<<<<<
datasetIndex: datasetIndex,
// encode: {
// itemName: dimName,
// value: meaName
// },
=======
>>>>>>>
datasetIndex: datasetIndex,
// encode: {
// itemName: dimName,
// value: meaName
// }, |
<<<<<<<
questions.push({
name: 'stage',
message: 'Stage',
type: 'list',
choices: () => envs
})
} else {
if (!opts.env) { throw new Error('No aliases found, please deploy your functions before trying to look at their logs') }
=======
questions = [
{
name: 'env',
message: 'Environment',
type: 'list',
choices: () => envs
},
{
name: 'name',
message: 'Function',
type: 'list',
choices: () => load.funcs()
}
]
} else if (!opts.env) {
throw new Error('Unable to load environments, please provide a specific one via the --env flag')
>>>>>>>
questions.push({
name: 'env',
message: 'Environment',
type: 'list',
choices: () => envs
})
} else if (!opts.env) {
throw new Error('No aliases found, please deploy your functions before trying to look at their logs') |
<<<<<<<
=======
* An event which is occurring when the a button is released.
* Issued object: {@link enchant.Game}, {@link enchant.Scene}
* @type {String}
*/
enchant.Event.A_BUTTON_UP = 'abuttonup';
/**
* An event which is occurring when the b button is pressed.
* Issued object: {@link enchant.Game}, {@link enchant.Scene}
* @type {String}
*/
enchant.Event.B_BUTTON_DOWN = 'bbuttondown';
/**
* An event which is occurring when the b button is released.
* Issued object: {@link enchant.Game}, {@link enchant.Scene}
* @type {String}
*/
enchant.Event.B_BUTTON_UP = 'bbuttonup';
/**
* アクションがタイムラインに追加された時に発行されるイベント
* @type {String}
*/
enchant.Event.ADDED_TO_TIMELINE = "addedtotimeline";
/**
* アクションがタイムラインから削除された時に発行されるイベント
* looped が設定されている時も、アクションは一度タイムラインから削除されもう一度追加される
* @type {String}
*/
enchant.Event.REMOVED_FROM_TIMELINE = "removedfromtimeline";
/**
* アクションが開始された時に発行されるイベント
* @type {String}
*/
enchant.Event.ACTION_START = "actionstart";
/**
* アクションが終了するときに発行されるイベント
* @type {String}
*/
enchant.Event.ACTION_END = "actionend";
/**
* アクションが1フレーム経過するときに発行されるイベント
* @type {String}
*/
enchant.Event.ACTION_TICK = "actiontick";
/**
* アクションが追加された時に、タイムラインに対して発行されるイベント
* @type {String}
*/
enchant.Event.ACTION_ADDED = "actionadded";
/**
* アクションが削除された時に、タイムラインに対して発行されるイベント
* @type {String}
*/
enchant.Event.ACTION_REMOVED = "actionremoved";
/**
* @scope enchant.EventTarget.prototype
*/
enchant.EventTarget = enchant.Class.create({
/**
* A class for an independent implementation of events
* similar to DOM Events.
* However, it does not include the phase concept.
>>>>>>>
<<<<<<<
this._dirty = false;
this.redraw(0, 0, core.width, core.height);
=======
this.redraw(0, 0, game.width, game.height);
>>>>>>>
this.redraw(0, 0, core.width, core.height);
<<<<<<<
if (core._debug) {
if (node instanceof enchant.Label || node instanceof enchant.Sprite) {
ctx.strokeStyle = '#ff0000';
=======
enchant.DomlessManager = enchant.Class.create({
initialize: function(node) {
this._domRef = [];
this.targetNode = node;
},
_register: function(element, nextElement) {
var i = this._domRef.indexOf(nextElement);
if (element instanceof DocumentFragment) {
if (i === -1) {
Array.prototype.push.apply(this._domRef, element.childNodes);
} else {
//this._domRef.splice(i, 0, element);
Array.prototype.splice.apply(this._domRef, [i, 0].join(element.childNodes));
}
} else {
if (i === -1) {
this._domRef.push(element);
>>>>>>>
enchant.DomlessManager = enchant.Class.create({
initialize: function(node) {
this._domRef = [];
this.targetNode = node;
},
_register: function(element, nextElement) {
var i = this._domRef.indexOf(nextElement);
if (element instanceof DocumentFragment) {
if (i === -1) {
Array.prototype.push.apply(this._domRef, element.childNodes);
} else {
//this._domRef.splice(i, 0, element);
Array.prototype.splice.apply(this._domRef, [i, 0].join(element.childNodes));
}
} else {
if (i === -1) {
this._domRef.push(element);
<<<<<<<
* Class that becomes the root of the display object tree.
*
* @example
* var scene = new CanvasScene();
* scene.addChild(player);
* scene.addChild(enemy);
* core.pushScene(scene);
*
=======
* A class which is using HTML Canvas for the rendering.
* The rendering of children will be replaced by the Canvas rendering.
>>>>>>>
* A class which is using HTML Canvas for the rendering.
* The rendering of children will be replaced by the Canvas rendering.
<<<<<<<
this._element.style[enchant.ENV.VENDOR_PREFIX + 'Transform'] = 'scale(' + enchant.Core.instance.scale + ')';
=======
this._element.style[enchant.ENV.VENDOR_PREFIX + 'Transform'] = 'scale(' + enchant.Game.instance.scale + ')';
this._layers = {};
this._layerPriority = [];
this.addLayer('Canvas');
this.addLayer('Dom');
this.addEventListener(enchant.Event.CHILD_ADDED, this._onchildadded);
this.addEventListener(enchant.Event.CHILD_REMOVED, this._onchildremoved);
this.addEventListener(enchant.Event.ENTER, this._onenter);
this.addEventListener(enchant.Event.EXIT, this._onexit);
>>>>>>>
this._element.style[enchant.ENV.VENDOR_PREFIX + 'Transform'] = 'scale(' + enchant.Game.instance.scale + ')';
this._layers = {};
this._layerPriority = [];
this.addLayer('Canvas');
this.addLayer('Dom');
this.addEventListener(enchant.Event.CHILD_ADDED, this._onchildadded);
this.addEventListener(enchant.Event.CHILD_REMOVED, this._onchildremoved);
this.addEventListener(enchant.Event.ENTER, this._onenter);
this.addEventListener(enchant.Event.EXIT, this._onexit);
var that = this;
this._dispatchExitframe = function() {
var layer;
for (var prop in that._layers) {
layer = that._layers[prop];
layer.dispatchEvent(new enchant.Event(enchant.Event.EXIT_FRAME));
}
}; |
<<<<<<<
* 発行するオブジェクト: {@link enchant.Game}
=======
* 発行するオブジェクト: enchant.Core
>>>>>>>
* 発行するオブジェクト: enchant.Core
<<<<<<<
* An event dispatched upon completion of game loading.
=======
* Event activated upon completion of core loading.
>>>>>>>
* Event activated upon completion of core loading.
<<<<<<<
* Issued object: {@link enchant.Game}
=======
* Issued object: enchant.Core
>>>>>>>
* Issued object: {@link enchant.Core}
<<<<<<<
* @scope enchant.Game.prototype
=======
[lang:ja]
* @scope enchant.Core.prototype
[/lang]
[lang:en]
* @scope enchant.Core.prototype
[/lang]
>>>>>>>
[lang:ja]
* @scope enchant.Core.prototype
[/lang]
[lang:en]
* @scope enchant.Core.prototype
[/lang]
<<<<<<<
* プリロードを行うよう設定されたファイルは{@link enchant.Game#start}が実行されるとき
* ロードが行われる. 全てのファイルのロードが完了したときはGameオブジェクトから{@link enchant.Event.LOAD}
* イベントが発行され, Gameオブジェクトの{@link enchant.Game#assets}プロパティから画像ファイルの場合は
* {@link enchant.Surface}オブジェクトとして, 音声ファイルの場合は{@link enchant.Sound}オブジェクトとして,
=======
* プリロードを行うよう設定されたファイルはenchant.Core#startが実行されるとき
* ロードが行われる. 全てのファイルのロードが完了したときはCoreオブジェクトからload
* イベントが発行され, Coreオブジェクトのassetsプロパティから画像ファイルの場合は
* Surfaceオブジェクトとして, 音声ファイルの場合はSoundオブジェクトとして,
>>>>>>>
* プリロードを行うよう設定されたファイルはenchant.Core#startが実行されるとき
* ロードが行われる. 全てのファイルのロードが完了したときはCoreオブジェクトからload
* イベントが発行され, Coreオブジェクトのassetsプロパティから画像ファイルの場合は
* Surfaceオブジェクトとして, 音声ファイルの場合はSoundオブジェクトとして,
<<<<<<<
* Sets files which are to be preloaded. When {@link enchant.Game#start} is called the
* actual loading takes place. When all files are loaded, a {@link enchant.Event.LOAD} event
* is dispatched from the Game object. Depending on the type of the file different objects will be
* created and stored in {@link enchant.Game#assets} Variable.
* When an image file is loaded, an {@link enchant.Surface} is created. If a sound file is loaded, an
* {@link enchant.Sound} object is created. Otherwise it will be accessible as a string.
=======
* enchant is a file set to execute preload. It is loaded when
* Core#start is activated. When all files are loaded, load events are activated
* from Core objects. When an image file is from Core object assets properties,
* it will as a Surface object, or a Sound object for sound files,
* and in other cases it will be accessible as string.
>>>>>>>
* enchant is a file set to execute preload. It is loaded when
* Core#start is activated. When all files are loaded, load events are activated
* from Core objects. When an image file is from Core object assets properties,
* it will as a Surface object, or a Sound object for sound files,
* and in other cases it will be accessible as string.
<<<<<<<
* Game debug mode can be set to on even if enchant.Game.instance._debug
* flag is already set to true.
[/lang]
[lang:de]
* Startet den Debug-Modus des Spieles.
*
* Auch wenn die enchant.Game.instance._debug Variable gesetzt ist,
* kann der Debug-Modus gestartet werden.
=======
* Core debug mode can be set to on even if enchant.Core.instance._debug flag is set to true.
>>>>>>>
* Core debug mode can be set to on even if enchant.Core.instance._debug flag is set to true.
<<<<<<<
* Resumes the game.
[/lang]
[lang:de]
* Setzt die Ausführung des Spieles fort.
=======
* Resumes core.
>>>>>>>
* Resumes core.
<<<<<<<
* {@link enchant.Game#pushScene}を行うとSceneをスタックの一番上に積むことができる. スタックの
=======
* enchant.Core#pushSceneを行うとSceneをスタックの一番上に積むことができる. スタックの
>>>>>>>
* enchant.Core#pushSceneを行うとSceneをスタックの一番上に積むことができる. スタックの
<<<<<<<
* {@link enchant.Game#popScene}を行うとスタックの一番上のSceneを取り出すことができる.
=======
* enchant.Core#popSceneを行うとスタックの一番上のSceneを取り出すことができる.
>>>>>>>
* enchant.Core#popSceneを行うとスタックの一番上のSceneを取り出すことができる.
<<<<<<<
* Scenes are controlled using a stack, and the display order also obeys that stack order.
* When {@link enchant.Game#popScene} is executed, the Scene at the top of the stack
* will be removed and returned.
=======
* Scene is controlled in stack, with display order obeying stack order.
* When enchant.Core#popScene is activated, the Scene at the top of the stack can be pulled out.
>>>>>>>
* Scene is controlled in stack, with display order obeying stack order.
* When enchant.Core#popScene is activated, the Scene at the top of the stack can be pulled out.
<<<<<<<
* {@link enchant.Game#popScene}, {@link enchant.Game#pushScene}を同時に行う.
=======
* enchant.Core#popScene, enchant.Core#pushSceneを同時に行う.
>>>>>>>
* enchant.Core#popScene, enchant.Core#pushSceneを同時に行う.
<<<<<<<
* Get the elapsed game time (not actual) from when game.start was called.
* @return {Number} The elapsed time (seconds)
[/lang]
[lang:de]
* Liefert die vergange Spielzeit (keine reale) die seit dem Aufruf von game.start
* vergangen ist.
* @return {Number} Die vergangene Zeit (Sekunden)
=======
* get elapsed time from core.start is called
* @return {Number} elapsed time (seconds)
>>>>>>>
* get elapsed time from core.start is called
* @return {Number} elapsed time (seconds)
<<<<<<<
=======
* enchant.Core is moved to enchant.Core from v0.6
* @type {*}
*/
enchant.Game = enchant.Core;
/**
[lang:ja]
* @scope enchant.Node.prototype
[/lang]
[lang:en]
>>>>>>>
* enchant.Core is moved to enchant.Core from v0.6
* @type {*}
*/
enchant.Game = enchant.Core;
/**
<<<<<<<
=======
* @example
* var bear = new Sprite(32, 32);
* bear.image = core.assets['chara1.gif'];
*
>>>>>>>
<<<<<<<
* bear.image = game.assets['chara1.gif'];
*
=======
* bear.image = core.assets['chara1.gif'];
*
* @param {Number} [width] Sprite width.g
* @param {Number} [height] Sprite height.
>>>>>>>
* bear.image = core.assets['chara1.gif'];
*
* @param {Number} [width] Sprite width.g
* @param {Number} [height] Sprite height.
<<<<<<<
var game = enchant.Game.instance;
if (this.width !== 0 && this.height !== 0) {
ctx.save();
ctx.setTransform(1, 0, 0, 1, 0, 0);
var cvs = this._context.canvas;
ctx.drawImage(cvs, 0, 0, game.width, game.height);
ctx.restore();
}
=======
var core = enchant.Core.instance;
ctx.save();
ctx.setTransform(1, 0, 0, 1, 0, 0);
var cvs = this._context.canvas;
ctx.drawImage(cvs, 0, 0, core.width, core.height);
ctx.restore();
>>>>>>>
var core = enchant.Core.instance;
if (this.width !== 0 && this.height !== 0) {
ctx.save();
ctx.setTransform(1, 0, 0, 1, 0, 0);
var cvs = this._context.canvas;
ctx.drawImage(cvs, 0, 0, core.width, core.height);
ctx.restore();
}
<<<<<<<
this._element.addEventListener('mousedown', function(e) {
var x = e.pageX;
var y = e.pageY;
e = new enchant.Event('touchstart');
e.identifier = game._mousedownID;
e._initPosition(x, y);
_touchstartFromDom.call(that, e);
that._mousedown = true;
}, false);
game._element.addEventListener('mousemove', function(e) {
if (!that._mousedown) {
return;
}
var x = e.pageX;
var y = e.pageY;
e = new enchant.Event('touchmove');
e.identifier = game._mousedownID;
e._initPosition(x, y);
_touchmoveFromDom.call(that, e);
}, false);
game._element.addEventListener('mouseup', function(e) {
if (!that._mousedown) {
return;
}
var x = e.pageX;
var y = e.pageY;
e = new enchant.Event('touchend');
e.identifier = game._mousedownID;
e._initPosition(x, y);
_touchendFromDom.call(that, e);
that._mousedown = false;
}, false);
=======
this._element.addEventListener('mousedown', function(e) {
var x = e.pageX;
var y = e.pageY;
e = new enchant.Event('touchstart');
e.identifier = core._mousedownID;
e._initPosition(x, y);
_touchstartFromDom.call(that, e);
that._mousedown = true;
}, false);
core._element.addEventListener('mousemove', function(e) {
if (!that._mousedown) {
return;
}
var x = e.pageX;
var y = e.pageY;
e = new enchant.Event('touchmove');
e.identifier = core._mousedownID;
e._initPosition(x, y);
_touchmoveFromDom.call(that, e);
}, false);
core._element.addEventListener('mouseup', function(e) {
if (!that._mousedown) {
return;
}
var x = e.pageX;
var y = e.pageY;
e = new enchant.Event('touchend');
e.identifier = core._mousedownID;
e._initPosition(x, y);
_touchendFromDom.call(that, e);
that._mousedown = false;
}, false);
>>>>>>>
this._element.addEventListener('mousedown', function(e) {
var x = e.pageX;
var y = e.pageY;
e = new enchant.Event('touchstart');
e.identifier = core._mousedownID;
e._initPosition(x, y);
_touchstartFromDom.call(that, e);
that._mousedown = true;
}, false);
core._element.addEventListener('mousemove', function(e) {
if (!that._mousedown) {
return;
}
var x = e.pageX;
var y = e.pageY;
e = new enchant.Event('touchmove');
e.identifier = core._mousedownID;
e._initPosition(x, y);
_touchmoveFromDom.call(that, e);
}, false);
core._element.addEventListener('mouseup', function(e) {
if (!that._mousedown) {
return;
}
var x = e.pageX;
var y = e.pageY;
e = new enchant.Event('touchend');
e.identifier = core._mousedownID;
e._initPosition(x, y);
_touchendFromDom.call(that, e);
that._mousedown = false;
}, false); |
<<<<<<<
* @scope enchant.Entity.prototype
=======
* @scope enchant.Entity.prototype
>>>>>>>
* @scope enchant.Entity.prototype
<<<<<<<
=======
//this._collectizeConstructor();
this.enableCollection();
>>>>>>>
<<<<<<<
if (this._dirty) {
this._updateCoordinate();
} if (other._dirty) {
other._updateCoordinate();
}
=======
if (other instanceof enchant.Entity) {
return this._intersectone(other);
} else if (typeof other === 'function' && other.collection) {
return _intersectBetweenClassAndInstance(other, this);
}
return false;
},
_intersectone: function(other) {
>>>>>>>
if (other instanceof enchant.Entity) {
return this._intersectone(other);
} else if (typeof other === 'function' && other.collection) {
return _intersectBetweenClassAndInstance(other, this);
}
return false;
},
_intersectone: function(other) {
if (this._dirty) {
this._updateCoordinate();
} if (other._dirty) {
other._updateCoordinate();
} |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.