conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
sendText(text: string, options?: Object): Promise<any> {
=======
/**
* Set delay before sending every messages.
*
*/
setMessageDelay(milliseconds: number): void {
this._messageDelay = milliseconds;
}
/**
* Delay and show indicators for milliseconds.
*
*/
async typing(milliseconds: number): Promise<void> {
await this.turnTypingIndicatorsOn();
await sleep(milliseconds);
await this.turnTypingIndicatorsOff();
}
/**
* Send text to the owner of then session.
*
*/
sendText(text: string): Promise<any> {
>>>>>>>
/**
* Set delay before sending every messages.
*
*/
setMessageDelay(milliseconds: number): void {
this._messageDelay = milliseconds;
}
/**
* Delay and show indicators for milliseconds.
*
*/
async typing(milliseconds: number): Promise<void> {
await this.turnTypingIndicatorsOn();
await sleep(milliseconds);
await this.turnTypingIndicatorsOff();
}
/**
* Send text to the owner of then session.
*
*/
sendText(text: string, options?: Object): Promise<any> {
<<<<<<<
args: options
? [this._session.user.id, text, options]
: [this._session.user.id, text],
delay: DEFAULT_MESSAGE_DELAY,
=======
args: [this._session.user.id, text],
delay: this._messageDelay,
>>>>>>>
args: options
? [this._session.user.id, text, options]
: [this._session.user.id, text],
delay: this._messageDelay, |
<<<<<<<
title: 'Components|Input',
=======
title: 'Base|Inputs',
decorators: [
story => `<div class="sprk-o-Box">${story()}</div>`,
],
>>>>>>>
title: 'Components|Input',
decorators: [
story => `<div class="sprk-o-Box">${story()}</div>`,
], |
<<<<<<<
import SprkListDocs from './SprkListDocs/SprkListDocs';
=======
import NotFound from './NotFound/NotFound';
import SprkAlertDocs from './SprkAlertDocs/SprkAlertDocs';
>>>>>>>
import SprkListDocs from './SprkListDocs/SprkListDocs';
import NotFound from './NotFound/NotFound';
import SprkAlertDocs from './SprkAlertDocs/SprkAlertDocs';
<<<<<<<
<Route exact path="/lists" component={SprkListDocs} />
</Switch>
=======
<Route exact path="/alerts" component={SprkAlertDocs} />
<Route component={NotFound} />
</Switch>
>>>>>>>
<Route exact path="/lists" component={SprkListDocs} />
<Route exact path="/alerts" component={SprkAlertDocs} />
<Route component={NotFound} />
</Switch> |
<<<<<<<
decorators: [
story => <div className="sprk-o-Box">{story()}</div>
],
parameters: { jest: ['SprkTable'] },
=======
parameters: {
jest: ['SprkTable'],
info: `
##### For design and usage information check out the [documentation.](https://spark-docs.netlify.com/using-spark/components/table)
`,
},
>>>>>>>
decorators: [
story => <div className="sprk-o-Box">{story()}</div>
],
parameters: {
jest: ['SprkTable'],
info: `
##### For design and usage information check out the [documentation.](https://spark-docs.netlify.com/using-spark/components/table)
`,
}, |
<<<<<<<
<li>
<Link to="/promos" className="drizzle-b-Link drizzle-b-Link--light">
Promos
</Link>
</li>
=======
<li>
<Link to="/links" className="drizzle-b-Link drizzle-b-Link--light">
Links
</Link>
</li>
>>>>>>>
<li>
<Link to="/links" className="drizzle-b-Link drizzle-b-Link--light">
Links
</Link>
</li>
<li>
<Link to="/promos" className="drizzle-b-Link drizzle-b-Link--light">
Promos
</Link>
</li> |
<<<<<<<
import '!style-loader!css-loader!sass-loader!../../storybook-utilities/storybook-theming/font-loader.scss';
import '../../storybook-utilities/icon-loader';
import { setCompodocJson } from '@storybook/addon-docs/angular';
=======
import '!style-loader!css-loader!sass-loader!../../storybook-theming/font-loader.scss';
import '../../storybook-theming/icon-loader';
import { setCompodocJson, extractProps } from '@storybook/addon-docs/angular';
>>>>>>>
import '!style-loader!css-loader!sass-loader!../../storybook-utilities/storybook-theming/font-loader.scss';
import '../../storybook-utilities/icon-loader';
import { setCompodocJson, extractProps } from '@storybook/addon-docs/angular'; |
<<<<<<<
<li>
<Link to="/tables" className="drizzle-b-Link drizzle-b-Link--light">
Tables
</Link>
</li>
=======
<li>
<Link to="/dictionary" className="drizzle-b-Link drizzle-b-Link--light">
Dictionary
</Link>
</li>
>>>>>>>
<li>
<Link to="/tables" className="drizzle-b-Link drizzle-b-Link--light">
Tables
</Link>
</li>
<li>
<Link to="/dictionary" className="drizzle-b-Link drizzle-b-Link--light">
Dictionary
</Link>
</li> |
<<<<<<<
import { markdownLinkBuilder } from '../../../../storybook-utilities/markdownLinkBuilder';
=======
import SprkMastheadAccordion from './components/SprkMastheadAccordion/SprkMastheadAccordion';
import SprkMastheadAccordionItem from './components/SprkMastheadAccordionItem/SprkMastheadAccordionItem';
import SprkMastheadLittleNav from './components/SprkMastheadLittleNav/SprkMastheadLittleNav';
import SprkMastheadBigNav from './components/SprkMastheadBigNav/SprkMastheadBigNav';
import SprkMastheadDropdown from './components/SprkMastheadDropdown/SprkMastheadDropdown';
import SprkMastheadMenuIcon from './components/SprkMastheadMenuIcon/SprkMastheadMenuIcon';
import SprkMastheadNarrowNav from './components/SprkMastheadNarrowNav/SprkMastheadNarrowNav';
import SprkMastheadSelector from './components/SprkMastheadSelector/SprkMastheadSelector';
>>>>>>>
import { markdownLinkBuilder } from '../../../../storybook-utilities/markdownLinkBuilder';
import SprkMastheadAccordion from './components/SprkMastheadAccordion/SprkMastheadAccordion';
import SprkMastheadAccordionItem from './components/SprkMastheadAccordionItem/SprkMastheadAccordionItem';
import SprkMastheadLittleNav from './components/SprkMastheadLittleNav/SprkMastheadLittleNav';
import SprkMastheadBigNav from './components/SprkMastheadBigNav/SprkMastheadBigNav';
import SprkMastheadDropdown from './components/SprkMastheadDropdown/SprkMastheadDropdown';
import SprkMastheadMenuIcon from './components/SprkMastheadMenuIcon/SprkMastheadMenuIcon';
import SprkMastheadNarrowNav from './components/SprkMastheadNarrowNav/SprkMastheadNarrowNav';
import SprkMastheadSelector from './components/SprkMastheadSelector/SprkMastheadSelector'; |
<<<<<<<
import SprkButtonDocs from './SprkButtonDocs/SprkButtonDocs';
=======
import SparkButtonDocs from './SparkButtonDocs/SparkButtonDocs';
import SprkLinkDocs from './SprkLinkDocs/SprkLinkDocs';
>>>>>>>
import SprkButtonDocs from './SprkButtonDocs/SprkButtonDocs';
import SprkLinkDocs from './SprkLinkDocs/SprkLinkDocs';
<<<<<<<
<Route exact path="/buttons" component={SprkButtonDocs} />
=======
<Route exact path="/buttons" component={SparkButtonDocs} />
<Route exact path="/links" component={SprkLinkDocs} />
>>>>>>>
<Route exact path="/buttons" component={SprkButtonDocs} />
<Route exact path="/links" component={SprkLinkDocs} /> |
<<<<<<<
export { default as SprkPromo } from './SprkPromo/SprkPromo';
export { default as SprkSpinner } from './SprkSpinner/SprkSpinner';
=======
export { default as SprkSpinner } from './SprkSpinner/SprkSpinner';
export { default as SprkAlert } from './SprkAlert/SprkAlert';
>>>>>>>
export { default as SprkPromo } from './SprkPromo/SprkPromo';
export { default as SprkSpinner } from './SprkSpinner/SprkSpinner';
export { default as SprkAlert } from './SprkAlert/SprkAlert'; |
<<<<<<<
iconRight={iconRight}
=======
disabled={disabled}
>>>>>>>
iconRight={iconRight}
disabled={disabled} |
<<<<<<<
import SprkPromoDocs from './SprkPromoDocs/SprkPromoDocs';
=======
import SprkLinkDocs from './SprkLinkDocs/SprkLinkDocs';
>>>>>>>
import SprkLinkDocs from './SprkLinkDocs/SprkLinkDocs';
import SprkPromoDocs from './SprkPromoDocs/SprkPromoDocs';
<<<<<<<
<Route exact path="/promos" component={SprkPromoDocs} />
=======
<Route exact path="/links" component={SprkLinkDocs} />
>>>>>>>
<Route exact path="/links" component={SprkLinkDocs} />
<Route exact path="/promos" component={SprkPromoDocs} /> |
<<<<<<<
title: 'Components|Divider',
=======
title: 'Components|Dividers',
decorators: [
story => `<div class="sprk-o-Box">${story()}</div>`,
],
>>>>>>>
title: 'Components|Divider',
decorators: [
story => `<div class="sprk-o-Box">${story()}</div>`,
], |
<<<<<<<
import { markdownLinkBuilder } from '../../../../storybook-utilities/markdownLinkBuilder';
=======
import SprkStepperSlider from './components/SprkStepperSlider/SprkStepperSlider';
>>>>>>>
import { markdownLinkBuilder } from '../../../../storybook-utilities/markdownLinkBuilder';
import SprkStepperSlider from './components/SprkStepperSlider/SprkStepperSlider';
<<<<<<<
info: markdownLinkBuilder('stepper'),
=======
subcomponents: {
SprkStepperSlider,
SprkStepperStep
},
info: `
##### For design and usage information check out the [documentation.](https://spark-docs.netlify.com/using-spark/components/stepper)
`,
>>>>>>>
subcomponents: {
SprkStepperSlider,
SprkStepperStep
},
info: markdownLinkBuilder('stepper'), |
<<<<<<<
import SprkPromoDocs from './SprkPromoDocs/SprkPromoDocs';
=======
import NotFound from './NotFound/NotFound';
import SprkAlertDocs from './SprkAlertDocs/SprkAlertDocs';
>>>>>>>
import SprkPromoDocs from './SprkPromoDocs/SprkPromoDocs';
import NotFound from './NotFound/NotFound';
import SprkAlertDocs from './SprkAlertDocs/SprkAlertDocs';
<<<<<<<
<Route exact path="/promos" component={SprkPromoDocs} />
</Switch>
=======
<Route exact path="/alerts" component={SprkAlertDocs} />
<Route component={NotFound} />
</Switch>
>>>>>>>
<Route exact path="/promos" component={SprkPromoDocs} />
<Route exact path="/alerts" component={SprkAlertDocs} />
<Route component={NotFound} />
</Switch> |
<<<<<<<
<li>
<Link to="/promos" className="drizzle-b-Link drizzle-b-Link--light">
Promos
</Link>
</li>
=======
<li>
<Link to="/alerts" className="drizzle-b-Link drizzle-b-Link--light">
Alerts
</Link>
</li>
>>>>>>>
<li>
<Link to="/promos" className="drizzle-b-Link drizzle-b-Link--light">
Promos
</Link>
</li>
<li>
<Link to="/alerts" className="drizzle-b-Link drizzle-b-Link--light">
Alerts
</Link>
</li> |
<<<<<<<
<li>
<Link to="/masthead" className="drizzle-b-Link drizzle-b-Link--light">
Masthead
</Link>
</li>
=======
<li>
<Link to="/alerts" className="drizzle-b-Link drizzle-b-Link--light">
Alerts
</Link>
</li>
>>>>>>>
<li>
<Link to="/masthead" className="drizzle-b-Link drizzle-b-Link--light">
Masthead
</Link>
</li>
<li>
<Link to="/alerts" className="drizzle-b-Link drizzle-b-Link--light">
Alerts
</Link>
</li> |
<<<<<<<
import SprkPromoDocs from './SprkPromoDocs/SprkPromoDocs';
=======
import SprkDividerDocs from './SprkDividerDocs/SprkDividerDocs';
>>>>>>>
import SprkPromoDocs from './SprkPromoDocs/SprkPromoDocs';
import SprkDividerDocs from './SprkDividerDocs/SprkDividerDocs';
<<<<<<<
<Route exact path="/promos" component={SprkPromoDocs} />
=======
<Route exact path="/dividers" component={SprkDividerDocs} />
>>>>>>>
<Route exact path="/promos" component={SprkPromoDocs} />
<Route exact path="/dividers" component={SprkDividerDocs} /> |
<<<<<<<
import SprkDividerDocs from './SprkDividerDocs/SprkDividerDocs';
=======
import NotFound from './NotFound/NotFound';
import SprkAlertDocs from './SprkAlertDocs/SprkAlertDocs';
>>>>>>>
import SprkDividerDocs from './SprkDividerDocs/SprkDividerDocs';
import NotFound from './NotFound/NotFound';
import SprkAlertDocs from './SprkAlertDocs/SprkAlertDocs';
<<<<<<<
<Route exact path="/dividers" component={SprkDividerDocs} />
</Switch>
=======
<Route exact path="/alerts" component={SprkAlertDocs} />
<Route component={NotFound} />
</Switch>
>>>>>>>
<Route exact path="/dividers" component={SprkDividerDocs} />
<Route exact path="/alerts" component={SprkAlertDocs} />
<Route component={NotFound} />
</Switch> |
<<<<<<<
decorators: [
story => <div className="sprk-o-Box">{story()}</div>
],
parameters: { jest: ['SprkPagination'] },
=======
parameters: {
jest: ['SprkPagination'],
info: `
##### For design and usage information check out the [documentation.](https://spark-docs.netlify.com/using-spark/components/pagination)
`,
},
>>>>>>>
decorators: [
story => <div className="sprk-o-Box">{story()}</div>
],
parameters: {
jest: ['SprkPagination'],
info: `
##### For design and usage information check out the [documentation.](https://spark-docs.netlify.com/using-spark/components/pagination)
`,
}, |
<<<<<<<
title: 'Components|Table',
=======
title: 'Base|Tables',
decorators: [
story => `<div class="sprk-o-Box">${story()}</div>`,
],
>>>>>>>
title: 'Components|Table',
decorators: [
story => `<div class="sprk-o-Box">${story()}</div>`,
], |
<<<<<<<
export const PLAY_MODE = true;
export const PAUSE_MODE = false;
export const MUTE_MODE = true;
export const UNMUTE_MODE = false;
=======
export const PLAYER_STATES_NAMES = {
UNSTARTED: 'unstarted',
ENDED: 'ended',
PLAYING: 'playing',
PAUSED: 'paused',
BUFFERING: 'buffering',
VIDEO_CUED: 'video cued',
};
>>>>>>>
export const PLAY_MODE = true;
export const PAUSE_MODE = false;
export const MUTE_MODE = true;
export const UNMUTE_MODE = false;
export const PLAYER_STATES_NAMES = {
UNSTARTED: 'unstarted',
ENDED: 'ended',
PLAYING: 'playing',
PAUSED: 'paused',
BUFFERING: 'buffering',
VIDEO_CUED: 'video cued',
}; |
<<<<<<<
import { Component, PropTypes } from 'react';
import Datepicker from './Datepicker';
=======
import React, { Component, PropTypes } from 'react';
import Datetime from './Datetime';
>>>>>>>
import React, { Component, PropTypes } from 'react';
import Datepicker from './Datepicker'; |
<<<<<<<
for (let i = 0; i < max; i++) {
let file = droppedFiles[i];
file.preview = window.URL.createObjectURL(file);
=======
for (var i = 0; i < max; i++) {
var file = droppedFiles[i];
// We might want to disable the preview creation to support big files
if (!this.disablePreview) {
file.preview = window.URL.createObjectURL(file);
}
>>>>>>>
for (let i = 0; i < max; i++) {
let file = droppedFiles[i];
// We might want to disable the preview creation to support big files
if (!this.disablePreview) {
file.preview = window.URL.createObjectURL(file);
}
<<<<<<<
let className, style, activeStyle;
=======
var className, style, activeStyle, rejectStyle;
>>>>>>>
let className, style, activeStyle, rejectStyle;
<<<<<<<
const options = {
type: 'file',
style: { display: 'none'},
ref: 'fileInput',
accept: this.props.accept,
onChange: this.onDrop
};
supportMultiple && (options.multiple = this.props.multiple);
=======
let inputAttr = {};
if (this.props.name) {
inputAttr.name = this.props.name;
}
>>>>>>>
const inputAttributes = {
type: 'file',
style: { display: 'none'},
ref: 'fileInput',
accept: this.props.accept,
onChange: this.onDrop
};
supportMultiple && (inputAttributes.multiple = this.props.multiple);
this.props.name && (inputAttributes.name = this.props.name);
<<<<<<<
<input {...options} />
=======
<input
type='file'
ref='fileInput'
style={{ display: 'none' }}
multiple={this.props.multiple}
accept={this.props.accept}
onChange={this.onDrop}
{...inputAttr}
/>
>>>>>>>
<input {...inputAttributes} /> |
<<<<<<<
"Side_Chain":"Side chain browser(DappChain)",
"Main_Chain":"Main chain browser(MainChain)",
=======
"7day": "one week",
"14day": "two weeks",
"30day": "one month",
"select_tip": "To view data other than 2000 You can manually adjust the time window",
"date_number_tip": "{total} records in the current time range",
"date_list_tip": "Only the first 2000 data are displayed",
>>>>>>>
"Side_Chain":"Side chain browser(DappChain)",
"Main_Chain":"Main chain browser(MainChain)",
"7day": "one week",
"14day": "two weeks",
"30day": "one month",
"select_tip": "To view data other than 2000 You can manually adjust the time window",
"date_number_tip": "{total} records in the current time range",
"date_list_tip": "Only the first 2000 data are displayed", |
<<<<<<<
=======
title: "Locked Out Of Heaven",
artist: ["Bruno Mars"],
featuredArtist: [],
emojiImgs: "๐๐
๐๐คฉ๐ฅ",
musicVideo: "https://www.youtube.com/watch?v=e-fA-gBCkj0",
genres: ["pop", "pop rock", "reggae rock"],
year: 2012
},{
title: "Ice Ice Baby",
artist: ["Vanilla Ice"],
featuredArtist: [],
emojiImgs: "๐๐โ๏ธ๐ถ๐ฅถ",
musicVideo: "https://www.youtube.com/watch?v=rog8ou-ZepE",
genres: ["hip hop"],
year: 1989
},{
title: "Love Yourself",
artist: ["Justin Bieber"],
featuredArtist: [],
emojiImgs: "๐๐ง๐",
musicVideo: "https://www.youtube.com/watch?v=oyEuk8j8imI",
genres: ["pop", "acoustic pop"],
year: 2015
},{
>>>>>>>
title: "Locked Out Of Heaven",
artist: ["Bruno Mars"],
featuredArtist: [],
emojiImgs: "๐๐
๐๐คฉ๐ฅ",
musicVideo: "https://www.youtube.com/watch?v=e-fA-gBCkj0",
genres: ["pop", "pop rock", "reggae rock"],
year: 2012
},{
title: "Ice Ice Baby",
artist: ["Vanilla Ice"],
featuredArtist: [],
emojiImgs: "๐๐โ๏ธ๐ถ๐ฅถ",
musicVideo: "https://www.youtube.com/watch?v=rog8ou-ZepE",
genres: ["hip hop"],
year: 1989
},{
title: "Love Yourself",
artist: ["Justin Bieber"],
featuredArtist: [],
emojiImgs: "๐๐ง๐",
musicVideo: "https://www.youtube.com/watch?v=oyEuk8j8imI",
genres: ["pop", "acoustic pop"],
year: 2015
},{ |
<<<<<<<
{
title: "9 to 5",
artist: ["Dolly Parton"],
featuredArtist: [],
emojiImgs: "9๏ธโฃ๐5๏ธโฃ",
musicVideo: "https://www.youtube.com/watch?v=UbxUSsFXYo4",
genres: ["pop"],
year: 1980
},{
title: "A Whole New World",
artist: ["ZAYN", "Zhavia Ward"],
featuredArtist: [],
emojiImgs: "๐๐๐ซ๐ธ๐ฝโค๏ธ",
musicVideo: "https://www.youtube.com/watch?v=rg_zwK_sSEY",
genres: ["disney", "children music"],
year: 2019
},{
title: "Airplanes",
artist: ["B.o.B"],
featuredArtist: ["Haley Williams"],
emojiImgs: "๐ฉ๐ ๐งโโ๏ธ๐",
musicVideo: "https://www.youtube.com/watch?v=kn6-c223DUU",
genres: ["hip-hop"],
year: 2010
},{
title: "Applause",
artist: ["Lady Gaga"],
featuredArtist: [],
emojiImgs: "๐๐ฆ๐",
musicVideo: "https://www.youtube.com/watch?v=pco91kroVgQ",
genres: ["electronic", "pop"],
year: 2013
},{
title: "Angel of Music",
artist: ["Andrew Lloyd Webber"],
featuredArtist: [],
emojiImgs: "๐ฑ๐ปโโ๏ธ๐ด๐ปโฐ๏ธ๐ผ๐ป๐ถ๐๐ผโโ๏ธ",
musicVideo: "https://www.youtube.com/watch?v=7lG2zPKo9e4",
genres: ["movies"],
year: 2004
},{
title: "American Pie",
artist: ["Don McLean"],
featuredArtist: [],
emojiImgs: "๐บ๐ธ๐ฅง๐ต",
musicVideo: "https://www.youtube.com/watch?v=iX_TFkut1PM",
genres: ["folk-rock", "classic-rock"],
year: 1971
},{
title: 'Bleeding Love',
artist: ['Leona Lewis'],
featuredArtist: [],
emojiImgs: '๐๐๐ง',
musicVideo: 'https://www.youtube.com/watch?v=7_weSk0BonM',
genres: ['pop', 'r&b'],
year: 2007,
},{
title: "Blood Sweat & Tears",
artist: ["BTS"],
featuredArtist: [],
emojiImgs: "๐๐ฆ๐ญ",
musicVideo: "https://www.youtube.com/watch?v=hmE9f-TEutc",
genres: ["k-pop", "pop"],
year: 2016,
},{
=======
{
title: "Alors On Danse",
artist: ["Stromae"],
featuredArtist: [],
emojiImgs: '๐ง๐ช๐๐บ๐ถ',
musicVideo: 'https://www.youtube.com/watch?v=VHoT4N43jK8',
genres: ["dance","electronic","hip-hop"],
year: 2010
},{
>>>>>>>
{
title: "9 to 5",
artist: ["Dolly Parton"],
featuredArtist: [],
emojiImgs: "9๏ธโฃ๐5๏ธโฃ",
musicVideo: "https://www.youtube.com/watch?v=UbxUSsFXYo4",
genres: ["pop"],
year: 1980
},{
title: "A Whole New World",
artist: ["ZAYN", "Zhavia Ward"],
featuredArtist: [],
emojiImgs: "๐๐๐ซ๐ธ๐ฝโค๏ธ",
musicVideo: "https://www.youtube.com/watch?v=rg_zwK_sSEY",
genres: ["disney", "children music"],
year: 2019
},{
title: "Airplanes",
artist: ["B.o.B"],
featuredArtist: ["Haley Williams"],
emojiImgs: "๐ฉ๐ ๐งโโ๏ธ๐",
musicVideo: "https://www.youtube.com/watch?v=kn6-c223DUU",
genres: ["hip-hop"],
year: 2010
},{
title: "Applause",
artist: ["Lady Gaga"],
featuredArtist: [],
emojiImgs: "๐๐ฆ๐",
musicVideo: "https://www.youtube.com/watch?v=pco91kroVgQ",
genres: ["electronic", "pop"],
year: 2013
},{
title: "Angel of Music",
artist: ["Andrew Lloyd Webber"],
featuredArtist: [],
emojiImgs: "๐ฑ๐ปโโ๏ธ๐ด๐ปโฐ๏ธ๐ผ๐ป๐ถ๐๐ผโโ๏ธ",
musicVideo: "https://www.youtube.com/watch?v=7lG2zPKo9e4",
genres: ["movies"],
year: 2004
},{
title: "American Pie",
artist: ["Don McLean"],
featuredArtist: [],
emojiImgs: "๐บ๐ธ๐ฅง๐ต",
musicVideo: "https://www.youtube.com/watch?v=iX_TFkut1PM",
genres: ["folk-rock", "classic-rock"],
year: 1971
},{
title: 'Bleeding Love',
artist: ['Leona Lewis'],
featuredArtist: [],
emojiImgs: '๐๐๐ง',
musicVideo: 'https://www.youtube.com/watch?v=7_weSk0BonM',
genres: ['pop', 'r&b'],
year: 2007,
},{
title: "Blood Sweat & Tears",
artist: ["BTS"],
featuredArtist: [],
emojiImgs: "๐๐ฆ๐ญ",
musicVideo: "https://www.youtube.com/watch?v=hmE9f-TEutc",
genres: ["k-pop", "pop"],
year: 2016,
},{
title: "Alors On Danse",
artist: ["Stromae"],
featuredArtist: [],
emojiImgs: '๐ง๐ช๐๐บ๐ถ',
musicVideo: 'https://www.youtube.com/watch?v=VHoT4N43jK8',
genres: ["dance","electronic","hip-hop"],
year: 2010
},{
<<<<<<<
title: "Telephone",
artist: ["Lady Gaga"],
featuredArtist: ["Beyonce"],
emojiImgs: "๐ฉ๐ญโ๏ธ",
musicVideo: "https://www.youtube.com/watch?v=EVBsypHzF3U",
genres: ["dance", "pop"],
year: 2010
},{
title: "TiK ToK",
artist: ["Kesha"],
featuredArtist: [],
emojiImgs: "โฐ๐ฑโโ๐",
musicVideo: "https://www.youtube.com/watch?v=iP6XpLQM2Cs",
genres: ["dance-pop"],
year: 2009
},{
title: "Truckin",
artist: ["Grateful Dead"],
featuredArtist: [],
emojiImgs: "๐๐ณ๐",
musicVideo: "https://youtu.be/pafY6sZt0FE",
genres: ["rock", "alternative"],
year: 2019
},{
title: "Thunderstruck",
artist: ["ACDC"],
featuredArtist: [],
emojiImgs: "โกโกโก๐๐บ๐",
musicVideo: "https://www.youtube.com/watch?v=v2AC41dglnM",
genres: ["rock", "classic-rock"],
year: 1990
},{
=======
>>>>>>>
title: "Telephone",
artist: ["Lady Gaga"],
featuredArtist: ["Beyonce"],
emojiImgs: "๐ฉ๐ญโ๏ธ",
musicVideo: "https://www.youtube.com/watch?v=EVBsypHzF3U",
genres: ["dance", "pop"],
year: 2010
},{
title: "TiK ToK",
artist: ["Kesha"],
featuredArtist: [],
emojiImgs: "โฐ๐ฑโโ๐",
musicVideo: "https://www.youtube.com/watch?v=iP6XpLQM2Cs",
genres: ["dance-pop"],
year: 2009
},{
title: "Truckin",
artist: ["Grateful Dead"],
featuredArtist: [],
emojiImgs: "๐๐ณ๐",
musicVideo: "https://youtu.be/pafY6sZt0FE",
genres: ["rock", "alternative"],
year: 2019
},{
title: "Thunderstruck",
artist: ["ACDC"],
featuredArtist: [],
emojiImgs: "โกโกโก๐๐บ๐",
musicVideo: "https://www.youtube.com/watch?v=v2AC41dglnM",
genres: ["rock", "classic-rock"],
year: 1990
},{
<<<<<<<
},{
title: "Under The Sea",
artist: ["Samuel E. Wright"],
featuredArtist: [],
emojiImgs: "๐๐๐งโโ๏ธ๐ฆ",
musicVideo: "https://www.youtube.com/watch?v=GC_mV1IpjWA",
genres: ["pop", "disney", "reggae", "show-tunes"],
year: 1989
},{
title: "YES or YES",
artist: ["TWICE"],
featuredArtist: [],
emojiImgs: "๐งโโ๏ธ๐ก๐ญ๐ชโ๏ธ๐",
musicVideo: "https://www.youtube.com/watch?v=mAKsZ26SabQ",
genres: ["k-pop"],
year: 2018
=======
},{
title: "Truckin",
artist: ["Grateful Dead"],
featuredArtist: [],
emojiImgs: "๐๐ณ๐",
musicVideo: "https://youtu.be/pafY6sZt0FE",
genres: ["rock", "alternative"],
year: 2019
>>>>>>>
},{
title: "Under The Sea",
artist: ["Samuel E. Wright"],
featuredArtist: [],
emojiImgs: "๐๐๐งโโ๏ธ๐ฆ",
musicVideo: "https://www.youtube.com/watch?v=GC_mV1IpjWA",
genres: ["pop", "disney", "reggae", "show-tunes"],
year: 1989
},{
title: "YES or YES",
artist: ["TWICE"],
featuredArtist: [],
emojiImgs: "๐งโโ๏ธ๐ก๐ญ๐ชโ๏ธ๐",
musicVideo: "https://www.youtube.com/watch?v=mAKsZ26SabQ",
genres: ["k-pop"],
year: 2018 |
<<<<<<<
title: "Milla",
artist: ["Netinho"],
featuredArtist: [],
emojiImgs: "1โฃ0โฃ0โฃ1โฃ๐โค๐พ",
musicVideo: "https://www.youtube.com/watch?v=zhrqSwXz8Ic",
genres: ["axe"],
year: 1996
},{
=======
title: "Mercy",
artist: ["Shawn Mendes"],
featuredArtist: [],
emojiImgs: "๐๐ป๐ญ๐๐",
musicVideo: "https://www.youtube.com/watch?v=KkGVmN68ByU",
genres: ["pop"],
year: 2016
},{
title: "My First Kiss",
artist: ["3OH!3"],
featuredArtist: ["Kesha"],
emojiImgs: "โ๏ธ๐๐ฉโโค๏ธโ๐๐จ",
musicVideo: "https://www.youtube.com/watch?v=N1MMoZ-DLlY",
genres: ["pop"],
year: 2010
},{
title: "My Heart Will Go On",
artist: ["Celine Dion"],
featuredArtist: [],
emojiImgs: "๐ขโ๐๐ฅ๐๐",
musicVideo: "https://www.youtube.com/watch?v=CUmOFqQRkco",
genres: ["pop"],
year: 1997
},{
title: "Nine in the Afternoon",
artist: ["Panic! at the Disco"],
featuredArtist: [],
emojiImgs: "9๏ธโฃ๐๐",
musicVideo: "https://www.youtube.com/watch?v=yCto3PCn8wo",
genres: ["emo", "pop", "punk"],
year: 2008
}, {
title: "Not Afraid",
artist: ["Eminem"],
featuredArtist: [],
emojiImgs: "๐คจ๐ค๐ซ๐ฑ",
musicVideo: "https://www.youtube.com/watch?v=j5-yKhDd64s",
genres: ["hip-hop"],
year: 2010
}, {
>>>>>>>
title: "Milla",
artist: ["Netinho"],
featuredArtist: [],
emojiImgs: "1โฃ0โฃ0โฃ1โฃ๐โค๐พ",
musicVideo: "https://www.youtube.com/watch?v=zhrqSwXz8Ic",
genres: ["axe"],
year: 1996
},{
title: "Mercy",
artist: ["Shawn Mendes"],
featuredArtist: [],
emojiImgs: "๐๐ป๐ญ๐๐",
musicVideo: "https://www.youtube.com/watch?v=KkGVmN68ByU",
genres: ["pop"],
year: 2016
},{
title: "My First Kiss",
artist: ["3OH!3"],
featuredArtist: ["Kesha"],
emojiImgs: "โ๏ธ๐๐ฉโโค๏ธโ๐๐จ",
musicVideo: "https://www.youtube.com/watch?v=N1MMoZ-DLlY",
genres: ["pop"],
year: 2010
},{
title: "My Heart Will Go On",
artist: ["Celine Dion"],
featuredArtist: [],
emojiImgs: "๐ขโ๐๐ฅ๐๐",
musicVideo: "https://www.youtube.com/watch?v=CUmOFqQRkco",
genres: ["pop"],
year: 1997
},{
title: "Nine in the Afternoon",
artist: ["Panic! at the Disco"],
featuredArtist: [],
emojiImgs: "9๏ธโฃ๐๐",
musicVideo: "https://www.youtube.com/watch?v=yCto3PCn8wo",
genres: ["emo", "pop", "punk"],
year: 2008
}, {
title: "Not Afraid",
artist: ["Eminem"],
featuredArtist: [],
emojiImgs: "๐คจ๐ค๐ซ๐ฑ",
musicVideo: "https://www.youtube.com/watch?v=j5-yKhDd64s",
genres: ["hip-hop"],
year: 2010
}, {
<<<<<<<
title: "Porque Homem Nรฃo Chora",
artist: ["Pablo"],
featuredArtist: [],
emojiImgs: "๐ง๐ซ๐ญ",
musicVideo: "https://www.youtube.com/watch?v=QLoZhUpzNzQ",
genres: ["arrocha","sofrencia"],
year: 2014
},{
=======
title: "Paracetamol",
artist: ["Declan McKenna"],
featuredArtist: [],
emojiImgs: "๐๐๐",
musicVideo: "https://www.youtube.com/watch?v=iqojQJGt-Vo",
genres: ["alternative rock", "indie", "rock"],
year: 2016
},{
title: "Party in the USA",
artist: ["Miley Cyrus"],
featuredArtist: [],
emojiImgs: "๐๐๐บ๐ฒโค๏ธ๐ค๐",
musicVideo: "https://www.youtube.com/watch?v=M11SvDtPBhA",
genres: ["pop"],
year: 2009
},{
title: "Piano Man",
artist: ["Billy Joel"],
featuredArtist: [],
emojiImgs: "๐น๐คต๐ป๐ถ",
musicVideo: "https://www.youtube.com/watch?v=gxEPV4kolz0",
genres: ["Soft rock"],
year: 1973
},{
title: "Poker Face",
artist: ["Lady Gaga"],
featuredArtist: [],
emojiImgs: "๐โ ๏ธโฃ๏ธโฅ๏ธโฆ๏ธ๐",
musicVideo: "https://www.youtube.com/watch?v=bESGLojNYSo",
genres: ["pop"],
year: 2008
},{
title: "Ring of Fire",
artist: ["Jay-Z"],
featuredArtist: ["Johnny Cash"],
emojiImgs: "๐๐ฅ๐
โค๏ธ",
musicVideo: "https://www.youtube.com/watch?v=ZxgE4MZkJV4",
genres: ["rock", "country"],
year: 1963
},{
title: "Runaway Baby",
artist: ["Bruno Mars"],
featuredArtist: [],
emojiImgs: "๐๐๐คช๐๐",
musicVideo: "https://www.youtube.com/watch?v=o95FLUk7o9Q",
genres: ["pop"],
year: 2010
},{
title: "Ridin",
artist: ["Chamillionaire"],
featuredArtist: ["Krayzie Bone"],
emojiImgs: "๐๐โฝ",
musicVideo: "https://www.youtube.com/watch?v=CtwJvgPJ9xw",
genres: ["hip hop"],
year: 2005
},{
title: "Paparazzi",
artist: ["Lady Gaga"],
featuredArtist: [],
emojiImgs: "๐ท๐ฉโ๐ฆณ๐",
musicVideo: "https://www.youtube.com/watch?v=d2smz_1L2_0",
genres: ["dance", "pop", "techno"],
year: 2009
},{
title: "Raise Your Glass",
artist: ["Pink"],
featuredArtist: [],
emojiImgs: "๐ถ๐๐ธ๐ฅ๐ป",
musicVideo: "https://www.youtube.com/watch?v=XjVNlG5cZyQ",
genres: ["pop","pop rock"],
year: 2010
},{
title: "Rise up",
artist: ["Andra Day"],
featuredArtist: [],
emojiImgs: "๐ฉ๐๐",
musicVideo: "https://www.youtube.com/watch?v=kNKu1uNBVkU",
genres: ["r-n-b", "soul"],
year: 2015
},{
>>>>>>>
title: "Porque Homem Nรฃo Chora",
artist: ["Pablo"],
featuredArtist: [],
emojiImgs: "๐ง๐ซ๐ญ",
musicVideo: "https://www.youtube.com/watch?v=QLoZhUpzNzQ",
genres: ["arrocha","sofrencia"],
year: 2014
},{
title: "Paracetamol",
artist: ["Declan McKenna"],
featuredArtist: [],
emojiImgs: "๐๐๐",
musicVideo: "https://www.youtube.com/watch?v=iqojQJGt-Vo",
genres: ["alternative rock", "indie", "rock"],
year: 2016
},{
title: "Party in the USA",
artist: ["Miley Cyrus"],
featuredArtist: [],
emojiImgs: "๐๐๐บ๐ฒโค๏ธ๐ค๐",
musicVideo: "https://www.youtube.com/watch?v=M11SvDtPBhA",
genres: ["pop"],
year: 2009
},{
title: "Piano Man",
artist: ["Billy Joel"],
featuredArtist: [],
emojiImgs: "๐น๐คต๐ป๐ถ",
musicVideo: "https://www.youtube.com/watch?v=gxEPV4kolz0",
genres: ["Soft rock"],
year: 1973
},{
title: "Poker Face",
artist: ["Lady Gaga"],
featuredArtist: [],
emojiImgs: "๐โ ๏ธโฃ๏ธโฅ๏ธโฆ๏ธ๐",
musicVideo: "https://www.youtube.com/watch?v=bESGLojNYSo",
genres: ["pop"],
year: 2008
},{
title: "Ring of Fire",
artist: ["Jay-Z"],
featuredArtist: ["Johnny Cash"],
emojiImgs: "๐๐ฅ๐
โค๏ธ",
musicVideo: "https://www.youtube.com/watch?v=ZxgE4MZkJV4",
genres: ["rock", "country"],
year: 1963
},{
title: "Runaway Baby",
artist: ["Bruno Mars"],
featuredArtist: [],
emojiImgs: "๐๐๐คช๐๐",
musicVideo: "https://www.youtube.com/watch?v=o95FLUk7o9Q",
genres: ["pop"],
year: 2010
},{
title: "Ridin",
artist: ["Chamillionaire"],
featuredArtist: ["Krayzie Bone"],
emojiImgs: "๐๐โฝ",
musicVideo: "https://www.youtube.com/watch?v=CtwJvgPJ9xw",
genres: ["hip hop"],
year: 2005
},{
title: "Paparazzi",
artist: ["Lady Gaga"],
featuredArtist: [],
emojiImgs: "๐ท๐ฉโ๐ฆณ๐",
musicVideo: "https://www.youtube.com/watch?v=d2smz_1L2_0",
genres: ["dance", "pop", "techno"],
year: 2009
},{
title: "Raise Your Glass",
artist: ["Pink"],
featuredArtist: [],
emojiImgs: "๐ถ๐๐ธ๐ฅ๐ป",
musicVideo: "https://www.youtube.com/watch?v=XjVNlG5cZyQ",
genres: ["pop","pop rock"],
year: 2010
},{
title: "Rise up",
artist: ["Andra Day"],
featuredArtist: [],
emojiImgs: "๐ฉ๐๐",
musicVideo: "https://www.youtube.com/watch?v=kNKu1uNBVkU",
genres: ["r-n-b", "soul"],
year: 2015
},{
<<<<<<<
year: 2019
},{
=======
year: 2019
},{
title: "Thunderstruck",
artist: ["ACDC"],
featuredArtist: [],
emojiImgs: "โกโกโก๐๐บ๐",
musicVideo: "https://www.youtube.com/watch?v=v2AC41dglnM",
genres: ["rock", "classic-rock"],
year: 1990
},{
>>>>>>>
year: 2019
},{
title: "Thunderstruck",
artist: ["ACDC"],
featuredArtist: [],
emojiImgs: "โกโกโก๐๐บ๐",
musicVideo: "https://www.youtube.com/watch?v=v2AC41dglnM",
genres: ["rock", "classic-rock"],
year: 1990
},{ |
<<<<<<<
title: "Drunk",
artist: ["Ed Sheeran"],
featuredArtist: [],
emojiImgs: "๐ฅด๐ป๐ผ๐๐๐ต",
musicVideo: "https://www.youtube.com/watch?v=G2fOum_KWQU",
genres: ["pop", "folk"],
year: 2011
},{
=======
title: "Dancing in the Dark",
artist: ["Bruce Springsteen"],
featuredArtist: [],
emojiImgs: "๐๐ฝ๐บ๐",
musicVideo: "https://www.youtube.com/watch?v=129kuDCQtHs",
genres: ["rock", "classic-rock"],
year: 1984
},{
title: "Dancing Queen",
artist: ["ABBA"],
featuredArtist: [],
emojiImgs: "๐๐ธ๐๐โจ",
musicVideo: "https://www.youtube.com/watch?v=xFrGuyw1V8s",
genres: ["pop"],
year: 1976
},{
title: "Dancing in the Dark",
artist: ["Bruce Springsteen"],
featuredArtist: [],
emojiImgs: "๐๐ฝ๐บ๐",
musicVideo: "https://www.youtube.com/watch?v=129kuDCQtHs",
genres: ["rock", "classic-rock"],
year: 1984
},{
title: "The Devil Went Down to Georgia",
artist: ["Charlie Daniels Band"],
featuredArtist: [],
emojiImgs: "๐๐๐ฌ๐ช๐ธ",
musicVideo: "https://www.youtube.com/watch?v=wBjPAqmnvGA",
genres: ["country"],
year: 1979
},{
title: "Diamonds",
artist: ["Rihanna"],
featuredArtist: [],
emojiImgs: "๐ฆ๐๐ฉ๐๐๐",
musicVideo: "https://www.youtube.com/watch?v=lWA2pjMjpBs",
genres: ["pop", "rb"],
year: 2012
},{
title: "Do You Want to Build a Snowman?",
artist: ["Kristen Bell", "Agatha Lee Monn", "Katie Lopez"],
featuredArtist: [],
emojiImgs: "๐๏ธโโ๐",
musicVideo: "https://www.youtube.com/watch?v=V-zXT5bIBM0",
genres: ["show-tune"],
year: 2013
},{
title: "Drunk In Love",
artist: "Beyonce",
featuredArtist: "Jay-Z",
emojiImgs: "๐ฅ๐๐",
musicVideo: "https://www.youtube.com/watch?v=p1JPKLa-Ofc",
genres: ["R&B", "hip hop", " trap"],
year: 2013
},{
title: "Empire State of Mind",
artist: ["Jay-Z"],
featuredArtist: ["Alicia Keys"],
emojiImgs: "๐ฝ๐๐๐น",
musicVideo: "https://www.youtube.com/watch?v=QsZlY0Vz4-o",
genres: ["hip-hop"],
year: 2009
},{
title: "Everybody Wants To Rule The World",
artist: ["Tears For Fears"],
featuredArtist: [],
emojiImgs: "๐ฉ๐จ๐ง๐ง๐๐",
musicVideo: "https://www.youtube.com/watch?v=aGCdLKXNF3w",
genres: ["Rock", "New wave", "Synth-pop", "Pop"],
year: 1985
},{
title: "Every Rose Has It's Thorn",
artist: ["Poison"],
featuredArtist: [],
emojiImgs: "๐น๐ค ๐๐ป",
musicVideo: "https://www.youtube.com/watch?v=j2r2nDhTzO4",
genres: ["hard rock", "glam metal"],
year: 1988
},{
title: "Fire",
artist: ["BTS"],
featuredArtist: [],
emojiImgs: "๐ฅ๐๐ซ",
musicVideo: "https://www.youtube.com/watch?v=ALj5MKjy2BU",
genres: ["k-pop", "pop"],
year: 2016
},{
title: "Firework",
artist: ["Katy Perry"],
featuredArtist: [],
emojiImgs: "๐งจ๐๐๐๐",
musicVideo: "https://www.youtube.com/watch?v=QGJuMBdaqIw",
genres: ["pop"],
year: 2010
},{
title: "Flamingo",
artist: ["Kero Kero Bonito"],
emojiImgs: "๐ฆ๐ฆฉ๐๐",
musicVideo: "https://www.youtube.com/watch?v=rY-FJvRqK0E",
genres: ["pop"],
year: 2014
},{
title: "Follow Your Arrow",
artist: ["Kacey Musgraves"],
featuredArtist: [],
emojiImgs: "โก๏ธ๐น๐๏ธ๐ข๐ง",
musicVideo: "https://www.youtube.com/watch?v=kQ8xqyoZXCc",
genres: ["country"],
year: 2013
},{
title: "The Fresh Prince of Bel-Air",
artist: ["DJ Jazzy Jeff", "The Fresh Prince"],
featuredArtist: [],
emojiImgs: "๐๐๐จ",
musicVideo: "",
genres: ["pop", "hip-hop"],
year: 1990
},{
title: 'Genie in a Bottle',
artist: ['Christina Aguilera'],
featuredArtist: [],
emojiImgs: '๐ง๐๐พ',
musicVideo: 'https://www.youtube.com/watch?v=kIDWgqDBNXA',
genres: ['pop'],
year: 1999,
},{
title: "Ghosts'n'Stuff",
artist: ["deadmau5"],
featuredArtist: ["Rob Swire"],
emojiImgs: "๐ญ๐ป๐ฎ๐",
musicVideo: "https://www.youtube.com/watch?v=h7ArUgxtlJs",
genres: ["electronic"],
year: 2008
},{
title: "Hakuna Matata",
artist: ["Jimmy Cliff", "Lebo M"],
featuredArtist: [],
emojiImgs: "๐ฆ๐๐",
musicVideo: "https://www.youtube.com/watch?v=yUioIn8rPPM",
genres: ["pop", "reggae"],
year: 1994
},{
title: "How Could An Angel Break My Heart",
artist: ["Tony Braxton"],
featuredArtist: [],
emojiImgs: "๐ผ๐๐ญ",
musicVideo: "https://www.youtube.com/watch?v=qsDJRTzN9FY",
genres: ["R&B", "โsoulโ", "pop"],
year: 1997
},{
title: "Happy",
artist: ["Pharrell Williams"],
featuredArtist: [],
emojiImgs: "๐๐๐",
musicVideo: "https://www.youtube.com/watch?v=y6Sxv-sUYtM",
genres: ["pop"],
year: 2013
},{
title: "Highway to Hell",
artist: ["AC/DC"],
featuredArtist: [],
emojiImgs: "๐ฃ๏ธ๐ฅ๐๐ค",
musicVideo: "https://www.youtube.com/watch?v=l482T0yNkeo",
genres: ["hard-rock"],
year: 1979
},{
title: "Hello",
artist: ["Adele"],
featuredArtist: [],
emojiImgs: "๐ฒโ๏ธ๐๐โ๐",
musicVideo: "https://www.youtube.com/watch?v=YQHsXMglC9A",
genres: ["soul"],
year: 2015
},{
title: "Hot N Cold",
artist: ["Katy Perry"],
featuredArtist: [],
emojiImgs: "๐ฐ๐ฅโฝ๏ธโ๏ธ๐คต",
musicVideo: "https://www.youtube.com/watch?v=kTHNpusq654",
genres: ["pop", "pop-dance"],
year: 2008
},{
title: "I Heard It Through The Grapevine",
artist: ["Marvin Gaye"],
featuredArtist: [],
emojiImgs: "๐๐ป๐๐ฟ๐",
musicVideo: "https://www.youtube.com/watch?v=kAPj9oP4q_w",
genres: ["Soul","R&B"],
year: 1968
},{
title: "Hotline Bling",
artist: ["Drake"],
featuredArtist: [],
emojiImgs: "๐ฅโ๐",
musicVideo: "https://www.youtube.com/watch?v=uxpDa-c-4Mc",
genres: ["pop", "rb"],
year: 2015
},{
title: "I See Fire",
artist: ["Ed Sheeran"],
featuredArtist: [],
emojiImgs: "๐๐ฅโฐ๏ธ๐ฅ๐ณ",
musicVideo: "https://www.youtube.com/watch?v=2fngvQS_PmQ",
genres: ["folk"],
year: 2013
},{
title: "I Just Can't Wait To Be King",
artist: ["Jason Weaver", "Rowan Atkinson", "Laura Williams"],
featuredArtist: [],
emojiImgs: "๐ฆ๐ซโ๏ธ๐",
musicVideo: "https://www.youtube.com/watch?v=l8UFnc85-xM",
genres: ["disney", "children"],
year: 1994
},{
title: "I Say a Little Prayer",
artist: ["Dionne Warwick"],
featuredArtist: [],
emojiImgs: "๐๐โค๏ธ๐โ๏ธ",
musicVideo: "https://www.youtube.com/watch?v=kafVkPxjLYg",
genres: ["pop", "soul"],
year: 1967
},{
title: "I Want to Hold Your Hand",
artist: ["The Beatles"],
featuredArtist: [],
emojiImgs: "๐โโ๏ธ๐ค๐พ๐ฉ",
musicVideo: "https://www.youtube.com/watch?v=jenWdylTtzs",
genres: ["pop rock"],
year: 1963
},{
>>>>>>>
title: "Dancing in the Dark",
artist: ["Bruce Springsteen"],
featuredArtist: [],
emojiImgs: "๐๐ฝ๐บ๐",
musicVideo: "https://www.youtube.com/watch?v=129kuDCQtHs",
genres: ["rock", "classic-rock"],
year: 1984
},{
title: "Dancing Queen",
artist: ["ABBA"],
featuredArtist: [],
emojiImgs: "๐๐ธ๐๐โจ",
musicVideo: "https://www.youtube.com/watch?v=xFrGuyw1V8s",
genres: ["pop"],
year: 1976
},{
title: "Dancing in the Dark",
artist: ["Bruce Springsteen"],
featuredArtist: [],
emojiImgs: "๐๐ฝ๐บ๐",
musicVideo: "https://www.youtube.com/watch?v=129kuDCQtHs",
genres: ["rock", "classic-rock"],
year: 1984
},{
title: "The Devil Went Down to Georgia",
artist: ["Charlie Daniels Band"],
featuredArtist: [],
emojiImgs: "๐๐๐ฌ๐ช๐ธ",
musicVideo: "https://www.youtube.com/watch?v=wBjPAqmnvGA",
genres: ["country"],
year: 1979
},{
title: "Diamonds",
artist: ["Rihanna"],
featuredArtist: [],
emojiImgs: "๐ฆ๐๐ฉ๐๐๐",
musicVideo: "https://www.youtube.com/watch?v=lWA2pjMjpBs",
genres: ["pop", "rb"],
year: 2012
},{
title: "Do You Want to Build a Snowman?",
artist: ["Kristen Bell", "Agatha Lee Monn", "Katie Lopez"],
featuredArtist: [],
emojiImgs: "๐๏ธโโ๐",
musicVideo: "https://www.youtube.com/watch?v=V-zXT5bIBM0",
genres: ["show-tune"],
year: 2013
},{
title: "Drunk",
artist: ["Ed Sheeran"],
featuredArtist: [],
emojiImgs: "๐ฅด๐ป๐ผ๐๐๐ต",
musicVideo: "https://www.youtube.com/watch?v=G2fOum_KWQU",
genres: ["pop", "folk"],
year: 2011
},{
title: "Drunk In Love",
artist: "Beyonce",
featuredArtist: "Jay-Z",
emojiImgs: "๐ฅ๐๐",
musicVideo: "https://www.youtube.com/watch?v=p1JPKLa-Ofc",
genres: ["R&B", "hip hop", " trap"],
year: 2013
},{
title: "Empire State of Mind",
artist: ["Jay-Z"],
featuredArtist: ["Alicia Keys"],
emojiImgs: "๐ฝ๐๐๐น",
musicVideo: "https://www.youtube.com/watch?v=QsZlY0Vz4-o",
genres: ["hip-hop"],
year: 2009
},{
title: "Everybody Wants To Rule The World",
artist: ["Tears For Fears"],
featuredArtist: [],
emojiImgs: "๐ฉ๐จ๐ง๐ง๐๐",
musicVideo: "https://www.youtube.com/watch?v=aGCdLKXNF3w",
genres: ["Rock", "New wave", "Synth-pop", "Pop"],
year: 1985
},{
title: "Every Rose Has It's Thorn",
artist: ["Poison"],
featuredArtist: [],
emojiImgs: "๐น๐ค ๐๐ป",
musicVideo: "https://www.youtube.com/watch?v=j2r2nDhTzO4",
genres: ["hard rock", "glam metal"],
year: 1988
},{
title: "Fire",
artist: ["BTS"],
featuredArtist: [],
emojiImgs: "๐ฅ๐๐ซ",
musicVideo: "https://www.youtube.com/watch?v=ALj5MKjy2BU",
genres: ["k-pop", "pop"],
year: 2016
},{
title: "Firework",
artist: ["Katy Perry"],
featuredArtist: [],
emojiImgs: "๐งจ๐๐๐๐",
musicVideo: "https://www.youtube.com/watch?v=QGJuMBdaqIw",
genres: ["pop"],
year: 2010
},{
title: "Flamingo",
artist: ["Kero Kero Bonito"],
emojiImgs: "๐ฆ๐ฆฉ๐๐",
musicVideo: "https://www.youtube.com/watch?v=rY-FJvRqK0E",
genres: ["pop"],
year: 2014
},{
title: "Follow Your Arrow",
artist: ["Kacey Musgraves"],
featuredArtist: [],
emojiImgs: "โก๏ธ๐น๐๏ธ๐ข๐ง",
musicVideo: "https://www.youtube.com/watch?v=kQ8xqyoZXCc",
genres: ["country"],
year: 2013
},{
title: "The Fresh Prince of Bel-Air",
artist: ["DJ Jazzy Jeff", "The Fresh Prince"],
featuredArtist: [],
emojiImgs: "๐๐๐จ",
musicVideo: "",
genres: ["pop", "hip-hop"],
year: 1990
},{
title: 'Genie in a Bottle',
artist: ['Christina Aguilera'],
featuredArtist: [],
emojiImgs: '๐ง๐๐พ',
musicVideo: 'https://www.youtube.com/watch?v=kIDWgqDBNXA',
genres: ['pop'],
year: 1999,
},{
title: "Ghosts'n'Stuff",
artist: ["deadmau5"],
featuredArtist: ["Rob Swire"],
emojiImgs: "๐ญ๐ป๐ฎ๐",
musicVideo: "https://www.youtube.com/watch?v=h7ArUgxtlJs",
genres: ["electronic"],
year: 2008
},{
title: "Hakuna Matata",
artist: ["Jimmy Cliff", "Lebo M"],
featuredArtist: [],
emojiImgs: "๐ฆ๐๐",
musicVideo: "https://www.youtube.com/watch?v=yUioIn8rPPM",
genres: ["pop", "reggae"],
year: 1994
},{
title: "How Could An Angel Break My Heart",
artist: ["Tony Braxton"],
featuredArtist: [],
emojiImgs: "๐ผ๐๐ญ",
musicVideo: "https://www.youtube.com/watch?v=qsDJRTzN9FY",
genres: ["R&B", "โsoulโ", "pop"],
year: 1997
},{
title: "Happy",
artist: ["Pharrell Williams"],
featuredArtist: [],
emojiImgs: "๐๐๐",
musicVideo: "https://www.youtube.com/watch?v=y6Sxv-sUYtM",
genres: ["pop"],
year: 2013
},{
title: "Highway to Hell",
artist: ["AC/DC"],
featuredArtist: [],
emojiImgs: "๐ฃ๏ธ๐ฅ๐๐ค",
musicVideo: "https://www.youtube.com/watch?v=l482T0yNkeo",
genres: ["hard-rock"],
year: 1979
},{
title: "Hello",
artist: ["Adele"],
featuredArtist: [],
emojiImgs: "๐ฒโ๏ธ๐๐โ๐",
musicVideo: "https://www.youtube.com/watch?v=YQHsXMglC9A",
genres: ["soul"],
year: 2015
},{
title: "Hot N Cold",
artist: ["Katy Perry"],
featuredArtist: [],
emojiImgs: "๐ฐ๐ฅโฝ๏ธโ๏ธ๐คต",
musicVideo: "https://www.youtube.com/watch?v=kTHNpusq654",
genres: ["pop", "pop-dance"],
year: 2008
},{
title: "I Heard It Through The Grapevine",
artist: ["Marvin Gaye"],
featuredArtist: [],
emojiImgs: "๐๐ป๐๐ฟ๐",
musicVideo: "https://www.youtube.com/watch?v=kAPj9oP4q_w",
genres: ["Soul","R&B"],
year: 1968
},{
title: "Hotline Bling",
artist: ["Drake"],
featuredArtist: [],
emojiImgs: "๐ฅโ๐",
musicVideo: "https://www.youtube.com/watch?v=uxpDa-c-4Mc",
genres: ["pop", "rb"],
year: 2015
},{
title: "I See Fire",
artist: ["Ed Sheeran"],
featuredArtist: [],
emojiImgs: "๐๐ฅโฐ๏ธ๐ฅ๐ณ",
musicVideo: "https://www.youtube.com/watch?v=2fngvQS_PmQ",
genres: ["folk"],
year: 2013
},{
title: "I Just Can't Wait To Be King",
artist: ["Jason Weaver", "Rowan Atkinson", "Laura Williams"],
featuredArtist: [],
emojiImgs: "๐ฆ๐ซโ๏ธ๐",
musicVideo: "https://www.youtube.com/watch?v=l8UFnc85-xM",
genres: ["disney", "children"],
year: 1994
},{
title: "I Say a Little Prayer",
artist: ["Dionne Warwick"],
featuredArtist: [],
emojiImgs: "๐๐โค๏ธ๐โ๏ธ",
musicVideo: "https://www.youtube.com/watch?v=kafVkPxjLYg",
genres: ["pop", "soul"],
year: 1967
},{
title: "I Want to Hold Your Hand",
artist: ["The Beatles"],
featuredArtist: [],
emojiImgs: "๐โโ๏ธ๐ค๐พ๐ฉ",
musicVideo: "https://www.youtube.com/watch?v=jenWdylTtzs",
genres: ["pop rock"],
year: 1963
},{ |
<<<<<<<
},{
title: "The Scientist",
artist: ["Coldplay"],
featuredArtist: [],
emojiImgs: "โฎ๐๐ฅ๐งช๐จโ๐ฌ",
musicVideo: "https://www.youtube.com/watch?v=RB-RcX5DS5A",
genres: ["rock", "alternative"],
year: 2002
},{
=======
},{
title: "The Devil Went Down to Georgia",
artist: ["Charlie Daniels Band"],
featuredArtist: [],
emojiImgs: "๐๐๐ฌ๐ช๐ธ",
musicVideo: "https://www.youtube.com/watch?v=wBjPAqmnvGA",
genres: ["country"],
year: 1979
},{
>>>>>>>
},{
title: "The Scientist",
artist: ["Coldplay"],
featuredArtist: [],
emojiImgs: "โฎ๐๐ฅ๐งช๐จโ๐ฌ",
musicVideo: "https://www.youtube.com/watch?v=RB-RcX5DS5A",
genres: ["rock", "alternative"],
year: 2002
},{
title: "The Devil Went Down to Georgia",
artist: ["Charlie Daniels Band"],
featuredArtist: [],
emojiImgs: "๐๐๐ฌ๐ช๐ธ",
musicVideo: "https://www.youtube.com/watch?v=wBjPAqmnvGA",
genres: ["country"],
year: 1979
},{ |
<<<<<<<
},{
title: "Under The Sea",
artist: ["Samuel E. Wright"],
featuredArtist: [],
emojiImgs: "๐๐๐งโโ๏ธ๐ฆ",
musicVideo: "https://www.youtube.com/watch?v=GC_mV1IpjWA",
genres: ["pop", "disney", "reggae", "show-tunes"],
year: 1989
=======
},{
title: "Sugar, We're Goin Down",
artist: ["Fall Out Boy"],
featuredArtist: [],
emojiImgs: "๐ ๐ฆ๐จ๐ช๐ธ๐",
musicVideo: "https://www.youtube.com/watch?v=uhG-vLZrb-g",
genres: ["rock"],
year: 2004
},{
title: "YES or YES",
artist: ["TWICE"],
featuredArtist: [],
emojiImgs: "๐งโโ๏ธ๐ก๐ญ๐ชโ๏ธ๐",
musicVideo: "https://www.youtube.com/watch?v=mAKsZ26SabQ",
genres: ["k-pop"],
year: 2018
},{
title: "TiK ToK",
artist: ["Kesha"],
featuredArtist: [],
emojiImgs: "โฐ๐ฑโโ๐",
musicVideo: "https://www.youtube.com/watch?v=iP6XpLQM2Cs",
genres: ["dance-pop"],
year: 2009
>>>>>>>
},{
title: "Under The Sea",
artist: ["Samuel E. Wright"],
featuredArtist: [],
emojiImgs: "๐๐๐งโโ๏ธ๐ฆ",
musicVideo: "https://www.youtube.com/watch?v=GC_mV1IpjWA",
genres: ["pop", "disney", "reggae", "show-tunes"],
year: 1989
},{
title: "Sugar, We're Goin Down",
artist: ["Fall Out Boy"],
featuredArtist: [],
emojiImgs: "๐ ๐ฆ๐จ๐ช๐ธ๐",
musicVideo: "https://www.youtube.com/watch?v=uhG-vLZrb-g",
genres: ["rock"],
year: 2004
},{
title: "YES or YES",
artist: ["TWICE"],
featuredArtist: [],
emojiImgs: "๐งโโ๏ธ๐ก๐ญ๐ชโ๏ธ๐",
musicVideo: "https://www.youtube.com/watch?v=mAKsZ26SabQ",
genres: ["k-pop"],
year: 2018
},{
title: "TiK ToK",
artist: ["Kesha"],
featuredArtist: [],
emojiImgs: "โฐ๐ฑโโ๐",
musicVideo: "https://www.youtube.com/watch?v=iP6XpLQM2Cs",
genres: ["dance-pop"],
year: 2009 |
<<<<<<<
},{
title: "Truckin",
artist: ["Grateful Dead"],
featuredArtist: [],
emojiImgs: "๐๐ณ๐",
musicVideo: "https://youtu.be/pafY6sZt0FE",
genres: ["rock", "alternative"],
year: 2019
}
]
=======
},{
title: "Thriller",
artist: ["Michael Jackson"],
featuredArtist: [],
emojiImgs: "๐๐บ๐ฟ๐งโโ๏ธ๐งโโ๏ธ๐๐พ",
musicVideo: "https://www.youtube.com/watch?v=4V90AmXnguw",
genres: ["pop"],
year: 1984
}
]
>>>>>>>
},{
title: "Truckin",
artist: ["Grateful Dead"],
featuredArtist: [],
emojiImgs: "๐๐ณ๐",
musicVideo: "https://youtu.be/pafY6sZt0FE",
genres: ["rock", "alternative"],
year: 2019
},{
title: "Thriller",
artist: ["Michael Jackson"],
featuredArtist: [],
emojiImgs: "๐๐บ๐ฟ๐งโโ๏ธ๐งโโ๏ธ๐๐พ",
musicVideo: "https://www.youtube.com/watch?v=4V90AmXnguw",
genres: ["pop"],
year: 1984
}
] |
<<<<<<<
title: "Believer",
artist: ["Imagine Dragons"],
featuredArtist: [],
emojiImgs: "๐ค๐บโก๏ธ๐จโ ๐",
musicVideo: "https://www.youtube.com/watch?v=7wtfhZwyrcc",
genres: ["rock", "pop"],
year: 2017
},{
=======
title: "Bang Bang",
artist: ["Jessie J"],
featuredArtist: ["Ariana Grande & Nicki Minaj"],
emojiImgs: "๐ง๐ฅ๐ฉ๐ฅ๐ฉ",
musicVideo: "https://www.youtube.com/watch?v=0HDdjwpPM3Y",
genres: ["pop"],
year: 2014
},{
>>>>>>>
title: "Bang Bang",
artist: ["Jessie J"],
featuredArtist: ["Ariana Grande & Nicki Minaj"],
emojiImgs: "๐ง๐ฅ๐ฉ๐ฅ๐ฉ",
musicVideo: "https://www.youtube.com/watch?v=0HDdjwpPM3Y",
genres: ["pop"],
year: 2014
},{
title: "Believer",
artist: ["Imagine Dragons"],
featuredArtist: [],
emojiImgs: "๐ค๐บโก๏ธ๐จโ ๐",
musicVideo: "https://www.youtube.com/watch?v=7wtfhZwyrcc",
genres: ["rock", "pop"],
year: 2017
},{ |
<<<<<<<
title: "Bye Bye Bye",
artist: ["*NSYNC"],
featuredArtist: [],
emojiImgs: "๐๐๐",
musicVideo: "https://www.youtube.com/watch?v=Eo-KmOd3i7s",
genres: ["pop"],
year: 2000
},{
=======
title: "Burnin' Up",
artist: ["Jonas Brothers"],
featuredArtist: [],
emojiImgs: "๐ฅ๐ฅโฌ๏ธ",
musicVideo: "https://www.youtube.com/watch?v=5KNEZJ6KkLI",
genres: ["pop", "rock"],
year: 2008
},{
title: "Call Me Maybe",
artist: ["Carly Rae Jepsen"],
featuredArtist: [],
emojiImgs: "๐๐โ",
musicVideo: "https://www.youtube.com/watch?v=fWNaR-rxAic",
genres: ["pop"],
year: 2011
},{
>>>>>>>
title: "Bye Bye Bye",
artist: ["*NSYNC"],
featuredArtist: [],
emojiImgs: "๐๐๐",
musicVideo: "https://www.youtube.com/watch?v=Eo-KmOd3i7s",
genres: ["pop"],
year: 2000
},{
title: "Burnin' Up",
artist: ["Jonas Brothers"],
featuredArtist: [],
emojiImgs: "๐ฅ๐ฅโฌ๏ธ",
musicVideo: "https://www.youtube.com/watch?v=5KNEZJ6KkLI",
genres: ["pop", "rock"],
year: 2008
},{
title: "Call Me Maybe",
artist: ["Carly Rae Jepsen"],
featuredArtist: [],
emojiImgs: "๐๐โ",
musicVideo: "https://www.youtube.com/watch?v=fWNaR-rxAic",
genres: ["pop"],
year: 2011
},{ |
<<<<<<<
});
describe('filter-prop-list', function () {
it('should find "exact" matches from propList', function () {
var propList = ['font-size', 'margin', '!padding', '*border*', '*', '*y', '!*font*'];
var expected = 'font-size,margin';
expect(filterPropList.exact(propList).join()).toBe(expected);
});
it('should find "contain" matches from propList and reduce to string', function () {
var propList = ['font-size', '*margin*', '!padding', '*border*', '*', '*y', '!*font*'];
var expected = 'margin,border';
expect(filterPropList.contain(propList).join()).toBe(expected);
});
it('should find "start" matches from propList and reduce to string', function () {
var propList = ['font-size', '*margin*', '!padding', 'border*', '*', '*y', '!*font*'];
var expected = 'border';
expect(filterPropList.startWith(propList).join()).toBe(expected);
});
it('should find "end" matches from propList and reduce to string', function () {
var propList = ['font-size', '*margin*', '!padding', 'border*', '*', '*y', '!*font*'];
var expected = 'y';
expect(filterPropList.endWith(propList).join()).toBe(expected);
});
it('should find "not" matches from propList and reduce to string', function () {
var propList = ['font-size', '*margin*', '!padding', 'border*', '*', '*y', '!*font*'];
var expected = 'padding';
expect(filterPropList.notExact(propList).join()).toBe(expected);
});
it('should find "not contain" matches from propList and reduce to string', function () {
var propList = ['font-size', '*margin*', '!padding', '!border*', '*', '*y', '!*font*'];
var expected = 'font';
expect(filterPropList.notContain(propList).join()).toBe(expected);
});
it('should find "not start" matches from propList and reduce to string', function () {
var propList = ['font-size', '*margin*', '!padding', '!border*', '*', '*y', '!*font*'];
var expected = 'border';
expect(filterPropList.notStartWith(propList).join()).toBe(expected);
});
it('should find "not end" matches from propList and reduce to string', function () {
var propList = ['font-size', '*margin*', '!padding', '!border*', '*', '!*y', '!*font*'];
var expected = 'y';
expect(filterPropList.notEndWith(propList).join()).toBe(expected);
});
=======
});
describe('replace', function () {
it('should leave fallback pixel unit with root em value', function () {
var options = {
replace: false
};
var processed = postcss(pxToViewport(options)).process(basicCSS).css;
var expected = '.rule { font-size: 15px; font-size: 4.6875vw }';
expect(processed).toBe(expected);
});
>>>>>>>
});
describe('replace', function () {
it('should leave fallback pixel unit with root em value', function () {
var options = {
replace: false
};
var processed = postcss(pxToViewport(options)).process(basicCSS).css;
var expected = '.rule { font-size: 15px; font-size: 4.6875vw }';
expect(processed).toBe(expected);
});
});
describe('filter-prop-list', function () {
it('should find "exact" matches from propList', function () {
var propList = ['font-size', 'margin', '!padding', '*border*', '*', '*y', '!*font*'];
var expected = 'font-size,margin';
expect(filterPropList.exact(propList).join()).toBe(expected);
});
it('should find "contain" matches from propList and reduce to string', function () {
var propList = ['font-size', '*margin*', '!padding', '*border*', '*', '*y', '!*font*'];
var expected = 'margin,border';
expect(filterPropList.contain(propList).join()).toBe(expected);
});
it('should find "start" matches from propList and reduce to string', function () {
var propList = ['font-size', '*margin*', '!padding', 'border*', '*', '*y', '!*font*'];
var expected = 'border';
expect(filterPropList.startWith(propList).join()).toBe(expected);
});
it('should find "end" matches from propList and reduce to string', function () {
var propList = ['font-size', '*margin*', '!padding', 'border*', '*', '*y', '!*font*'];
var expected = 'y';
expect(filterPropList.endWith(propList).join()).toBe(expected);
});
it('should find "not" matches from propList and reduce to string', function () {
var propList = ['font-size', '*margin*', '!padding', 'border*', '*', '*y', '!*font*'];
var expected = 'padding';
expect(filterPropList.notExact(propList).join()).toBe(expected);
});
it('should find "not contain" matches from propList and reduce to string', function () {
var propList = ['font-size', '*margin*', '!padding', '!border*', '*', '*y', '!*font*'];
var expected = 'font';
expect(filterPropList.notContain(propList).join()).toBe(expected);
});
it('should find "not start" matches from propList and reduce to string', function () {
var propList = ['font-size', '*margin*', '!padding', '!border*', '*', '*y', '!*font*'];
var expected = 'border';
expect(filterPropList.notStartWith(propList).join()).toBe(expected);
});
it('should find "not end" matches from propList and reduce to string', function () {
var propList = ['font-size', '*margin*', '!padding', '!border*', '*', '!*y', '!*font*'];
var expected = 'y';
expect(filterPropList.notEndWith(propList).join()).toBe(expected);
}); |
<<<<<<<
it('should not add properties that already exist', function () {
var expected = '.rule { font-size: 16px; font-size: 5vw; }';
var processed = postcss(pxToViewport()).process(expected).css;
expect(processed).toBe(expected);
});
=======
it('should remain unitless if 0', function () {
var expected = '.rule { font-size: 0px; font-size: 0; }';
var processed = postcss(pxToViewport()).process(expected).css;
expect(processed).toBe(expected);
});
>>>>>>>
it('should remain unitless if 0', function () {
var expected = '.rule { font-size: 0px; font-size: 0; }';
var processed = postcss(pxToViewport()).process(expected).css;
expect(processed).toBe(expected);
});
it('should not add properties that already exist', function () {
var expected = '.rule { font-size: 16px; font-size: 5vw; }';
var processed = postcss(pxToViewport()).process(expected).css;
expect(processed).toBe(expected);
});
<<<<<<<
});
describe('replace', function () {
it('should leave fallback pixel unit with root em value', function () {
var options = {
replace: false
};
var processed = postcss(pxToViewport(options)).process(basicCSS).css;
var expected = '.rule { font-size: 15px; font-size: 4.6875vw }';
expect(processed).toBe(expected);
});
=======
});
describe('exclude', function () {
var rules = '.rule { border: 1px solid #000; font-size: 16px; margin: 1px 10px; }';
var covered = '.rule { border: 1px solid #000; font-size: 5vw; margin: 1px 3.125vw; }'
it('when using regex at the time, the style should not be overwritten.', function () {
var options = {
exclude: /node_modules/
}
var processed = postcss(pxToViewport(options)).process(rules, {
from: '/node_modules/main.css'
}).css;
expect(processed).toBe(rules);
});
it('when using regex at the time, the style should be overwritten.', function () {
var options = {
exclude: /node_modules/
}
var processed = postcss(pxToViewport(options)).process(rules, {
from: '/example/main.css'
}).css;
expect(processed).toBe(covered);
});
it('when using array at the time, the style should not be overwritten.', function () {
var options = {
exclude: [/node_modules/, /exclude/]
}
var processed = postcss(pxToViewport(options)).process(rules, {
from: '/exclude/main.css'
}).css;
expect(processed).toBe(rules);
});
it('when using array at the time, the style should be overwritten.', function () {
var options = {
exclude: [/node_modules/, /exclude/]
}
var processed = postcss(pxToViewport(options)).process(rules, {
from: '/example/main.css'
}).css;
expect(processed).toBe(covered);
});
>>>>>>>
});
describe('exclude', function () {
var rules = '.rule { border: 1px solid #000; font-size: 16px; margin: 1px 10px; }';
var covered = '.rule { border: 1px solid #000; font-size: 5vw; margin: 1px 3.125vw; }'
it('when using regex at the time, the style should not be overwritten.', function () {
var options = {
exclude: /node_modules/
}
var processed = postcss(pxToViewport(options)).process(rules, {
from: '/node_modules/main.css'
}).css;
expect(processed).toBe(rules);
});
it('when using regex at the time, the style should be overwritten.', function () {
var options = {
exclude: /node_modules/
}
var processed = postcss(pxToViewport(options)).process(rules, {
from: '/example/main.css'
}).css;
expect(processed).toBe(covered);
});
it('when using array at the time, the style should not be overwritten.', function () {
var options = {
exclude: [/node_modules/, /exclude/]
}
var processed = postcss(pxToViewport(options)).process(rules, {
from: '/exclude/main.css'
}).css;
expect(processed).toBe(rules);
});
it('when using array at the time, the style should be overwritten.', function () {
var options = {
exclude: [/node_modules/, /exclude/]
}
var processed = postcss(pxToViewport(options)).process(rules, {
from: '/example/main.css'
}).css;
expect(processed).toBe(covered);
});
});
describe('replace', function () {
it('should leave fallback pixel unit with root em value', function () {
var options = {
replace: false
};
var processed = postcss(pxToViewport(options)).process(basicCSS).css;
var expected = '.rule { font-size: 15px; font-size: 4.6875vw }';
expect(processed).toBe(expected);
}); |
<<<<<<<
grunt.loadNpmTasks('grunt-contrib-watch');
=======
grunt.loadNpmTasks('grunt-conventional-changelog');
>>>>>>>
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-conventional-changelog');
<<<<<<<
watch: {
src: {
files: ['lib/*.js', 'index.js', 'component.json'],
tasks: ['component:build:dev']
},
reload: {
files: ['build/*.js', 'examples/**/*.js'],
options: {
livereload: true
}
}
}
=======
changelog: {
options: {
dest: 'CHANGELOG.md'
}
}
>>>>>>>
watch: {
src: {
files: ['lib/*.js', 'index.js', 'component.json'],
tasks: ['component:build:dev']
},
reload: {
files: ['build/*.js', 'examples/**/*.js'],
options: {
livereload: true
}
}
},
changelog: {
options: {
dest: 'CHANGELOG.md'
}
} |
<<<<<<<
},
proposal_create : {
review_period: "Review period begin",
expiration_time: "Expiration time",
proposed_operations: "Proposed operations",
fee_paying_account: "Fee paying account"
=======
},
gateway: {
bridge: "Bridge",
gateway: "Gateway",
symbol: "Symbol",
deposit_to: "Deposit To",
balance: "Balance",
generate: "Generate",
deposit: "Deposit",
withdraw: "Withdraw",
inventory: "Inventory",
scan_qr: "Scan QR",
transwiser: {
gateway: "Transwiser",
visit_weidian: "Visit to deposit",
deposit_title: "Deposit RMB to %(asset)s",
withdraw_title: "Withdraw %(asset)s to RMB",
alipay: "ALIPAY Account Name",
withdraw_note: "Currently only ALIPAY withdraw is supported. Your asset will be converted at 1:1 ratio and send RMB to your ALIPAY account.",
you_will_receive: "You will receive %(amount)s RMB"
},
meta: {
open_website: "Open Website"
}
>>>>>>>
},
proposal_create : {
review_period: "Review period begin",
expiration_time: "Expiration time",
proposed_operations: "Proposed operations",
fee_paying_account: "Fee paying account"
},
gateway: {
bridge: "Bridge",
gateway: "Gateway",
symbol: "Symbol",
deposit_to: "Deposit To",
balance: "Balance",
generate: "Generate",
deposit: "Deposit",
withdraw: "Withdraw",
inventory: "Inventory",
scan_qr: "Scan QR",
transwiser: {
gateway: "Transwiser",
visit_weidian: "Visit to deposit",
deposit_title: "Deposit RMB to %(asset)s",
withdraw_title: "Withdraw %(asset)s to RMB",
alipay: "ALIPAY Account Name",
withdraw_note: "Currently only ALIPAY withdraw is supported. Your asset will be converted at 1:1 ratio and send RMB to your ALIPAY account.",
you_will_receive: "You will receive %(amount)s RMB"
},
meta: {
open_website: "Open Website"
} |
<<<<<<<
this.dispatch({newOrderID: orderID});
=======
console.log("cancel action:", accountID, orderID);
this.dispatch({init: orderID});
>>>>>>>
console.log("cancel action:", accountID, orderID);
this.dispatch({newOrderID: orderID}); |
<<<<<<<
describe('checklist filters', function () {
=======
it('should allow autofocus to be set on search using the bb-checklist-focus-search attribute', function () {
var el,
checklistHtml;
checklistHtml = '<bb-checklist ' +
'bb-checklist-items="items" ' +
'bb-checklist-include-search="locals.includeSearch"' +
'bb-checklist-mode="list" ' +
'bb-checklist-focus-search ' +
'bb-checklist-filter-local>' +
'</bb-checklist>';
$scope.locals = {
items: [
{
title: 'Title 1',
description: 'Description 1'
},
{
title: 'Title 2',
description: 'Description 2'
},
{
title: 'Title 3',
description: 'Description 3'
}
],
includeSearch: true
};
el = $compile(checklistHtml)($scope);
el.appendTo(document.body);
$scope.$digest();
expect(el.find('.bb-checklist-search input')).toHaveAttr('autofocus');
el.remove();
});
describe('category toolbar', function () {
>>>>>>>
it('should allow autofocus to be set on search using the bb-checklist-focus-search attribute', function () {
var el,
checklistHtml;
checklistHtml = '<bb-checklist ' +
'bb-checklist-items="items" ' +
'bb-checklist-include-search="locals.includeSearch"' +
'bb-checklist-mode="list" ' +
'bb-checklist-focus-search ' +
'bb-checklist-filter-local>' +
'</bb-checklist>';
$scope.locals = {
items: [
{
title: 'Title 1',
description: 'Description 1'
},
{
title: 'Title 2',
description: 'Description 2'
},
{
title: 'Title 3',
description: 'Description 3'
}
],
includeSearch: true
};
el = $compile(checklistHtml)($scope);
el.appendTo(document.body);
$scope.$digest();
expect(el.find('.bb-checklist-search input')).toHaveAttr('autofocus');
el.remove();
});
describe('checklist filters', function () { |
<<<<<<<
controller: 'bbTabsetCollapsibleController',
=======
require: 'tabset',
controller: BBTabsetCollapsibleController,
>>>>>>>
controller: BBTabsetCollapsibleController,
<<<<<<<
return angular.element('<div class="bb-tabset-dropdown nav nav-tabs" uib-dropdown ng-show="bbTabsetOptions.isSmallScreen && bbTabsetOptions.tabCount > 1"><button type="button" class="btn btn-primary bb-tab-dropdown-button" uib-dropdown-toggle>{{bbTabsetOptions.selectedTabHeader}}<i class="fa fa-caret-down"></i></button></div>');
=======
return angular.element(getTemplate($templateCache, 'dropdown'));
>>>>>>>
return angular.element(getTemplate($templateCache, 'dropdown'));
<<<<<<<
.controller('bbTabsetCollapsibleController', BBTabsetCollapsibleController)
.directive('tabset', Tabset)
.directive('uibTabset', Tabset)
.directive('bbTabsetCollapsible', BBTabsetCollapsible)
.directive('bbTabCollapseHeader', BBTabCollapseHeader)
.directive('tab', Tab)
.directive('uibTab', Tab);
=======
.directive('tabset', tabset)
.directive('bbTabsetCollapsible', bbTabsetCollapsible)
.directive('bbTabCollapseHeader', bbTabCollapseHeader)
.directive('tab', tab);
>>>>>>>
.directive('tabset', tabset)
.directive('uibTabset', tabset)
.directive('bbTabsetCollapsible', bbTabsetCollapsible)
.directive('bbTabCollapseHeader', bbTabCollapseHeader)
.directive('tab', tab)
.directive('uibTab', tab); |
<<<<<<<
describe('tabs with active attribute', function () {
var tabsHtml,
el;
beforeEach(function () {
tabsHtml = '<uib-tabset>' +
'<uib-tab heading="t.title" ng-repeat="t in myTabs" active="t.active">' +
'{{t.content}}' +
'</uib-tab>' +
'</uib-tabset>';
$scope.myTabs = [
{
title: 'Tab 1',
content: '1 content',
active: true
},
{
title: 'Tab 2',
content: '2 content'
},
{
title: 'Tab 3',
content: '3 content'
}
];
});
function getTabs(el) {
return el.find('ul.nav-tabs > li');
}
it('should change the tab when tab active is set to true', function () {
var tabsEl;
el = $compile(tabsHtml)($scope);
$scope.$digest();
$timeout.flush();
$scope.myTabs[1].active = true;
$scope.$digest();
expect($scope.myTabs[0].active).not.toBe(true);
expect($scope.myTabs[1].active).toBe(true);
expect($scope.myTabs[2].active).not.toBe(true);
tabsEl = getTabs(el);
expect(tabsEl.eq(0)).not.toHaveClass('active');
expect(tabsEl.eq(1)).toHaveClass('active');
expect(tabsEl.eq(2)).not.toHaveClass('active');
});
it('should change the active when the tab is clicked manually', function () {
var tabsEl;
el = $compile(tabsHtml)($scope);
$scope.$digest();
$timeout.flush();
tabsEl = getTabs(el);
tabsEl.eq(1).find('a').click();
$scope.$digest();
expect($scope.myTabs[0].active).not.toBe(true);
expect($scope.myTabs[1].active).toBe(true);
expect($scope.myTabs[2].active).not.toBe(true);
tabsEl = getTabs(el);
expect(tabsEl.eq(0)).not.toHaveClass('active');
expect(tabsEl.eq(1)).toHaveClass('active');
expect(tabsEl.eq(2)).not.toHaveClass('active');
});
it('should initialize the tabs properly when active is set to true', function () {
var tabsEl;
$scope.myTabs[0].active = false;
$scope.myTabs[1].active = true;
el = $compile(tabsHtml)($scope);
$scope.$digest();
$timeout.flush();
expect($scope.myTabs[0].active).not.toBe(true);
expect($scope.myTabs[1].active).toBe(true);
expect($scope.myTabs[2].active).not.toBe(true);
tabsEl = getTabs(el);
expect(tabsEl.eq(0)).not.toHaveClass('active');
expect(tabsEl.eq(1)).toHaveClass('active');
expect(tabsEl.eq(2)).not.toHaveClass('active');
$scope.myTabs[0].active = true;
$scope.$digest();
expect($scope.myTabs[0].active).toBe(true);
expect($scope.myTabs[1].active).not.toBe(true);
expect($scope.myTabs[2].active).not.toBe(true);
tabsEl = getTabs(el);
expect(tabsEl.eq(0)).toHaveClass('active');
expect(tabsEl.eq(1)).not.toHaveClass('active');
expect(tabsEl.eq(2)).not.toHaveClass('active');
});
});
=======
describe('Xs tab heading', function () {
it('should add a tab heading that is visible at xs breakpoints', function () {
var el,
largeHeadingEl,
smallHeadingEl,
tabHtml = '<uib-tabset>' +
'<uib-tab heading="{{locals.heading_lg}}" bb-tab-heading-xs="{{locals.heading_sm}}">' +
'Content 1' +
'</uib-tab>' +
'</uib-tabset>';
$scope.locals = {
heading_lg: 'Looooong heading',
heading_sm: 'Heading'
};
el = $compile(tabHtml)($scope);
$scope.$digest();
largeHeadingEl = el.find('li a .hidden-xs');
expect(largeHeadingEl).toHaveText($scope.locals.heading_lg);
smallHeadingEl = el.find('li a .visible-xs');
expect(smallHeadingEl).toHaveText($scope.locals.heading_sm);
$scope.locals.heading_sm = '1';
$scope.$digest();
smallHeadingEl = el.find('li a .visible-xs');
expect(smallHeadingEl).toHaveText($scope.locals.heading_sm);
});
});
>>>>>>>
describe('tabs with active attribute', function () {
var tabsHtml,
el;
beforeEach(function () {
tabsHtml = '<uib-tabset>' +
'<uib-tab heading="t.title" ng-repeat="t in myTabs" active="t.active">' +
'{{t.content}}' +
'</uib-tab>' +
'</uib-tabset>';
$scope.myTabs = [
{
title: 'Tab 1',
content: '1 content',
active: true
},
{
title: 'Tab 2',
content: '2 content'
},
{
title: 'Tab 3',
content: '3 content'
}
];
});
function getTabs(el) {
return el.find('ul.nav-tabs > li');
}
it('should change the tab when tab active is set to true', function () {
var tabsEl;
el = $compile(tabsHtml)($scope);
$scope.$digest();
$timeout.flush();
$scope.myTabs[1].active = true;
$scope.$digest();
expect($scope.myTabs[0].active).not.toBe(true);
expect($scope.myTabs[1].active).toBe(true);
expect($scope.myTabs[2].active).not.toBe(true);
tabsEl = getTabs(el);
expect(tabsEl.eq(0)).not.toHaveClass('active');
expect(tabsEl.eq(1)).toHaveClass('active');
expect(tabsEl.eq(2)).not.toHaveClass('active');
});
it('should change the active when the tab is clicked manually', function () {
var tabsEl;
el = $compile(tabsHtml)($scope);
$scope.$digest();
$timeout.flush();
tabsEl = getTabs(el);
tabsEl.eq(1).find('a').click();
$scope.$digest();
expect($scope.myTabs[0].active).not.toBe(true);
expect($scope.myTabs[1].active).toBe(true);
expect($scope.myTabs[2].active).not.toBe(true);
tabsEl = getTabs(el);
expect(tabsEl.eq(0)).not.toHaveClass('active');
expect(tabsEl.eq(1)).toHaveClass('active');
expect(tabsEl.eq(2)).not.toHaveClass('active');
});
it('should initialize the tabs properly when active is set to true', function () {
var tabsEl;
$scope.myTabs[0].active = false;
$scope.myTabs[1].active = true;
el = $compile(tabsHtml)($scope);
$scope.$digest();
$timeout.flush();
expect($scope.myTabs[0].active).not.toBe(true);
expect($scope.myTabs[1].active).toBe(true);
expect($scope.myTabs[2].active).not.toBe(true);
tabsEl = getTabs(el);
expect(tabsEl.eq(0)).not.toHaveClass('active');
expect(tabsEl.eq(1)).toHaveClass('active');
expect(tabsEl.eq(2)).not.toHaveClass('active');
$scope.myTabs[0].active = true;
$scope.$digest();
expect($scope.myTabs[0].active).toBe(true);
expect($scope.myTabs[1].active).not.toBe(true);
expect($scope.myTabs[2].active).not.toBe(true);
tabsEl = getTabs(el);
expect(tabsEl.eq(0)).toHaveClass('active');
expect(tabsEl.eq(1)).not.toHaveClass('active');
expect(tabsEl.eq(2)).not.toHaveClass('active');
});
});
describe('Xs tab heading', function () {
it('should add a tab heading that is visible at xs breakpoints', function () {
var el,
largeHeadingEl,
smallHeadingEl,
tabHtml = '<uib-tabset>' +
'<uib-tab heading="{{locals.heading_lg}}" bb-tab-heading-xs="{{locals.heading_sm}}">' +
'Content 1' +
'</uib-tab>' +
'</uib-tabset>';
$scope.locals = {
heading_lg: 'Looooong heading',
heading_sm: 'Heading'
};
el = $compile(tabHtml)($scope);
$scope.$digest();
largeHeadingEl = el.find('li a .hidden-xs');
expect(largeHeadingEl).toHaveText($scope.locals.heading_lg);
smallHeadingEl = el.find('li a .visible-xs');
expect(smallHeadingEl).toHaveText($scope.locals.heading_sm);
$scope.locals.heading_sm = '1';
$scope.$digest();
smallHeadingEl = el.find('li a .visible-xs');
expect(smallHeadingEl).toHaveText($scope.locals.heading_sm);
});
}); |
<<<<<<<
.waitForVisible('ul.uib-datepicker-popup', 3000);
=======
.waitForVisible('ul[uib-datepicker-popup-wrap]', 1500);
>>>>>>>
.waitForVisible('ul.uib-datepicker-popup', 1500);
<<<<<<<
.waitForVisible('ul.uib-datepicker-popup', 3000);
=======
.waitForVisible('ul[uib-datepicker-popup-wrap]', 1500);
>>>>>>>
.waitForVisible('ul.uib-datepicker-popup', 1500); |
<<<<<<<
['error-type', 'bb-error-type'],
=======
['ui-select', 'bb-select-field'],
>>>>>>>
['error-type', 'bb-error-type'],
['ui-select', 'bb-select-field'], |
<<<<<<<
path: 'popup',
getComponent(location, cb) {
require.ensure([], (require) => {
cb(null, require('./pages/PopupPage'));
});
},
},
{
path: 'tab',
=======
path: 'swipeAction',
>>>>>>>
path: 'popup',
getComponent(location, cb) {
require.ensure([], (require) => {
cb(null, require('./pages/PopupPage'));
});
},
},
{
path: 'swipeAction', |
<<<<<<<
;window.Swipe = function(element, options) {
=======
function Swipe(container, options) {
>>>>>>>
function Swipe(container, options) {
<<<<<<<
// static css
this.container.style.overflow = 'hidden';
this.element.style.listStyle = 'none';
this.element.style.margin = 0;
=======
var slide = slides[pos];
>>>>>>>
var slide = slides[pos];
<<<<<<<
// add event listeners
if (this.element.addEventListener) {
this.element.addEventListener('touchstart', this, false);
this.element.addEventListener('touchmove', this, false);
this.element.addEventListener('touchend', this, false);
this.element.addEventListener('touchcancel', this, false);
this.element.addEventListener('webkitTransitionEnd', this, false);
this.element.addEventListener('msTransitionEnd', this, false);
this.element.addEventListener('oTransitionEnd', this, false);
this.element.addEventListener('transitionend', this, false);
window.addEventListener('resize', this, false);
=======
>>>>>>>
<<<<<<<
// determine width of each slide
this.width = Math.ceil(("getBoundingClientRect" in this.container) ? this.container.getBoundingClientRect().width : this.container.offsetWidth);
// Fix width for Android WebView (i.e. PhoneGap)
if (this.width === 0 && typeof window.getComputedStyle === 'function') {
this.width = window.getComputedStyle(this.container, null).width.replace('px','');
}
// return immediately if measurement fails
if (!this.width) return null;
// hide slider element but keep positioning during setup
var origVisibility = this.container.style.visibility;
this.container.style.visibility = 'hidden';
// dynamic css
this.element.style.width = Math.ceil(this.slides.length * this.width) + 'px';
var index = this.slides.length;
while (index--) {
var el = this.slides[index];
el.style.width = this.width + 'px';
el.style.display = 'table-cell';
el.style.verticalAlign = 'top';
=======
>>>>>>>
<<<<<<<
// restore the visibility of the slider element
this.container.style.visibility = origVisibility;
=======
function move(index, dist, speed) {
>>>>>>>
function move(index, dist, speed) {
<<<<<<<
// cancel next scheduled automatic transition, if any
this.delay = delay || 0;
clearTimeout(this.interval);
=======
element.style.left = (( (to - from) * (Math.floor((timeElap / speed) * 100) / 100) ) + from) + 'px';
>>>>>>>
element.style.left = (( (to - from) * (Math.floor((timeElap / speed) * 100) / 100) ) + from) + 'px';
<<<<<<<
this.interval = (this.delay)
? setTimeout(function() {
_this.next(_this.delay);
}, this.delay)
: 0;
},
stop: function() {
this.delay = 0;
clearTimeout(this.interval);
},
resume: function() {
this.delay = this.options.auto || 0;
this.begin();
},
handleEvent: function(e) {
switch (e.type) {
case 'touchstart': this.onTouchStart(e); break;
case 'touchmove': this.onTouchMove(e); break;
case 'touchcancel' :
case 'touchend': this.onTouchEnd(e); break;
case 'webkitTransitionEnd':
case 'msTransitionEnd':
case 'oTransitionEnd':
case 'transitionend': this.transitionEnd(e); break;
case 'resize': this.setup(); break;
=======
>>>>>>>
<<<<<<<
// set transition time to 0 for 1-to-1 touch movement
this.element.style.MozTransitionDuration = this.element.style.webkitTransitionDuration = 0;
e.stopPropagation();
},
=======
// expose the Swipe API
return {
setup: function() {
>>>>>>>
// expose the Swipe API
return {
setup: function() {
<<<<<<<
}
e.stopPropagation();
=======
if (browser.transitions) translate(pos, 0, 0);
}
// removed event listeners
if (browser.addEventListener) {
// remove current event listeners
element.removeEventListener('touchstart', events, false);
element.removeEventListener('webkitTransitionEnd', events, false);
element.removeEventListener('msTransitionEnd', events, false);
element.removeEventListener('oTransitionEnd', events, false);
element.removeEventListener('otransitionend', events, false);
element.removeEventListener('transitionend', events, false);
window.removeEventListener('resize', events, false);
}
else {
window.onresize = null;
}
}
>>>>>>>
if (browser.transitions) translate(pos, 0, 0);
}
// removed event listeners
if (browser.addEventListener) {
// remove current event listeners
element.removeEventListener('touchstart', events, false);
element.removeEventListener('webkitTransitionEnd', events, false);
element.removeEventListener('msTransitionEnd', events, false);
element.removeEventListener('oTransitionEnd', events, false);
element.removeEventListener('otransitionend', events, false);
element.removeEventListener('transitionend', events, false);
window.removeEventListener('resize', events, false);
}
else {
window.onresize = null;
}
} |
<<<<<<<
}
/**
* @method invalidate
*
* Invalidate this brush, if its content was updated
*/
=======
};
>>>>>>>
};
/**
* @method invalidate
*
* Invalidate this brush, if its content was updated
*/
<<<<<<<
}
/**
* @method clone
*
* Clone this brush
*
* @return {anm.Brush} clone
*/
=======
};
>>>>>>>
};
/**
* @method clone
*
* Clone this brush
*
* @return {anm.Brush} clone
*/
<<<<<<<
}
/**
* @static @method fill
*
* Create a Fill-Brush
*
* See {@link anm.Element#fill Element.fill()}
*
* Examples:
*
* * `var brush = Brush.fill('#ff0000')`
* * `var brush = Brush.fill(Color.rgba(70, 12, 35, 0.5))`
* * `var brush = Brush.fill(Color.hsl(0.6, 100, 15))`
* * `var brush = Brush.fill(Brush.grad({0: '#ffffff', 0.5: '#cccccc'}))`
*
* @param {String|Object} color color or gradient
* @return {anm.Brush}
*/
=======
};
>>>>>>>
};
/**
* @static @method fill
*
* Create a Fill-Brush
*
* See {@link anm.Element#fill Element.fill()}
*
* Examples:
*
* * `var brush = Brush.fill('#ff0000')`
* * `var brush = Brush.fill(Color.rgba(70, 12, 35, 0.5))`
* * `var brush = Brush.fill(Color.hsl(0.6, 100, 15))`
* * `var brush = Brush.fill(Brush.grad({0: '#ffffff', 0.5: '#cccccc'}))`
*
* @param {String|Object} color color or gradient
* @return {anm.Brush}
*/
<<<<<<<
}
/**
* @static @method stroke
*
* Create a Stroke-Brush
*
* See {@link anm.Element#stroke Element.stroke()}
*
* Examples:
*
* * `var brush = Brush.stroke('#ff0000', 2)`
* * `var brush = Brush.stroke(Color.rgba(70, 12, 35, 0.5), 5, C.PC_ROUND)`
* * `var brush = Brush.stroke(Color.hsl(0.6, 100, 15), 1)`
* * `var brush = Brush.stroke(Brush.grad({0: '#ffffff', 0.5: '#cccccc'}), 2)`
*
* @param {String|Object} color color or gradient
* @param {Number} width width, in pixels
* @param {C.PC_*} [cap]
* @param {C.PC_*} [join]
* @param {C.PC_*} [mitter]
*
* @return {anm.Brush}
*/
=======
};
>>>>>>>
};
/**
* @static @method stroke
*
* Create a Stroke-Brush
*
* See {@link anm.Element#stroke Element.stroke()}
*
* Examples:
*
* * `var brush = Brush.stroke('#ff0000', 2)`
* * `var brush = Brush.stroke(Color.rgba(70, 12, 35, 0.5), 5, C.PC_ROUND)`
* * `var brush = Brush.stroke(Color.hsl(0.6, 100, 15), 1)`
* * `var brush = Brush.stroke(Brush.grad({0: '#ffffff', 0.5: '#cccccc'}), 2)`
*
* @param {String|Object} color color or gradient
* @param {Number} width width, in pixels
* @param {C.PC_*} [cap]
* @param {C.PC_*} [join]
* @param {C.PC_*} [mitter]
*
* @return {anm.Brush}
*/
<<<<<<<
}
/**
* @static @method shadow
*
* Create a Shadow-Brush
*
* See {@link anm.Element#shadow Element.shadow()}
*
* Examples:
*
* * `var brush = Brush.shadow('#ff0000', 2)`
* * `var brush = Brush.shadow(Color.rgba(70, 12, 35, 0.5), 5, 2, 2)`
*
* @param {String|Object} color color or gradient
* @param {Number} [blurRadius] blur radius
* @param {Number} [offsetX] offset by X axis
* @param {Number} [offsetY] offset by Y axis
*
* @return {anm.Brush}
*/
=======
};
>>>>>>>
};
/**
* @static @method shadow
*
* Create a Shadow-Brush
*
* See {@link anm.Element#shadow Element.shadow()}
*
* Examples:
*
* * `var brush = Brush.shadow('#ff0000', 2)`
* * `var brush = Brush.shadow(Color.rgba(70, 12, 35, 0.5), 5, 2, 2)`
*
* @param {String|Object} color color or gradient
* @param {Number} [blurRadius] blur radius
* @param {Number} [offsetX] offset by X axis
* @param {Number} [offsetY] offset by Y axis
*
* @return {anm.Brush}
*/
<<<<<<<
}
Brush.value = function(value, target) {
var brush = target || (new Brush());
=======
};
Brush.value = function(value) {
var brush = new Brush();
>>>>>>>
};
Brush.value = function(value, target) {
var brush = target || (new Brush());
<<<<<<<
}
Brush.grad = function(stops, bounds, dir) {
var new_stops = [];
for (var prop in stops) {
new_stops.push([prop, stops[prop]]);
}
return { grad: {
stops: stops,
bounds: bounds,
dir: dir
} };
}
Brush.rgrad = function(stops, r, bounds, dir) {
var new_stops = [];
for (var prop in stops) {
new_stops.push([prop, stops[prop]]);
}
return { grad: {
r: r,
stops: stops,
bounds: bounds,
dir: dir
} };
}
=======
};
>>>>>>>
};
Brush.grad = function(stops, bounds, dir) {
var new_stops = [];
for (var prop in stops) {
new_stops.push([prop, stops[prop]]);
}
return { grad: {
stops: stops,
bounds: bounds,
dir: dir
} };
};
Brush.rgrad = function(stops, r, bounds, dir) {
var new_stops = [];
for (var prop in stops) {
new_stops.push([prop, stops[prop]]);
}
return { grad: {
r: r,
stops: stops,
bounds: bounds,
dir: dir
} };
}; |
<<<<<<<
return function(t, dt, duration, data) {
// TODO
=======
return function(t, duration, data) {
this.hx = data[0][0] * (1.0 - t) + data[1][0] * t;
this.hy = data[0][1] * (1.0 - t) + data[1][1] * t;
>>>>>>>
return function(t, dt, duration, data) {
this.hx = data[0][0] * (1.0 - t) + data[1][0] * t;
this.hy = data[0][1] * (1.0 - t) + data[1][1] * t;
<<<<<<<
ctx.textBaseline = baseline || Text.BASELINE_RULE;
ctx.translate(pos[0]/* + (dimen[0] / 2)*/, pos[1]);
=======
ctx.textBaseline = baseline || Text.BASELINE_RULE; // FIXME: store inside
ctx.textAlign = this.align || Text.DEFAULT_ALIGN;
ctx.translate(point[0]/* + (dimen[0] / 2)*/, point[1]);
>>>>>>>
ctx.textBaseline = baseline || Text.BASELINE_RULE; // FIXME: store inside
ctx.textAlign = this.align || Text.DEFAULT_ALIGN;
ctx.translate(pos[0]/* + (dimen[0] / 2)*/, pos[1]);
<<<<<<<
//if (this._dimen) return this._dimen;
if (!Text.__measuring_f) throw new SysErr('no Text buffer, bounds call failed');
return Text.__measuring_f(this);
=======
if (this._dimen) return this._dimen;
if (!Text.__buff) throw new SysErr('no Text buffer, bounds call failed');
var buff = Text.__buff;
buff.style.font = this.font;
buff.style.textAlign = this.align;
//buff.style.verticalAlign = baseline
if (__arr(this.lines)) {
buff.textContent = this.lines.join('<br/>');
} else {
buff.textContent = this.lines.toString();
}
return (this._dimen = [ buff.offsetWidth,
buff.offsetHeight ]);
>>>>>>>
//if (this._dimen) return this._dimen;
if (!Text.__measuring_f) throw new SysErr('no Text buffer, bounds call failed');
return Text.__measuring_f(this); |
<<<<<<<
"sign_in_with_ledger":"LEDGER",
=======
"TRC20_under_maintenance":"TRC20 under maintenance",
"transaction_fewer_than_100000":"1. When there are fewer than 100,000 (including 100,000) transaction data entries, all the data will be displayed.",
"transaction_more_than_100000":"2. When there are more than 100,000 transaction data entries, data of the latest 7 days will be displayed. ",
>>>>>>>
"sign_in_with_ledger":"LEDGER",
"TRC20_under_maintenance":"TRC20 under maintenance",
"transaction_fewer_than_100000":"1. When there are fewer than 100,000 (including 100,000) transaction data entries, all the data will be displayed.",
"transaction_more_than_100000":"2. When there are more than 100,000 transaction data entries, data of the latest 7 days will be displayed. ", |
<<<<<<<
var meta = require('./meta');
=======
var gsub = require('./gsub');
>>>>>>>
var gsub = require('./gsub');
var meta = require('./meta');
<<<<<<<
if (metaTable) {
tables.push(metaTable);
}
=======
// Optional tables
if (font.tables.gsub) {
tables.push(gsub.make(font.tables.gsub));
}
>>>>>>>
// Optional tables
if (font.tables.gsub) {
tables.push(gsub.make(font.tables.gsub));
}
if (metaTable) {
tables.push(metaTable);
} |
<<<<<<<
import React from 'react';
import { Link } from 'react-router-dom';
import Container from '../../components/common/Container';
=======
import React from 'react';
import { Link } from 'react-router-dom';
>>>>>>>
import React from "react";
import { Link } from "react-router-dom";
import Container from "../../components/common/Container";
<<<<<<<
InnerContainer
} from './style';
import BLM from '../../assets/blm.svg';
const NotFound = () => (
<Container>
=======
InnerContainer
} from './style';
import BLM from '../../assets/blm.svg';
const NotFound = () => (
<div>
>>>>>>>
InnerContainer,
} from "./style";
import BLM from "../../assets/blm.svg";
const NotFound = () => (
<Container>
<<<<<<<
404
{' '}
<br />
=======
404
<br />
>>>>>>>
404 <br />
<<<<<<<
</Container>
);
=======
</div>
);
>>>>>>>
</Container>
); |
<<<<<<<
this.meshSphere = new THREE.Mesh(this.geometrySphere, this.matWireFrame);
//this.meshSphere.rotation.y += this.curFileDataType.startRotY;
//this.meshSphere.rotation.x += this.curFileDataType.startRotX;
=======
this.meshSphere = new THREE.Mesh(this.geometrySphere);
this.meshSphere.rotation.y += this.curFileDataType.startRotY;
this.meshSphere.rotation.x += this.curFileDataType.startRotX;
>>>>>>>
this.meshSphere = new THREE.Mesh(this.geometrySphere);
this.meshSphere.rotation.y += this.curFileDataType.startRotY;
this.meshSphere.rotation.x += this.curFileDataType.startRotX;
<<<<<<<
this.geometrySphere.translate(-stepSize, 0.0, 0.0);
//this.geometryWireFrameSphere.translate(-stepSize, 0.0, 0.0);
=======
this.geometrySphere.translate(vDelta.x, vDelta.y, vDelta.z);
this.geometryWireFrameSphere.translate(vDelta.x, vDelta.y, vDelta.z);
>>>>>>>
this.geometrySphere.translate(vDelta.x, vDelta.y, vDelta.z);
<<<<<<<
this.geometrySphere.translate(stepSize, 0.0, 0.0);
//this.geometryWireFrameSphere.translate(stepSize, 0.0, 0.0);
=======
this.geometrySphere.translate(vDelta.x, vDelta.y, vDelta.z);
this.geometryWireFrameSphere.translate(vDelta.x, vDelta.y, vDelta.z);
>>>>>>>
this.geometrySphere.translate(vDelta.x, vDelta.y, vDelta.z);
<<<<<<<
this.geometrySphere.translate(0.0, stepSize, 0.0);
//this.geometryWireFrameSphere.translate(0.0, stepSize, 0.0);
=======
>>>>>>>
//this.geometrySphere.translate(0.0, stepSize, 0.0);
<<<<<<<
this.geometrySphere.translate(0.0, -stepSize, 0.0);
//this.geometryWireFrameSphere.translate(0.0, -stepSize, 0.0);
=======
>>>>>>>
//this.geometrySphere.translate(0.0, -stepSize, 0.0);
<<<<<<<
this.geometrySphere.translate(0.0, 0.0, stepSize);
//this.geometryWireFrameSphere.translate(0.0, 0.0, stepSize);
=======
>>>>>>>
this.geometrySphere.translate(0.0, 0.0, stepSize);
<<<<<<<
this.geometrySphere.translate(0.0, 0.0, -stepSize);
//this.geometryWireFrameSphere.translate(0.0, 0.0, -stepSize);
=======
>>>>>>>
//this.geometrySphere.translate(0.0, 0.0, -stepSize); |
<<<<<<<
// import GlCheck from './glcheck';
=======
>>>>>>>
<<<<<<<
// this.canvas3d = document.createElementNS('http://www.w3.org/1999/xhtml', 'canvas');
const glSelector = new GlSelector();
this.context = glSelector.createWebGLContext();
//this.engine2d.isWebGL2 = glSelector.useWebGL2();
this.canvas3d = glSelector.getCanvas();
this.renderer = new THREE.WebGLRenderer({
antialias: false, canvas: this.canvas3d,
preserveDrawingBuffer: true, context: this.context
});
=======
this.canvas3d = document.createElementNS('http://www.w3.org/1999/xhtml', 'canvas');
//root3dContainer.append(this.canvas3d);
this.context = this.canvas3d.getContext('webgl2');
this.renderer = new THREE.WebGLRenderer({
antialias: false, canvas: this.canvas3d,
preserveDrawingBuffer: true, context: this.context
});
>>>>>>>
// this.renderer = new THREE.WebGLRenderer({ antialias: false }
// this.canvas3d = document.createElementNS('http://www.w3.org/1999/xhtml', 'canvas');
const glSelector = new GlSelector();
this.context = glSelector.createWebGLContext();
//this.engine2d.isWebGL2 = glSelector.useWebGL2();
this.canvas3d = glSelector.getCanvas();
this.renderer = new THREE.WebGLRenderer({
antialias: false, canvas: this.canvas3d,
preserveDrawingBuffer: true, context: this.context
});
<<<<<<<
=======
// this.renderer.clearTarget(this.ffTexture);
>>>>>>>
<<<<<<<
=======
// this.renderer.clearTarget();
>>>>>>> |
<<<<<<<
"develpopers_reward_tip":"Thank you for considering to help out with the java-tron! TRON Foundation welcome contributions from anyone on the internet, and are grateful for your contributions.",
"verifty_contract_result":"Validation results",
"main_contract_deployment":"(Please select the main contract deployment)",
"enter_main_contract":"Please enter the name of the main contract",
"contract_verifty_passed":"Verified",
"unverifty_passed":"Unverified",
=======
"developers_reward_tip":"Thank you for considering to help out with the java-tron! TRON Foundation welcome contributions from anyone on the internet, and are grateful for your contributions.",
"developers_niTron":"niTron global developer conference will be held in Korea at 29 Feb, 2020. By the end of 31 Jan, 2020, developers with the total points end up in Top 5 will be rewarded two tickets each.",
>>>>>>>
"develpopers_reward_tip":"Thank you for considering to help out with the java-tron! TRON Foundation welcome contributions from anyone on the internet, and are grateful for your contributions.",
"verifty_contract_result":"Validation results",
"main_contract_deployment":"(Please select the main contract deployment)",
"enter_main_contract":"Please enter the name of the main contract",
"contract_verifty_passed":"Verified",
"unverifty_passed":"Unverified",
"developers_reward_tip":"Thank you for considering to help out with the java-tron! TRON Foundation welcome contributions from anyone on the internet, and are grateful for your contributions.",
"developers_niTron":"niTron global developer conference will be held in Korea at 29 Feb, 2020. By the end of 31 Jan, 2020, developers with the total points end up in Top 5 will be rewarded two tickets each.", |
<<<<<<<
'sloppy', 'stupid', 'sub', 'vars', 'white', 'widget', 'windows',
'json', 'color'
=======
'sloppy', 'sub', 'vars', 'white', 'widget', 'windows',
'json', 'color', 'terse'
>>>>>>>
'sloppy', 'stupid', 'sub', 'vars', 'white', 'widget', 'windows',
'json', 'color', 'terse' |
<<<<<<<
slideUp () {
this.$el.classList.add('slide-up')
}
slideDown () {
this.$el.classList.remove('slide-up')
}
=======
}
function toggleInner (element, toggle) {
let direction = toggle ? 'enter' : 'leave'
element.classList.add(`fade-${direction}`, `fade-${direction}-active`)
css(element, 'display', 'block')
// trigger layout
/* eslint-disable no-unused-expressions */
element.offsetWidth
/* eslint-enable no-unused-expressions */
whenTransitionEnds(element, 'transition', () => {
element.classList.remove(`fade-${direction}-to`, `fade-${direction}-active`)
css(element, 'display', toggle ? 'block' : 'none')
})
nextFrame(() => {
element.classList.add(`fade-${direction}-to`)
element.classList.remove(`fade-${direction}`)
})
>>>>>>>
slideUp () {
this.$el.classList.add('slide-up')
}
slideDown () {
this.$el.classList.remove('slide-up')
}
}
function toggleInner (element, toggle) {
let direction = toggle ? 'enter' : 'leave'
element.classList.add(`fade-${direction}`, `fade-${direction}-active`)
css(element, 'display', 'block')
// trigger layout
/* eslint-disable no-unused-expressions */
element.offsetWidth
/* eslint-enable no-unused-expressions */
whenTransitionEnds(element, 'transition', () => {
element.classList.remove(`fade-${direction}-to`, `fade-${direction}-active`)
css(element, 'display', toggle ? 'block' : 'none')
})
nextFrame(() => {
element.classList.add(`fade-${direction}-to`)
element.classList.remove(`fade-${direction}`)
}) |
<<<<<<<
// read <mip-shell> and save in `data`
this.data.appshell = getMIPShellConfig();
if (!this.data.appshell.header.title) {
this.data.appshell.header.title = document.querySelector('title').innerHTML;
}
if (!this.data.appshell.view.base) {
// TODO: try to resolve base in <base> tag
// this.data.appshell.view.base =
}
=======
>>>>>>> |
<<<<<<<
for (let k of Object.keys(data)) {
data[`#${k}`] = data[k]
delete data[k]
=======
let win = isSelfParent(window) ? window : window.parent
MIP.$set({}, 0, true, win)
for (let i = 0, frames = win.document.getElementsByTagName('iframe'); i < frames.length; i++) {
if (frames[i].classList.contains('mip-page__iframe') &&
frames[i].getAttribute('data-page-id')
) {
let subwin = frames[i].contentWindow
MIP.$set({}, 0, true, subwin)
}
>>>>>>>
for (let k of Object.keys(data)) {
data[`#${k}`] = data[k]
delete data[k]
<<<<<<<
=======
let g = getGlobalData(window)
assign(g, classified.globalData)
>>>>>>>
<<<<<<<
} else if (!win.MIP.viewer.page.isRootPage && win.parent.g && win.parent.g.hasOwnProperty(key)) {
=======
} else if (!isSelfParent(win) && win.parent.g && win.parent.g.hasOwnProperty(key)) {
assign(win.parent.g, data)
>>>>>>>
} else if (!isSelfParent(win) && win.parent.g && win.parent.g.hasOwnProperty(key)) {
<<<<<<<
Object.assign(win.m, data.pageData)
!cancel && Object.keys(data.pageData).forEach(k => win.pgStates.add(k))
let globalData = data.globalData
Object.keys(globalData).forEach(key => {
=======
let g = getGlobalData(win)
Object.assign(win.m, data)
!cancel && Object.keys(data).forEach(k => win.pgStates.add(k))
Object.keys(g).forEach(key => {
>>>>>>>
Object.assign(win.m, data.pageData)
!cancel && Object.keys(data.pageData).forEach(k => win.pgStates.add(k))
let globalData = data.globalData
Object.keys(globalData).forEach(key => {
<<<<<<<
setProto(win.m, win.MIP.viewer.page.isRootPage ? win.g : win.parent.g)
=======
win.m.__proto__ = g // eslint-disable-line no-proto
>>>>>>>
setProto(win.m, getGlobalData(win))
<<<<<<<
function setProto (oldObj, newObj) {
Object.keys(newObj).forEach(key => {
if (!oldObj[key]) {
oldObj[key] = JSON.parse(JSON.stringify(newObj[key]))
}
})
}
=======
function isSelfParent (win) {
let page = win.MIP.viewer.page
return page.isRootPage || page.isCrossOrigin
}
function getGlobalData (win) {
return isSelfParent(win) ? win.g : win.parent.g
}
>>>>>>>
function setProto (oldObj, newObj) {
Object.keys(newObj).forEach(key => {
if (!oldObj[key]) {
oldObj[key] = JSON.parse(JSON.stringify(newObj[key]))
}
})
}
function isSelfParent (win) {
let page = win.MIP.viewer.page
return page.isRootPage || page.isCrossOrigin
}
function getGlobalData (win) {
return isSelfParent(win) ? win.g : win.parent.g
} |
<<<<<<<
run.stderr.on('data', function (data){
=======
if (data) {
run.stdin.setEncoding('utf-8');
run.stdin.write(data);
run.stdin.end();
}
run.stdout.on('data', function (data) {
>>>>>>>
run.stderr.on('data', function (data){
if (data) {
run.stdin.setEncoding('utf-8');
run.stdin.write(data);
run.stdin.end();
}
run.stdout.on('data', function (data) { |
<<<<<<<
func = v => signs.includes(this.arrangement[v])
} else if (typeof func == 'number') {
let sign = func
func = v => this.arrangement[v] == sign
=======
func = v => signs.includes(this.get(v))
>>>>>>>
func = v => signs.includes(this.get(v))
} else if (typeof func == 'number') {
let sign = func
func = v => this.get(v) == sign
<<<<<<<
return this.getConnectedComponent(vertex, this.arrangement[vertex])
}
hasLiberties(vertex, visited = []) {
let sign = this.arrangement[vertex]
if (!this.hasVertex(vertex) || sign == 0) return false
if (visited.some(v => v[0] == vertex[0] && v[1] == vertex[1]))
return false
let neighbors = this.getNeighbors(vertex)
if (neighbors.some(n => this.arrangement[n] == 0))
return true
visited.push(vertex)
return neighbors.filter(n => this.arrangement[n] == sign)
.some(n => this.hasLiberties(n, visited))
=======
return this.getConnectedComponent(vertex, [this.get(vertex)])
>>>>>>>
return this.getConnectedComponent(vertex, [this.get(vertex)])
}
hasLiberties(vertex, visited = []) {
let sign = this.get(vertex)
if (!this.hasVertex(vertex) || sign == 0) return false
if (visited.some(v => v[0] == vertex[0] && v[1] == vertex[1]))
return false
let neighbors = this.getNeighbors(vertex)
if (neighbors.some(n => this.get(n) == 0))
return true
visited.push(vertex)
return neighbors.filter(n => this.get(n) == sign)
.some(n => this.hasLiberties(n, visited))
<<<<<<<
let freeNeighbors = this.getNeighbors(c).filter(n => this.arrangement[n] == 0)
liberties.push(...freeNeighbors.filter(n => !(n in added)))
freeNeighbors.forEach(n => added[n] = true)
=======
liberties.push(...this.getNeighbors(c).filter(n => {
return this.get(n) == 0
&& !liberties.some(v => v[0] == n[0] && v[1] == n[1])
}))
>>>>>>>
let freeNeighbors = this.getNeighbors(c).filter(n => this.get(n) == 0)
liberties.push(...freeNeighbors.filter(n => !(n in added)))
freeNeighbors.forEach(n => added[n] = true)
<<<<<<<
if (sign == 0) sign = this.arrangement[n]
else if (sign != this.arrangement[n]) indicator = 0
=======
if (sign == 0) sign = map[n] = this.get(n)
else if (sign != this.get(n)) indicator = 0
>>>>>>>
if (sign == 0) sign = map[n] = this.get(n)
else if (sign != this.get(n)) indicator = 0
<<<<<<<
if (this.arrangement[vertex] == 0 || vertex in liberties) continue
if (!this.hasLiberties(vertex)) return false
=======
if (this.get(vertex) == 0 || vertex in liberties) continue
let l = this.getLiberties(vertex).length
if (l == 0) return false
>>>>>>>
if (this.get(vertex) == 0 || vertex in liberties) continue
if (!this.hasLiberties(vertex)) return false
<<<<<<<
=======
this.getNeighbors(vertex).forEach(n => {
if (move.get(n) != -sign) return
>>>>>>>
<<<<<<<
move.arrangement[c] = 0
move.captures[sign]++
=======
move.set(c, 0)
move.captures[sign.toString()]++
>>>>>>>
move.set(c, 0)
move.captures[sign.toString()]++
<<<<<<<
=======
move.set(vertex, sign)
>>>>>>>
move.set(vertex, sign)
<<<<<<<
if (deadNeighbors.length == 0 && !move.hasLiberties(vertex)) {
move.getChain(vertex).forEach(c => {
move.arrangement[c] = 0
move.captures[-sign]++
})
=======
if (move.getLiberties(vertex).length == 0) {
chain.forEach(c => {
move.set(c, 0)
move.captures[(-sign).toString()]++
})
}
>>>>>>>
if (deadNeighbors.length == 0 && !move.hasLiberties(vertex)) {
move.getChain(vertex).forEach(c => {
move.set(c, 0)
move.captures[-sign]++
})
<<<<<<<
=======
guessDeadStones() {
let map = this.getAreaEstimateMap()
let done = {}
let result = []
let list = []
for (let x = 0; x < this.width; x++) {
for (let y = 0; y < this.height; y++) {
let vertex = [x, y]
let sign = this.get(vertex)
if (sign == 0 || vertex in done) continue
let area = this.getConnectedComponent(vertex, v => map[v] == sign)
area.forEach(v => { done[v] = true })
list.push([vertex, area.length])
}
}
list.sort((a, b) => { return a[1] - b[1] })
for (let i = 0; i < list.length; i++) {
let vertex = list[i][0]
let sign = this.get(vertex)
let area = this.getConnectedComponent(vertex, v => map[v] == sign)
if (area.length >= 8) continue
area.forEach(v => { map[v] = -sign })
result.push(...area.filter(v => this.get(v) != 0))
}
return result
}
determineDeadStones() {
let map = this.getAreaMap()
let done = {}
let result = []
for (let i = 0; i < this.width; i++) {
for (let j = 0; j < this.height; j++) {
let vertex = [i, j]
if (map[vertex] != 0 || vertex in done) continue
let posArea = this.getConnectedComponent(vertex, [0, -1])
let negArea = this.getConnectedComponent(vertex, [0, 1])
let posDead = posArea.filter(v => this.get(v) == -1)
let negDead = negArea.filter(v => this.get(v) == 1)
let sign = 0
let actualArea, actualDead
let negDiff = negArea.filter(y => {
return !negDead.some(x => x[0] == y[0] && x[1] == y[1])
&& !posArea.some(x => x[0] == y[0] && x[1] == y[1])
})
let posDiff = posArea.filter(y => {
return !posDead.some(x => x[0] == y[0] && x[1] == y[1])
&& !negArea.some(x => x[0] == y[0] && x[1] == y[1])
})
if (negDiff.length <= 1 && negDead.length <= posDead.length) {
sign--
actualArea = negArea
actualDead = negDead
}
if (posDiff.length <= 1 && posDead.length <= negDead.length) {
sign++
actualArea = posArea
actualDead = posDead
}
if (sign == 0) {
actualArea = this.getChain(vertex)
actualDead = []
}
actualArea.forEach(v => { done[v] = 1 })
result.push(...actualDead)
}
}
return result
}
>>>>>>> |
<<<<<<<
"develpopers_reward_tip":"Thank you for considering to help out with the java-tron! TRON Foundation welcome contributions from anyone on the internet, and are grateful for your contributions.",
"verifty_contract_result":"Validation results",
"main_contract_deployment":"(Please select the main contract deployment)",
"enter_main_contract":"Please enter the name of the main contract",
"contract_verifty_passed":"Verified",
"unverifty_passed":"Unverified",
=======
"developers_reward_tip":"Thank you for considering to help out with the java-tron! TRON Foundation welcome contributions from anyone on the internet, and are grateful for your contributions.",
"developers_niTron":"niTron global developer conference will be held in Korea at 29 Feb, 2020. By the end of 31 Jan, 2020, developers with the total points end up in Top 5 will be rewarded two tickets each.",
>>>>>>>
"develpopers_reward_tip":"Thank you for considering to help out with the java-tron! TRON Foundation welcome contributions from anyone on the internet, and are grateful for your contributions.",
"verifty_contract_result":"Validation results",
"main_contract_deployment":"(Please select the main contract deployment)",
"enter_main_contract":"Please enter the name of the main contract",
"contract_verifty_passed":"Verified",
"unverifty_passed":"Unverified",
"developers_reward_tip":"Thank you for considering to help out with the java-tron! TRON Foundation welcome contributions from anyone on the internet, and are grateful for your contributions.",
"developers_niTron":"niTron global developer conference will be held in Korea at 29 Feb, 2020. By the end of 31 Jan, 2020, developers with the total points end up in Top 5 will be rewarded two tickets each.", |
<<<<<<<
=======
/**
* @property {string} The OS's path separator.
*/
pathSeparator: WINDOWS ? "\\" : "/",
/**
* Expands "~" and environment variables in <b>path</b>.
*
* "~" is expanded to to the value of $HOME. On Windows if this is not
* set then the following are tried in order:
* $USERPROFILE
* ${HOMDRIVE}$HOMEPATH
*
* The variable notation is $VAR (terminated by a non-word character)
* or ${VAR}. %VAR% is also supported on Windows.
*
* @param {string} path The unexpanded path string.
* @param {boolean} relative Whether the path is relative or absolute.
* @returns {string}
*/
>>>>>>>
/**
* Expands "~" and environment variables in <b>path</b>.
*
* "~" is expanded to to the value of $HOME. On Windows if this is not
* set then the following are tried in order:
* $USERPROFILE
* ${HOMDRIVE}$HOMEPATH
*
* The variable notation is $VAR (terminated by a non-word character)
* or ${VAR}. %VAR% is also supported on Windows.
*
* @param {string} path The unexpanded path string.
* @param {boolean} relative Whether the path is relative or absolute.
* @returns {string}
*/
<<<<<<<
getRCFile: function (dir, always)
=======
/**
* Returns the first user RC file found in <b>dir</b>.
*
* @param {string} dir The directory to search.
* @default $HOME.
*/
getRCFile: function (dir)
>>>>>>>
/**
* Returns the first user RC file found in <b>dir</b>.
*
* @param {string} dir The directory to search.
* @param {boolean} always When true, return a path whether
* the file exists or not.
* @default $HOME.
*/
getRCFile: function (dir, always)
<<<<<<<
IO.PATH_SEP = (function () {
let file = services.create("file");
file.append("foo");
return file.path[0];
})();
=======
/**
* @property {string} The value of the $VIMPERATOR_RUNTIME environment
* variable.
*/
>>>>>>>
IO.PATH_SEP = (function () {
let file = services.create("file");
file.append("foo");
return file.path[0];
})();
/**
* @property {string} The value of the $VIMPERATOR_RUNTIME environment
* variable.
*/ |
<<<<<<<
</ul>
</div>
{loading ? (
<div className="card">
<TronLoader>
{/* {tu("loading_address")} {contract.address} */}
</TronLoader>
</div>
) : (
<div className="card-body p-0 list-style-body__body">
<div className="time-filter">
<ul >
{
times.map(v=><li key={v} className={time==v && 'active'} onClick={()=>this.changeTime(v)}>{t(`data_time${v}`)}</li>)
}
</ul>
</div>
<Switch>
{tabs && Object.values(tabs).map(tab => (
=======
</ul>
</div>
<div className="time-filter">
<ul>
{times.map(v => (
<li
key={v}
className={time == v && "active"}
onClick={() => this.changeTime(v)}
>
{t(`data_time${v}`)}
</li>
))}
</ul>
</div>
{loading ? (
<div className="card">
<TronLoader>
{/* {tu("loading_address")} {contract.address} */}
</TronLoader>
</div>
) : (
<div className="card-body p-0 list-style-body__body">
<Switch>
{tabs &&
Object.values(tabs).map(tab => (
>>>>>>>
</ul>
</div>
<div className="card-body p-0 list-style-body__body">
<div className="time-filter">
<ul >
{
times.map(v=><li key={v} className={time==v && 'active'} onClick={()=>this.changeTime(v)}>{t(`data_time${v}`)}</li>)
}
</ul>
</div>
{loading ? (
<div className="card">
<TronLoader>
{/* {tu("loading_address")} {contract.address} */}
</TronLoader>
</div>
) : (
<Switch>
{tabs && Object.values(tabs).map(tab => ( |
<<<<<<<
"<a href='https://poloniex.org/' target='_blank'>POLONI DEX</a> ๊ฑฐ๋์์ ์์ฅ ๋ ํ ํฐ ๋ง ๊ณ์ฐ",
// 2020-2-5 leon
proposal_serial: "๋๋ฒ",
proposal_create: "์ ์์ ์ ๊ธฐ",
proposal_mine: "๋์ ์ ์",
proposal_endtime: "๋ง๊ฐ ์๊ฐ",
proposal_total_votes: "์ด ํ์",
proposal_valid_votes: "์ ํจํ ํ์",
proposal_votes_tip: "์ ํจํ ํ์๋ ํ 27์ SR์ด ํฌํํ ํ์๊ณ , ์ด ํ์๋ ๋ชจ๋ SR์ด ํฌํํ ํ์์
๋๋ค",
proposal_action: "์ฒ๋ฆฌ",
proposal_more: "์์ธํ ๋ด์ฉ ๋ณด๊ธฐ",
proposal_approve: "์ฐฌ์ฑ",
proposal_cancel_approve: "์ฐฌ์ฑ ์ทจ์",
proposal_not_sign_in: "์ด ๊ธฐ๋ฅ์ ์ฌ์ฉํ๋ ค๋ฉด ๋ก๊ทธ์ธํ์ธ์",
proposal_cancel_tip: "์ด ์ ์์ ๋ํ ์ฐฌ์ฑ์ ์ทจ์ํ๊ฒ ์ต๋๊น?",
proposal_apply_super: "์ด ๊ธฐ๋ฅ์ SR ๋ง ์ฌ์ฉํ ์ ์์ต๋๋ค.",
proposal_apply_super_btn: "SR ์ ์ฒญ",
proposal_apply_super_desc: "๋ชจ๋ TRX ๋ณด์ ์๋ SR ํ๋ณด๊ฐ ๋ ์ ์์ต๋๋ค. ๊ทธ์ค ๊ฐ์ฅ ๋ง์ ํ๋ฅผ ๋ฐ์ ํ 27์๋ SR์ด ๋๊ณ , 28~127์๋ SR ํํธ๋๊ฐ ๋ฉ๋๋ค. SR์ ๊ฑฐ๋ ํฌ์ฅ ๋ฐ ๋ธ๋ก ์์ฑ์ ๋ด๋นํฉ๋๋ค. ๋ํ ํฌํ ๋ฐ ๋ธ๋ก ์์ฑ ๋ณด์์ ๋ฐ์ต๋๋ค. SR ํํธ๋๋ ๊ฑฐ๋๋ฅผ ํฌ์ฅํ๊ฑฐ๋ ๋ธ๋ก์ ์์ฑํ์ง ์์ผ๋ฉฐ ํฌํ ๋ณด์ ๋ง ๋ฐ์ ์ ์์ต๋๋ค. ๋ชจ๋ SR ํ๋ณด, SR ํํธ๋ ๋ฐ SR์ TRON ๋คํธ์ํฌ์ ๋งค๊ฐ ๋ณ์๋ฅผ ์์ ํ๊ธฐ ์ํ ์ ์์ ์ ๊ธฐ ํ ์ ์์ต๋๋ค. ",
// proposal_apply_super_input_name: "่ฏท่พๅ
ฅๆจ็ๅ็งฐ",
// proposal_apply_super_input_name_ph: "3-30ไธชๅญ็ฌฆ๏ผ่ฎพ็ฝฎๅไธๅฏไฟฎๆน",
proposal_apply_super_input_website: "URL์ ์
๋ ฅํ์ธ์",
proposal_apply_super_input_website_ph: "ํ๋ก์ ํธ ์น ์ฌ์ดํธ ๋๋ ์์
๋ฏธ๋์ด ํํ์ด์ง ๋งํฌ",
proposal_apply_super_success: "์ ์ฒญ ์ฑ๊ณต, SR ๊ธฐ๋ฅ์ด ํ์ฑํ๋์์ต๋๋ค.",
proposal_my: "๋์",
proposal_details: "ํฌํ ๋ด์ญ",
proposal_super_votes: "SR ํฌํ์",
proposal_super_partner_votes: "SR ํํธ๋ ํฌํ์",
proposal_super_candidate_votes: "SR ํ๋ณด ํฌํ์",
proposal_my_initiate: "์์",
proposal_my_participate: "์ฐธ์ฌ",
proposal_cancel: "์ ์ ์ทจ์",
proposal_cancel_tip1: "์ ์์ ์ทจ์ํ๊ฒ ์ต๋๊น?",
proposal_fail: "ๆไบคๅคฑ่ดฅ",
proposal_success: "ๆไบคๆๅ",
// proposal_nodata: "ๆๆ ๆฐๆฎ",
proposal_go: "",
proposal_or: "ๆ",
proposal_vote_link: "์ ์์ ํฌํ",
=======
"<a href='https://poloniex.org/' target='_blank'>POLONI DEX</a> ๊ฑฐ๋์์ ์์ฅ ๋ ํ ํฐ ๋ง ๊ณ์ฐ",
// index nav
index_navigation_explorers: "๋ธ๋ผ์ฐ์ ",
index_navigation_data: "๋ฐ์ดํฐ",
index_navigation_committee: "์์ํ",
index_navigation_proposals: "์ ์",
// 2020-02-04
chart_hold_trx_account:'TRX ๋ณด์ ๊ณ์ ํต๊ณ',
chart_hold_trx_account_per:'TRX ๋ณด์ ์ ๋น์จ',
chart_hold_trx_account_per_t:'TRX ๋ณด์ ์ ๋น์จ',
chart_hold_trx_account_per_tip:'TRX ๋ณด์ ๊ณ์ ์/ ์ด ๊ณ์ ์',
chart_hold_account_sum:'์ด ๊ณ์ ์',
chart_hold_trx:'TRX ๋ณด์ ๊ณ์ ์',
chart_hold_trx_more:'๋ ๋ง์ ๋ฐ์ดํฐ',
chart_hold_trx_number:'๊ณ์ ์',
chart_resource_user_freeing:'TRX ๋๊ฒฐ ์๋์ง',
chart_resource_user_burning:'TRX ์๊ฐ ์๋์ง',
chart_resource_contract_deployer:'๊ณ์ฝ ๋ฐฐ์น์๊ฐ ์ ๊ณตํ๋ ์๋์ง'
>>>>>>>
"<a href='https://poloniex.org/' target='_blank'>POLONI DEX</a> ๊ฑฐ๋์์ ์์ฅ ๋ ํ ํฐ ๋ง ๊ณ์ฐ",
// index nav
index_navigation_explorers: "๋ธ๋ผ์ฐ์ ",
index_navigation_data: "๋ฐ์ดํฐ",
index_navigation_committee: "์์ํ",
index_navigation_proposals: "์ ์",
// 2020-02-04
chart_hold_trx_account:'TRX ๋ณด์ ๊ณ์ ํต๊ณ',
chart_hold_trx_account_per:'TRX ๋ณด์ ์ ๋น์จ',
chart_hold_trx_account_per_t:'TRX ๋ณด์ ์ ๋น์จ',
chart_hold_trx_account_per_tip:'TRX ๋ณด์ ๊ณ์ ์/ ์ด ๊ณ์ ์',
chart_hold_account_sum:'์ด ๊ณ์ ์',
chart_hold_trx:'TRX ๋ณด์ ๊ณ์ ์',
chart_hold_trx_more:'๋ ๋ง์ ๋ฐ์ดํฐ',
chart_hold_trx_number:'๊ณ์ ์',
chart_resource_user_freeing:'TRX ๋๊ฒฐ ์๋์ง',
chart_resource_user_burning:'TRX ์๊ฐ ์๋์ง',
chart_resource_contract_deployer:'๊ณ์ฝ ๋ฐฐ์น์๊ฐ ์ ๊ณตํ๋ ์๋์ง',
// 2020-2-5 leon
proposal_serial: "๋๋ฒ",
proposal_create: "์ ์์ ์ ๊ธฐ",
proposal_mine: "๋์ ์ ์",
proposal_endtime: "๋ง๊ฐ ์๊ฐ",
proposal_total_votes: "์ด ํ์",
proposal_valid_votes: "์ ํจํ ํ์",
proposal_votes_tip: "์ ํจํ ํ์๋ ํ 27์ SR์ด ํฌํํ ํ์๊ณ , ์ด ํ์๋ ๋ชจ๋ SR์ด ํฌํํ ํ์์
๋๋ค",
proposal_action: "์ฒ๋ฆฌ",
proposal_more: "์์ธํ ๋ด์ฉ ๋ณด๊ธฐ",
proposal_approve: "์ฐฌ์ฑ",
proposal_cancel_approve: "์ฐฌ์ฑ ์ทจ์",
proposal_not_sign_in: "์ด ๊ธฐ๋ฅ์ ์ฌ์ฉํ๋ ค๋ฉด ๋ก๊ทธ์ธํ์ธ์",
proposal_cancel_tip: "์ด ์ ์์ ๋ํ ์ฐฌ์ฑ์ ์ทจ์ํ๊ฒ ์ต๋๊น?",
proposal_apply_super: "์ด ๊ธฐ๋ฅ์ SR ๋ง ์ฌ์ฉํ ์ ์์ต๋๋ค.",
proposal_apply_super_btn: "SR ์ ์ฒญ",
proposal_apply_super_desc: "๋ชจ๋ TRX ๋ณด์ ์๋ SR ํ๋ณด๊ฐ ๋ ์ ์์ต๋๋ค. ๊ทธ์ค ๊ฐ์ฅ ๋ง์ ํ๋ฅผ ๋ฐ์ ํ 27์๋ SR์ด ๋๊ณ , 28~127์๋ SR ํํธ๋๊ฐ ๋ฉ๋๋ค. SR์ ๊ฑฐ๋ ํฌ์ฅ ๋ฐ ๋ธ๋ก ์์ฑ์ ๋ด๋นํฉ๋๋ค. ๋ํ ํฌํ ๋ฐ ๋ธ๋ก ์์ฑ ๋ณด์์ ๋ฐ์ต๋๋ค. SR ํํธ๋๋ ๊ฑฐ๋๋ฅผ ํฌ์ฅํ๊ฑฐ๋ ๋ธ๋ก์ ์์ฑํ์ง ์์ผ๋ฉฐ ํฌํ ๋ณด์ ๋ง ๋ฐ์ ์ ์์ต๋๋ค. ๋ชจ๋ SR ํ๋ณด, SR ํํธ๋ ๋ฐ SR์ TRON ๋คํธ์ํฌ์ ๋งค๊ฐ ๋ณ์๋ฅผ ์์ ํ๊ธฐ ์ํ ์ ์์ ์ ๊ธฐ ํ ์ ์์ต๋๋ค. ",
// proposal_apply_super_input_name: "่ฏท่พๅ
ฅๆจ็ๅ็งฐ",
// proposal_apply_super_input_name_ph: "3-30ไธชๅญ็ฌฆ๏ผ่ฎพ็ฝฎๅไธๅฏไฟฎๆน",
proposal_apply_super_input_website: "URL์ ์
๋ ฅํ์ธ์",
proposal_apply_super_input_website_ph: "ํ๋ก์ ํธ ์น ์ฌ์ดํธ ๋๋ ์์
๋ฏธ๋์ด ํํ์ด์ง ๋งํฌ",
proposal_apply_super_success: "์ ์ฒญ ์ฑ๊ณต, SR ๊ธฐ๋ฅ์ด ํ์ฑํ๋์์ต๋๋ค.",
proposal_my: "๋์",
proposal_details: "ํฌํ ๋ด์ญ",
proposal_super_votes: "SR ํฌํ์",
proposal_super_partner_votes: "SR ํํธ๋ ํฌํ์",
proposal_super_candidate_votes: "SR ํ๋ณด ํฌํ์",
proposal_my_initiate: "์์",
proposal_my_participate: "์ฐธ์ฌ",
proposal_cancel: "์ ์ ์ทจ์",
proposal_cancel_tip1: "์ ์์ ์ทจ์ํ๊ฒ ์ต๋๊น?",
proposal_fail: "ๆไบคๅคฑ่ดฅ",
proposal_success: "ๆไบคๆๅ",
// proposal_nodata: "ๆๆ ๆฐๆฎ",
proposal_go: "",
proposal_or: "ๆ",
proposal_vote_link: "์ ์์ ํฌํ", |
<<<<<<<
// eslint-disable-next-line jest/expect-expect
it('supports setting releaseStage via client.app.releaseStage', done => {
const client = new Client({ apiKey: 'API_KEY_YEAH', enabledReleaseStages: ['production'] })
client._setDelivery(client => ({
sendEvent: (payload) => {
done('sendEvent() should not be called')
}
}))
client.app.releaseStage = 'staging'
client.notify(new Error('oh em eff gee'))
// give the event loop a tick to see if the event gets sent
process.nextTick(() => done())
})
=======
>>>>>>> |
<<<<<<<
'Connectivity changed',
{
type,
effectiveType
},
'state'
=======
`Connectivity changed`, { isConnected, isInternetReachable, type }, 'state'
>>>>>>>
'Connectivity changed', { isConnected, isInternetReachable, type }, 'state' |
<<<<<<<
chart_resource_contract_deployer:'ะญะฝะตัะณะธั ะพั ะฒัะฟััะบะฝะธะบะพะฒ ะบะพะฝััะฐะบัะพะฒ',
// 2020-2-5 leon
proposal_serial: "ะะตั",
proposal_create: "ะะพะดะฝััั ะฟัะตะดะปะพะถะตะฝะธะต",
proposal_mine: "ะะพะธ ะฟัะตะดะปะพะถะตะฝะธั",
proposal_endtime: "ะัะตะผั ะธััะตัะตะฝะธั",
proposal_total_votes: "ะฒัะต",
proposal_valid_votes: "ะณะพะดะฝัะน ะณะพะปะพั",
proposal_votes_tip: "ะะตะนััะฒะธัะตะปัะฝัะต ะณะพะปะพัะฐ ะพั ะปัััะธั
27 SR. ะะฑัะตะต ะบะพะปะธัะตััะฒะพ ะณะพะปะพัะพะฒ - ััะพ ะณะพะปะพัะฐ, ะพัะดะฐะฝะฝัะต ะฒัะตะผะธ SR. ",
proposal_action: "ะะฟะตัะฐัะธะธ",
proposal_more: "ะฟะพะดัะพะฑะฝะตะต",
proposal_approve: "ะะพะปะพัะพะฒะฐัั",
proposal_cancel_approve: "ะฝะต ัะพะณะปะฐัะตะฝ",
proposal_not_sign_in: "ะะพะถะฐะปัะนััะฐ, ะฒะพะนะดะธัะต, ััะพะฑั ะธัะฟะพะปัะทะพะฒะฐัั ััั ััะฝะบัะธั.",
proposal_cancel_tip: "ะั ัะฒะตัะตะฝั, ััะพ ั
ะพัะธัะต ัะฝััั ะณะพะปะพัะพะฒะฐะฝะธะต?",
proposal_apply_super: "ะญัะฐ ััะฝะบัะธั ะดะพัััะฟะฝะฐ ัะพะปัะบะพ ะดะปั SR.",
proposal_apply_super_btn: "ะะพะดะฐัั ะทะฐัะฒะบั ะฝะฐ SR",
proposal_apply_super_desc: "ะัะต TRX-ะดะตัะถะฐัะตะปะธ ะผะพะณัั ะฟะพะดะฐัั ะทะฐัะฒะบั ะฝะฐ ััะฐััะธะต ะฒ ะบะฐัะตััะฒะต ะบะฐะฝะดะธะดะฐัะฐ ะฒ SR 27 ะฝะฐะธะฑะพะปะตะต ะฟัะพะณะพะปะพัะพะฒะฐะฒัะธั
ะบะฐะฝะดะธะดะฐัะพะฒ ััะฐะฝัั SR, ะฐ ะปัััะธะต 28 - 127 ะบะฐะฝะดะธะดะฐัะพะฒ ััะฐะฝัั ััะฟะตั-ะฟะฐััะฝะตัะฐะผะธ. SR ะพัะฒะตัะฐัั ะทะฐ ัะฟะฐะบะพะฒะบั ััะฐะฝะทะฐะบัะธะน ะธ ะณะตะฝะตัะฐัะธั ะฑะปะพะบะพะฒ. ะะฝะธ ัะฐะบะถะต ะธะผะตัั ะฟัะฐะฒะพ ะฑะปะพะบะธัะพะฒะฐัั ะฝะฐะณัะฐะดั ะธ ะฝะฐะณัะฐะดั ะณะพะปะพัะพะฒะฐะฝะธั. ะกัะฟะตัะฟะฐััะฝะตัั ะฝะต ัะฟะฐะบะพะฒัะฒะฐัั ััะฐะฝะทะฐะบัะธะธ ะธ ะฝะต ะณะตะฝะตัะธัััั ะฑะปะพะบะธ ะธ ะธะผะตัั ะฟัะฐะฒะพ ัะพะปัะบะพ ะฝะฐ ะฒะพะทะฝะฐะณัะฐะถะดะตะฝะธะต ะทะฐ ะณะพะปะพัะพะฒะฐะฝะธะต. ะัะต ะบะฐะฝะดะธะดะฐัั ะฒ SR, ััะฟะตั-ะฟะฐััะฝะตัั ะธ SR ะผะพะณัั ะฟะพะดะฐัั ะฟัะตะดะปะพะถะตะฝะธั ะฟะพ ะธะทะผะตะฝะตะฝะธั ะฟะฐัะฐะผะตััะพะฒ ะฒ ัะตัะธ TRON.",
// proposal_apply_super_input_name: "่ฏท่พๅ
ฅๆจ็ๅ็งฐ",
// proposal_apply_super_input_name_ph: "3-30ไธชๅญ็ฌฆ๏ผ่ฎพ็ฝฎๅไธๅฏไฟฎๆน",
proposal_apply_super_input_website: "ะะพะถะฐะปัะนััะฐ, ะฒะฒะตะดะธัะต ะฒะฐั URL",
proposal_apply_super_input_website_ph: "ะกััะปะบะฐ ะฝะฐ ัะฐะนั ะฟัะพะตะบัะฐ ะธะปะธ ัััะฐะฝะธัั ัะพัะธะฐะปัะฝะพะน ัะตัะธ",
proposal_apply_super_success: "ะะฐัะฒะบะฐ ะฟัะพัะปะฐ ััะฟะตัะฝะฐ. ะคัะฝะบัะธะธ SR ัะตะฟะตัั ะฒะบะปััะตะฝั.",
proposal_my: "ะะพะน",
proposal_details: "ะะพะปะพัะฐ",
proposal_super_votes: "SR ะณะพะปะพัะฐ",
proposal_super_partner_votes: "ะะพะปะพัะฐ ะกัะฟะตั ะฟะฐััะฝะตัะพะฒ",
proposal_super_candidate_votes: "ะะพะปะพัะฐ ะบะฐะฝะดะธะดะฐัะพะฒ SR",
proposal_my_initiate: "ะะฝะธัะธะธัะพะฒะฐะฝะพ",
proposal_my_participate: "ะัะธะฝัะปะธ ััะฐััะธะต",
proposal_cancel: "ะกะฝััั ะณะพะปะพั",
proposal_cancel_tip1: "ะั ัะฒะตัะตะฝั, ััะพ ั
ะพัะธัะต ัะฝััั ะณะพะปะพั?",
proposal_fail: "ะัะธะฑะบะฐ ะพัะฟัะฐะฒะบะธ",
proposal_success: "ะัะฟัะฐะฒะปะตะฝะพ ััะฟะตัะฝะพ",
proposal_go: " ",
proposal_or: " ะธะปะธ ",
proposal_vote_link: "ะัะพะณะพะปะพัะพะฒะฐัั ะทะฐ ะฟัะตะดะปะพะถะตะฝะธะต",
proposal_balance_not_enough: "ะะตะดะพััะฐัะพัะฝัะน ะฑะฐะปะฐะฝั",
/*
##################################################################################
# #
# proposals create #
# #
##################################################################################
*/
proposal_select: "ะัะฑะตัะธัะต ะฟะฐัะฐะผะตััั ัะตัะธ",
proposal_value: "ะฝะพะฒะพะต ะทะฝะฐัะตะฝะธะต",
proposal_confirm: "ะะพะดัะฒะตัะดะธัั",
proposal_result: "ะ ะตะทัะปััะฐั",
proposal_create_info: "ะะฝะธัะธะธัะพะฒะฐะฝะพ ะฟัะตะดะปะพะถะตะฝะธะต ะธะทะผะตะฝะธัั ะฟะฐัะฐะผะตััั ัะตัะธ TRON. ะะฐะถะดัะน SR ะธะผะตะตั ะฟัะฐะฒะพ ะธะฝะธัะธะธัะพะฒะฐัั ะธ ะณะพะปะพัะพะฒะฐัั ะทะฐ ะฟัะตะดะปะพะถะตะฝะธั. ะะพัะปะต ะฟะพะปััะตะฝะธั ะณะพะปะพัะพะฒ ะพั 19 ะธะปะธ ะฑะพะปะตะต SR ะดะพ ะธััะตัะตะฝะธั ััะพะบะฐ ะดะตะนััะฒะธั ะฟัะตะดะปะพะถะตะฝะธะต ััะธัะฐะตััั ะฟัะธะฝัััะผ ะธ ัะพะพัะฒะตัััะฒัััะธะต ะฟะฐัะฐะผะตััั ัะตัะธ ะฑัะดัั ะธะทะผะตะฝะตะฝั ะฒ ัะปะตะดัััะตะผ ะฟะตัะธะพะดะต ะพะฑัะปัะถะธะฒะฐะฝะธั.",
proposal_select_table: "ะัะฑัะฐัั",
proposal_selected_network_parameters:"ะะฐัััะพะนะบะธ ัะตัะธ ะฒัะฑัะฐะฝั",
proposal_content:"ะกะพะดะตัะถะฐะฝะธะต ะฟัะตะดะปะพะถะตะฝะธั",
proposal_new_value:"ะะพะฒะพะต ะทะฝะฐัะตะฝะธะต",
proposal_submit_text:"ะั ัะฒะตัะตะฝั, ััะพ ะธะฝะธัะธะธััะตัะต ะฟัะตะดะปะพะถะตะฝะธะต?",
proposal_created_successful:"ะัะตะดะปะพะถะตะฝะธะต ะธะฝะธัะธะธัะพะฒะฐะฝะพ",
proposal_created_failure:"ะัะตะดะปะพะถะตะฝะธะต ะฝะต ัะดะฐะปะพัั",
proposal_validate_text_0:"ะะพะถะฐะปัะนััะฐ, ะฒะฒะตะดะธัะต ะทะฝะฐัะตะฝะธะต ะผะตะถะดั 81-86400",
proposal_validate_text_1:"ะะพะถะฐะปัะนััะฐ, ะฒะฒะตะดะธัะต ะทะฝะฐัะตะฝะธะต ะผะตะถะดั 0-100000000000",
proposal_validate_text_2:"ะะพะถะฐะปัะนััะฐ, ะฒะฒะตะดะธัะต ะทะฝะฐัะตะฝะธะต ะผะตะถะดั 0-1000",
proposal_validate_text_3:"ะะพะถะฐะปัะนััะฐ, ะฒัะฑะตัะธัะต ัะฐะทัะตัะธัั/ะทะฐะฟัะตัะธัั",
proposal_validate_text_4:"ะะพะถะฐะปัะนััะฐ, ะฒะฒะตะดะธัะต ะทะฝะฐัะตะฝะธะต",
proposal_validate_text_5:"ะะพะถะฐะปัะนััะฐ, ะฒะฒะตะดะธัะต ะทะฝะฐัะตะฝะธะต ะผะตะถะดั 0-100000",
proposal_validate_text_6:"ะะพะถะฐะปัะนััะฐ, ะฒัะฑะตัะธัะต ะฒะบะป / ะฒัะบะป",
proposal_validate_text_7:"ะะพะถะฐะปัะนััะฐ, ะฒะฒะตะดะธัะต ะทะฝะฐัะตะฝะธะต ะผะตะถะดั 1-10000",
proposal_validate_text_8:"ะะพะถะฐะปัะนััะฐ, ะฒะฒะตะดะธัะต ะทะฝะฐัะตะฝะธะต ะผะตะถะดั 1-1000",
proposal_validate_text_9:"ะะพะถะฐะปัะนััะฐ, ะฒะฒะตะดะธัะต ะทะฝะฐัะตะฝะธะต ะผะตะถะดั 0-100000000000000000",
propose_not_activate:"ะะต ะพัะบััั",
proposal_value_same:"ะะพะฒะพะต ะทะฝะฐัะตะฝะธะต ะธะดะตะฝัะธัะฝะพ ัะตะบััะตะผั",
go_to_proposals_list:"ะัะพะณะพะปะพัะพะฒะฐัั ะทะฐ ะฟัะตะดะปะพะถะตะฝะธะต",
proposal_quit:"ะ ะฝะฐััะพััะตะต ะฒัะตะผั ั ะฒะฐั ะตััั ะฝะตะทะฐะฒะตััะตะฝะฝัะต ะพะฟะตัะฐัะธะธ. ะั ัะฒะตัะตะฝั, ััะพ ั
ะพัะธัะต ะฒัะนัะธ?",
=======
chart_resource_contract_deployer:'ะญะฝะตัะณะธั ะพั ะฒัะฟััะบะฝะธะบะพะฒ ะบะพะฝััะฐะบัะพะฒ',
// full node
full_node_version_latest_block:'ะะพัะปะตะดะฝะธะน ะฑะปะพะบ',
full_node_version_confirmed:'CONFIRMED',
full_node_version_unconfirmed:'UNCONFIRMED',
full_node_version_confirmed_tips:'ยซะะพะดัะฒะตัะถะดะตะฝะฝัะนยป ะพะทะฝะฐัะฐะตั ะฟะพะดัะฒะตัะถะดะตะฝะฝัะน 19 ะธะปะธ ะฑะพะปะตะต ััะฟะตััะทะปะฐะผะธ, ะฒ ะฟัะพัะธะฒะฝะพะผ ัะปััะฐะต ะพะฝ ยซะดะพะปะถะตะฝ ะฑััั ะฟะพะดัะฒะตัะถะดะตะฝยป',
// 2020-02-19
chart_energy:'ะธัะฟะพะปัะทัะตะผะฐั ัะฝะตัะณะธั',
>>>>>>>
chart_resource_contract_deployer:'ะญะฝะตัะณะธั ะพั ะฒัะฟััะบะฝะธะบะพะฒ ะบะพะฝััะฐะบัะพะฒ',
// 2020-2-5 leon
proposal_serial: "ะะตั",
proposal_create: "ะะพะดะฝััั ะฟัะตะดะปะพะถะตะฝะธะต",
proposal_mine: "ะะพะธ ะฟัะตะดะปะพะถะตะฝะธั",
proposal_endtime: "ะัะตะผั ะธััะตัะตะฝะธั",
proposal_total_votes: "ะฒัะต",
proposal_valid_votes: "ะณะพะดะฝัะน ะณะพะปะพั",
proposal_votes_tip: "ะะตะนััะฒะธัะตะปัะฝัะต ะณะพะปะพัะฐ ะพั ะปัััะธั
27 SR. ะะฑัะตะต ะบะพะปะธัะตััะฒะพ ะณะพะปะพัะพะฒ - ััะพ ะณะพะปะพัะฐ, ะพัะดะฐะฝะฝัะต ะฒัะตะผะธ SR. ",
proposal_action: "ะะฟะตัะฐัะธะธ",
proposal_more: "ะฟะพะดัะพะฑะฝะตะต",
proposal_approve: "ะะพะปะพัะพะฒะฐัั",
proposal_cancel_approve: "ะฝะต ัะพะณะปะฐัะตะฝ",
proposal_not_sign_in: "ะะพะถะฐะปัะนััะฐ, ะฒะพะนะดะธัะต, ััะพะฑั ะธัะฟะพะปัะทะพะฒะฐัั ััั ััะฝะบัะธั.",
proposal_cancel_tip: "ะั ัะฒะตัะตะฝั, ััะพ ั
ะพัะธัะต ัะฝััั ะณะพะปะพัะพะฒะฐะฝะธะต?",
proposal_apply_super: "ะญัะฐ ััะฝะบัะธั ะดะพัััะฟะฝะฐ ัะพะปัะบะพ ะดะปั SR.",
proposal_apply_super_btn: "ะะพะดะฐัั ะทะฐัะฒะบั ะฝะฐ SR",
proposal_apply_super_desc: "ะัะต TRX-ะดะตัะถะฐัะตะปะธ ะผะพะณัั ะฟะพะดะฐัั ะทะฐัะฒะบั ะฝะฐ ััะฐััะธะต ะฒ ะบะฐัะตััะฒะต ะบะฐะฝะดะธะดะฐัะฐ ะฒ SR 27 ะฝะฐะธะฑะพะปะตะต ะฟัะพะณะพะปะพัะพะฒะฐะฒัะธั
ะบะฐะฝะดะธะดะฐัะพะฒ ััะฐะฝัั SR, ะฐ ะปัััะธะต 28 - 127 ะบะฐะฝะดะธะดะฐัะพะฒ ััะฐะฝัั ััะฟะตั-ะฟะฐััะฝะตัะฐะผะธ. SR ะพัะฒะตัะฐัั ะทะฐ ัะฟะฐะบะพะฒะบั ััะฐะฝะทะฐะบัะธะน ะธ ะณะตะฝะตัะฐัะธั ะฑะปะพะบะพะฒ. ะะฝะธ ัะฐะบะถะต ะธะผะตัั ะฟัะฐะฒะพ ะฑะปะพะบะธัะพะฒะฐัั ะฝะฐะณัะฐะดั ะธ ะฝะฐะณัะฐะดั ะณะพะปะพัะพะฒะฐะฝะธั. ะกัะฟะตัะฟะฐััะฝะตัั ะฝะต ัะฟะฐะบะพะฒัะฒะฐัั ััะฐะฝะทะฐะบัะธะธ ะธ ะฝะต ะณะตะฝะตัะธัััั ะฑะปะพะบะธ ะธ ะธะผะตัั ะฟัะฐะฒะพ ัะพะปัะบะพ ะฝะฐ ะฒะพะทะฝะฐะณัะฐะถะดะตะฝะธะต ะทะฐ ะณะพะปะพัะพะฒะฐะฝะธะต. ะัะต ะบะฐะฝะดะธะดะฐัั ะฒ SR, ััะฟะตั-ะฟะฐััะฝะตัั ะธ SR ะผะพะณัั ะฟะพะดะฐัั ะฟัะตะดะปะพะถะตะฝะธั ะฟะพ ะธะทะผะตะฝะตะฝะธั ะฟะฐัะฐะผะตััะพะฒ ะฒ ัะตัะธ TRON.",
// proposal_apply_super_input_name: "่ฏท่พๅ
ฅๆจ็ๅ็งฐ",
// proposal_apply_super_input_name_ph: "3-30ไธชๅญ็ฌฆ๏ผ่ฎพ็ฝฎๅไธๅฏไฟฎๆน",
proposal_apply_super_input_website: "ะะพะถะฐะปัะนััะฐ, ะฒะฒะตะดะธัะต ะฒะฐั URL",
proposal_apply_super_input_website_ph: "ะกััะปะบะฐ ะฝะฐ ัะฐะนั ะฟัะพะตะบัะฐ ะธะปะธ ัััะฐะฝะธัั ัะพัะธะฐะปัะฝะพะน ัะตัะธ",
proposal_apply_super_success: "ะะฐัะฒะบะฐ ะฟัะพัะปะฐ ััะฟะตัะฝะฐ. ะคัะฝะบัะธะธ SR ัะตะฟะตัั ะฒะบะปััะตะฝั.",
proposal_my: "ะะพะน",
proposal_details: "ะะพะปะพัะฐ",
proposal_super_votes: "SR ะณะพะปะพัะฐ",
proposal_super_partner_votes: "ะะพะปะพัะฐ ะกัะฟะตั ะฟะฐััะฝะตัะพะฒ",
proposal_super_candidate_votes: "ะะพะปะพัะฐ ะบะฐะฝะดะธะดะฐัะพะฒ SR",
proposal_my_initiate: "ะะฝะธัะธะธัะพะฒะฐะฝะพ",
proposal_my_participate: "ะัะธะฝัะปะธ ััะฐััะธะต",
proposal_cancel: "ะกะฝััั ะณะพะปะพั",
proposal_cancel_tip1: "ะั ัะฒะตัะตะฝั, ััะพ ั
ะพัะธัะต ัะฝััั ะณะพะปะพั?",
proposal_fail: "ะัะธะฑะบะฐ ะพัะฟัะฐะฒะบะธ",
proposal_success: "ะัะฟัะฐะฒะปะตะฝะพ ััะฟะตัะฝะพ",
proposal_go: " ",
proposal_or: " ะธะปะธ ",
proposal_vote_link: "ะัะพะณะพะปะพัะพะฒะฐัั ะทะฐ ะฟัะตะดะปะพะถะตะฝะธะต",
proposal_balance_not_enough: "ะะตะดะพััะฐัะพัะฝัะน ะฑะฐะปะฐะฝั",
/*
##################################################################################
# #
# proposals create #
# #
##################################################################################
*/
proposal_select: "ะัะฑะตัะธัะต ะฟะฐัะฐะผะตััั ัะตัะธ",
proposal_value: "ะฝะพะฒะพะต ะทะฝะฐัะตะฝะธะต",
proposal_confirm: "ะะพะดัะฒะตัะดะธัั",
proposal_result: "ะ ะตะทัะปััะฐั",
proposal_create_info: "ะะฝะธัะธะธัะพะฒะฐะฝะพ ะฟัะตะดะปะพะถะตะฝะธะต ะธะทะผะตะฝะธัั ะฟะฐัะฐะผะตััั ัะตัะธ TRON. ะะฐะถะดัะน SR ะธะผะตะตั ะฟัะฐะฒะพ ะธะฝะธัะธะธัะพะฒะฐัั ะธ ะณะพะปะพัะพะฒะฐัั ะทะฐ ะฟัะตะดะปะพะถะตะฝะธั. ะะพัะปะต ะฟะพะปััะตะฝะธั ะณะพะปะพัะพะฒ ะพั 19 ะธะปะธ ะฑะพะปะตะต SR ะดะพ ะธััะตัะตะฝะธั ััะพะบะฐ ะดะตะนััะฒะธั ะฟัะตะดะปะพะถะตะฝะธะต ััะธัะฐะตััั ะฟัะธะฝัััะผ ะธ ัะพะพัะฒะตัััะฒัััะธะต ะฟะฐัะฐะผะตััั ัะตัะธ ะฑัะดัั ะธะทะผะตะฝะตะฝั ะฒ ัะปะตะดัััะตะผ ะฟะตัะธะพะดะต ะพะฑัะปัะถะธะฒะฐะฝะธั.",
proposal_select_table: "ะัะฑัะฐัั",
proposal_selected_network_parameters:"ะะฐัััะพะนะบะธ ัะตัะธ ะฒัะฑัะฐะฝั",
proposal_content:"ะกะพะดะตัะถะฐะฝะธะต ะฟัะตะดะปะพะถะตะฝะธั",
proposal_new_value:"ะะพะฒะพะต ะทะฝะฐัะตะฝะธะต",
proposal_submit_text:"ะั ัะฒะตัะตะฝั, ััะพ ะธะฝะธัะธะธััะตัะต ะฟัะตะดะปะพะถะตะฝะธะต?",
proposal_created_successful:"ะัะตะดะปะพะถะตะฝะธะต ะธะฝะธัะธะธัะพะฒะฐะฝะพ",
proposal_created_failure:"ะัะตะดะปะพะถะตะฝะธะต ะฝะต ัะดะฐะปะพัั",
proposal_validate_text_0:"ะะพะถะฐะปัะนััะฐ, ะฒะฒะตะดะธัะต ะทะฝะฐัะตะฝะธะต ะผะตะถะดั 81-86400",
proposal_validate_text_1:"ะะพะถะฐะปัะนััะฐ, ะฒะฒะตะดะธัะต ะทะฝะฐัะตะฝะธะต ะผะตะถะดั 0-100000000000",
proposal_validate_text_2:"ะะพะถะฐะปัะนััะฐ, ะฒะฒะตะดะธัะต ะทะฝะฐัะตะฝะธะต ะผะตะถะดั 0-1000",
proposal_validate_text_3:"ะะพะถะฐะปัะนััะฐ, ะฒัะฑะตัะธัะต ัะฐะทัะตัะธัั/ะทะฐะฟัะตัะธัั",
proposal_validate_text_4:"ะะพะถะฐะปัะนััะฐ, ะฒะฒะตะดะธัะต ะทะฝะฐัะตะฝะธะต",
proposal_validate_text_5:"ะะพะถะฐะปัะนััะฐ, ะฒะฒะตะดะธัะต ะทะฝะฐัะตะฝะธะต ะผะตะถะดั 0-100000",
proposal_validate_text_6:"ะะพะถะฐะปัะนััะฐ, ะฒัะฑะตัะธัะต ะฒะบะป / ะฒัะบะป",
proposal_validate_text_7:"ะะพะถะฐะปัะนััะฐ, ะฒะฒะตะดะธัะต ะทะฝะฐัะตะฝะธะต ะผะตะถะดั 1-10000",
proposal_validate_text_8:"ะะพะถะฐะปัะนััะฐ, ะฒะฒะตะดะธัะต ะทะฝะฐัะตะฝะธะต ะผะตะถะดั 1-1000",
proposal_validate_text_9:"ะะพะถะฐะปัะนััะฐ, ะฒะฒะตะดะธัะต ะทะฝะฐัะตะฝะธะต ะผะตะถะดั 0-100000000000000000",
propose_not_activate:"ะะต ะพัะบััั",
proposal_value_same:"ะะพะฒะพะต ะทะฝะฐัะตะฝะธะต ะธะดะตะฝัะธัะฝะพ ัะตะบััะตะผั",
go_to_proposals_list:"ะัะพะณะพะปะพัะพะฒะฐัั ะทะฐ ะฟัะตะดะปะพะถะตะฝะธะต",
proposal_quit:"ะ ะฝะฐััะพััะตะต ะฒัะตะผั ั ะฒะฐั ะตััั ะฝะตะทะฐะฒะตััะตะฝะฝัะต ะพะฟะตัะฐัะธะธ. ะั ัะฒะตัะตะฝั, ััะพ ั
ะพัะธัะต ะฒัะนัะธ?",
// full node
full_node_version_latest_block:'ะะพัะปะตะดะฝะธะน ะฑะปะพะบ',
full_node_version_confirmed:'CONFIRMED',
full_node_version_unconfirmed:'UNCONFIRMED',
full_node_version_confirmed_tips:'ยซะะพะดัะฒะตัะถะดะตะฝะฝัะนยป ะพะทะฝะฐัะฐะตั ะฟะพะดัะฒะตัะถะดะตะฝะฝัะน 19 ะธะปะธ ะฑะพะปะตะต ััะฟะตััะทะปะฐะผะธ, ะฒ ะฟัะพัะธะฒะฝะพะผ ัะปััะฐะต ะพะฝ ยซะดะพะปะถะตะฝ ะฑััั ะฟะพะดัะฒะตัะถะดะตะฝยป',
// 2020-02-19
chart_energy:'ะธัะฟะพะปัะทัะตะผะฐั ัะฝะตัะณะธั', |
<<<<<<<
require('@bugsnag/plugin-react-native-app-state-breadcrumbs'),
=======
require('@bugsnag/plugin-react-native-connectivity-breadcrumbs'),
>>>>>>>
require('@bugsnag/plugin-react-native-app-state-breadcrumbs'),
require('@bugsnag/plugin-react-native-connectivity-breadcrumbs'), |
<<<<<<<
=======
</div>
<div className="row ">
<div className="col-xs-12 col-sm-12 col-md-12 text-center mb-3">
<Link to="/help/copyright" className="color-grey-300">
Copyrightยฉ 2017-2020 tronscan.org
</Link>
>>>>>>>
<<<<<<<
<div className="copyright pt-5">
{modal}
<div className="row container">
<div className="col-xs-6 col-sm-6 col-md-6 text-center mb-3">
<div className="d-flex">
<span className="text mr-3">
Copyrightยฉ 2017-2020 tronscan.org
</span>
<div className="d-flex switch">
<span>{tu("index_page_switch_tokens")}</span>
{this.dropCurrency()}
</div>
</div>
</div>
<div className="col-xs-6 col-sm-6 col-md-6 text-center mb-3">
<div className="fr d-flex">
<div className="donate">
<Link to={`/address/${donate_address}`} className="after">
{donate_address}
</Link>
<Button
type="danger"
size={"small"}
onClick={this.renderSend}
>
{tu("donateAddress")}
</Button>
</div>
<div className="ml-1">
<QuestionMark text={intl.formatMessage({id:'index_page_footer_donate_address'})}></QuestionMark>
</div>
</div>
</div>
=======
<hr />
</div>
<div className="row ">
<div className="col-xs-12 col-sm-12 col-md-12 text-center mb-3">
<div className="copy-right">
Copyrightยฉ 2017-2020 tronscan.org
>>>>>>>
<div className="copyright pt-5">
{modal}
<div className="row container">
<div className="col-xs-6 col-sm-6 col-md-6 text-center mb-3">
<div className="d-flex">
<span className="text mr-3">
Copyrightยฉ 2017-2020 tronscan.org
</span>
<div className="d-flex switch">
<span>{tu("index_page_switch_tokens")}</span>
{this.dropCurrency()}
</div>
</div>
</div>
<div className="col-xs-6 col-sm-6 col-md-6 text-center mb-3">
<div className="fr d-flex">
<div className="donate">
<Link
to={`/address/${donate_address}`}
className="after"
>
{donate_address}
</Link>
<Button
type="danger"
size={"small"}
onClick={this.renderSend}
>
{tu("donateAddress")}
</Button>
</div>
<div className="ml-1">
<QuestionMark
text={intl.formatMessage({
id: "index_page_footer_donate_address"
})}
></QuestionMark>
</div>
</div>
</div> |
<<<<<<<
function CoinifySummaryController ($scope, $q, $timeout, Wallet, buySell, currency, Alerts, smartAccount) {
$scope.isSell = $scope.$parent.$parent.isSell;
=======
function CoinifySummaryController ($scope, $q, $timeout, Wallet, buySell, currency, Alerts, buyMobile) {
>>>>>>>
function CoinifySummaryController ($scope, $q, $timeout, Wallet, buySell, currency, Alerts, buyMobile) {
$scope.isSell = $scope.$parent.$parent.isSell; |
<<<<<<<
/*
##################################################################################
# #
# SR rewards #
# #
##################################################################################
*/
"SR_set_brokerage":"่ฎพ็ฝฎ้ๆฐๅๆๆฏไพ",
"SR_brokerage_save_tip":"ๆฏไธ่ฝฎๆ็ฅจ็ปๆๅ๏ผๅฅๅฑๅฐๆ็
งๆๅไธๆฌก่ฎพ็ฝฎ็ๆฏไพๅ็ป้ๆฐ",
"SR_brokerage_save":"ไฟๅญ",
"SR_brokerage_save_verify":"่ฏท่พๅ
ฅ0~100ไน้ด็ๆฐๅผ",
"SR_reward_available":"ๅฏ้ขๅ",
"SR_set_github_learn_more":"ไบ่งฃๆดๅค",
"SR_vote_for_reward":"ๆ็ฅจๆ่ทๅฅๅฑ",
"SR_receive_award_btn":"้ขๅๅฅๅฑ",
"SR_receive_award_tip1":"ๆไธๅฏ้ข๏ผ",
"SR_receive_award_tip2":"24ๅฐๆถๅ
ๅช่ฝ้ขๅไธๆฌก",
"SR_brokerage_save_result": "ๅทฒไฟๅญ้ๆฐๅๆๆฏไพ๏ผ",
"successfully_brokerage_save": "่ฎพ็ฝฎ้ๆฐๅๆๆฏไพๆๅ",
"could_not_brokerage_save": "ไธ่ฝไฟๅญ้ๆฐๅๆๆฏไพ",
"brokerage_save_error_message": "ๅจๅฐ่ฏ่ฎพ็ฝฎ้ๆฐๅๆๆฏไพๆถๅบ็ฐ้ฎ้ข๏ผ่ฏท็จๅๅ่ฏใ",
"rewards_claimed_submitted":"ไบคๆๅทฒๆไบค",
"rewards_claimed_hash":"ไบคๆๅๅธๅผ",
"rewards_claimed_hash_await":"็จๅไบคๆ็กฎ่ฎคๅๅฏๅจ่ดฆๆท้กตๆฅ็",
"voting_brokerage":"้ๆฐๅฅๅฑๅๆๆฏไพ",
"voting_brokerage_tip":"่ถ
็บงไปฃ่กจๆ่ทๅพ็ๅฅๅฑไธญ๏ผๅ็ปๆ็ฅจ่
็ๆฏไพใ้ๆฐๅฅๅฑ=ๆปๅฅๅฑๆฐ*้ๆฐๅฅๅฑๅๆๆฏไพ*๏ผ้ๆฐ็ฅจๆฐ/้ๆฐๆป็ฅจๆฐ๏ผ",
"SR_set_brokerage_contract":"่ถ
็บงไปฃ่กจ่ฎพ็ฝฎๅฅๅฑๅๆๆฏไพ",
"countdown_to_voting":"ๆฌ่ฝฎๆ็ฅจ็ปๆๅ่ฎกๆถ",
=======
"total_tron_ecosystem_tokens":"ๆณขๅบ็ๆ้่ฏๆปๆฐ๏ผ",
"number_of_lists":"ๅ่กจๆฐ้๏ผ",
"total_in_tronscan":"ๅ
ฑๆถๅฝ๏ผ"
>>>>>>>
/*
##################################################################################
# #
# SR rewards #
# #
##################################################################################
*/
"SR_set_brokerage":"่ฎพ็ฝฎ้ๆฐๅๆๆฏไพ",
"SR_brokerage_save_tip":"ๆฏไธ่ฝฎๆ็ฅจ็ปๆๅ๏ผๅฅๅฑๅฐๆ็
งๆๅไธๆฌก่ฎพ็ฝฎ็ๆฏไพๅ็ป้ๆฐ",
"SR_brokerage_save":"ไฟๅญ",
"SR_brokerage_save_verify":"่ฏท่พๅ
ฅ0~100ไน้ด็ๆฐๅผ",
"SR_reward_available":"ๅฏ้ขๅ",
"SR_set_github_learn_more":"ไบ่งฃๆดๅค",
"SR_vote_for_reward":"ๆ็ฅจๆ่ทๅฅๅฑ",
"SR_receive_award_btn":"้ขๅๅฅๅฑ",
"SR_receive_award_tip1":"ๆไธๅฏ้ข๏ผ",
"SR_receive_award_tip2":"24ๅฐๆถๅ
ๅช่ฝ้ขๅไธๆฌก",
"SR_brokerage_save_result": "ๅทฒไฟๅญ้ๆฐๅๆๆฏไพ๏ผ",
"successfully_brokerage_save": "่ฎพ็ฝฎ้ๆฐๅๆๆฏไพๆๅ",
"could_not_brokerage_save": "ไธ่ฝไฟๅญ้ๆฐๅๆๆฏไพ",
"brokerage_save_error_message": "ๅจๅฐ่ฏ่ฎพ็ฝฎ้ๆฐๅๆๆฏไพๆถๅบ็ฐ้ฎ้ข๏ผ่ฏท็จๅๅ่ฏใ",
"rewards_claimed_submitted":"ไบคๆๅทฒๆไบค",
"rewards_claimed_hash":"ไบคๆๅๅธๅผ",
"rewards_claimed_hash_await":"็จๅไบคๆ็กฎ่ฎคๅๅฏๅจ่ดฆๆท้กตๆฅ็",
"voting_brokerage":"้ๆฐๅฅๅฑๅๆๆฏไพ",
"voting_brokerage_tip":"่ถ
็บงไปฃ่กจๆ่ทๅพ็ๅฅๅฑไธญ๏ผๅ็ปๆ็ฅจ่
็ๆฏไพใ้ๆฐๅฅๅฑ=ๆปๅฅๅฑๆฐ*้ๆฐๅฅๅฑๅๆๆฏไพ*๏ผ้ๆฐ็ฅจๆฐ/้ๆฐๆป็ฅจๆฐ๏ผ",
"SR_set_brokerage_contract":"่ถ
็บงไปฃ่กจ่ฎพ็ฝฎๅฅๅฑๅๆๆฏไพ",
"countdown_to_voting":"ๆฌ่ฝฎๆ็ฅจ็ปๆๅ่ฎกๆถ",
"total_tron_ecosystem_tokens":"ๆณขๅบ็ๆ้่ฏๆปๆฐ๏ผ",
"number_of_lists":"ๅ่กจๆฐ้๏ผ",
"total_in_tronscan":"ๅ
ฑๆถๅฝ๏ผ" |
<<<<<<<
function buySell ($rootScope, $timeout, $q, $state, $uibModal, $uibModalStack, Wallet, MyWallet, MyWalletHelpers, Alerts, currency, MyWalletBuySell, Options, BlockchainConstants) {
=======
function buySell ($rootScope, $timeout, $q, $state, $uibModal, $uibModalStack, Wallet, MyWallet, MyWalletHelpers, Alerts, currency, MyWalletBuySell, Options, modals) {
>>>>>>>
function buySell ($rootScope, $timeout, $q, $state, $uibModal, $uibModalStack, Wallet, MyWallet, MyWalletHelpers, Alerts, currency, MyWalletBuySell, Options, BlockchainConstants, modals) {
<<<<<<<
openBuyView,
openSellView,
=======
>>>>>>>
openSellView,
<<<<<<<
function openBuyView (trade = null, options = {}) {
return $uibModal.open({
templateUrl: 'partials/coinify-modal.pug',
windowClass: 'bc-modal auto buy',
controller: 'CoinifyController',
backdrop: 'static',
keyboard: false,
resolve: {
trade: () => trade && trade.refresh().then(() => trade),
options: () => Options.get(),
buyOptions: () => options
}
}).result;
}
function openSellView (trade, buySellOptions = { sell: true }) {
console.log('openSellView', trade, buySellOptions);
return $uibModal.open({
templateUrl: 'partials/coinify-sell-modal.pug',
windowClass: 'bc-modal auto buy',
controller: 'CoinifySellController',
backdrop: 'static',
keyboard: false,
resolve: {
accounts: () => service.getBankAccounts(),
trade: () => trade,
buySellOptions: () => buySellOptions,
options: () => Options.get()
}
}).result;
}
=======
>>>>>>>
function openSellView (trade, buySellOptions = { sell: true }) {
return $uibModal.open({
templateUrl: 'partials/coinify-sell-modal.pug',
windowClass: 'bc-modal auto buy',
controller: 'CoinifySellController',
backdrop: 'static',
keyboard: false,
resolve: {
accounts: () => service.getBankAccounts(),
trade: () => trade,
buySellOptions: () => buySellOptions,
options: () => Options.get()
}
}).result;
} |
<<<<<<<
function getMinLimits (quote, fiatCurrency) {
=======
function getMinLimits (quote) {
if (service.limits.bank.min && service.limits.card.min) return $q.resolve();
>>>>>>>
function getMinLimits (quote) {
<<<<<<<
service.limits.bank.min = mediums.bank ? mediums.bank.minimumInAmounts : {};
service.limits.card.min = mediums.card ? mediums.card.minimumInAmounts : {};
=======
service.limits.bank.min = mediums.bank.minimumInAmounts;
service.limits.card.min = mediums.card.minimumInAmounts;
>>>>>>>
service.limits.bank.min = mediums.bank.minimumInAmounts;
service.limits.card.min = mediums.card.minimumInAmounts; |
<<<<<<<
export function hitDetection (p){
=======
window.hitDetection = function(p) {
>>>>>>>
export function hitDetection (p){
<<<<<<<
export function interpolatedHitCircleCollision (circlePos,r,p,j){
=======
window.interpolatedHitCircleCollision = function(circlePos, r, p, j) {
>>>>>>>
export function interpolatedHitCircleCollision (circlePos,r,p,j){
<<<<<<<
export function segmentSegmentCollision (a1,a2,b1,b2){
var intersection = new Vec2D(0,0);
var b = new Vec2D(a2.x-a1.x,a2.y-a1.y);
var d = new Vec2D(b2.x-b1.x,b2.y-b1.y);
=======
window.segmentSegmentCollision = function(a1, a2, b1, b2) {
var intersection = new Vec2D(0, 0);
var b = new Vec2D(a2.x - a1.x, a2.y - a1.y);
var d = new Vec2D(b2.x - b1.x, b2.y - b1.y);
>>>>>>>
export function segmentSegmentCollision (a1,a2,b1,b2){
var intersection = new Vec2D(0, 0);
var b = new Vec2D(a2.x - a1.x, a2.y - a1.y);
var d = new Vec2D(b2.x - b1.x, b2.y - b1.y);
<<<<<<<
export function executeHits (){
=======
window.executeHits = function() {
>>>>>>>
export function executeHits (){
<<<<<<<
export function executeGrabTech (a,v){
if (player[a].phys.pos.x < player[v].phys.pos.x){
=======
window.executeGrabTech = function(a, v) {
if (player[a].phys.pos.x < player[v].phys.pos.x) {
>>>>>>>
export function executeGrabTech (a,v){
if (player[a].phys.pos.x < player[v].phys.pos.x) {
<<<<<<<
export function knockbackSounds (type,knockback,v){
if (type == 4){
=======
window.knockbackSounds = function(type, knockback, v) {
if (type == 4) {
>>>>>>>
export function knockbackSounds (type,knockback,v){
if (type == 4){
<<<<<<<
export function checkPhantoms (){
for (var i=0;i<phantomQueue.length;i++){
=======
window.checkPhantoms = function() {
for (var i = 0; i < phantomQueue.length; i++) {
>>>>>>>
export function checkPhantoms (){
for (var i = 0; i < phantomQueue.length; i++) { |
<<<<<<<
export function randomShout (char){
=======
window.randomShout = function(char) {
>>>>>>>
export function randomShout (char){
<<<<<<<
export function executeIntangibility (actionStateName,p){
if (player[p].timer == intangibility[cS[p]][actionStateName][0]){
=======
window.executeIntangibility = function(actionStateName, p) {
if (player[p].timer == intangibility[cS[p]][actionStateName][0]) {
>>>>>>>
export function executeIntangibility (actionStateName,p){
if (player[p].timer == intangibility[cS[p]][actionStateName][0]) {
<<<<<<<
export function playSounds (actionStateName,p){
for (var i=0; i<actionSounds[cS[p]][actionStateName].length; i++){
if (player[p].timer == actionSounds[cS[p]][actionStateName][i][0]){
=======
window.playSounds = function(actionStateName, p) {
for (var i = 0; i < actionSounds[cS[p]][actionStateName].length; i++) {
if (player[p].timer == actionSounds[cS[p]][actionStateName][i][0]) {
>>>>>>>
export function playSounds (actionStateName,p){
for (var i = 0; i < actionSounds[cS[p]][actionStateName].length; i++) {
if (player[p].timer == actionSounds[cS[p]][actionStateName][i][0]) {
<<<<<<<
export function isFinalDeath (){
if (gameMode == 5){
=======
window.isFinalDeath = function() {
if (gameMode == 5) {
>>>>>>>
export function isFinalDeath (){
if (gameMode == 5){
<<<<<<<
export function shieldTilt (p,shieldstun){
if (!shieldstun && !player[p].inCSS){
=======
window.shieldTilt = function(p, shieldstun) {
if (!shieldstun && !player[p].inCSS) {
>>>>>>>
export function shieldTilt (p,shieldstun){
if (!shieldstun && !player[p].inCSS){
<<<<<<<
export function reduceByTraction (p,applyDouble){
if (player[p].phys.cVel.x > 0){
if (applyDouble && player[p].phys.cVel.x > player[p].charAttributes.maxWalk){
player[p].phys.cVel.x -= player[p].charAttributes.traction*2;
}
else {
=======
window.reduceByTraction = function(p, applyDouble) {
if (player[p].phys.cVel.x > 0) {
if (applyDouble && player[p].phys.cVel.x > player[p].charAttributes.maxWalk) {
player[p].phys.cVel.x -= player[p].charAttributes.traction * 2;
} else {
>>>>>>>
export function reduceByTraction (p,applyDouble){
if (player[p].phys.cVel.x > 0){
if (applyDouble && player[p].phys.cVel.x > player[p].charAttributes.maxWalk){
player[p].phys.cVel.x -= player[p].charAttributes.traction*2;
}
else {
<<<<<<<
export function airDrift (p){
if (Math.abs(player[p].inputs.lStickAxis[0].x) < 0.3){
=======
window.airDrift = function(p) {
if (Math.abs(player[p].inputs.lStickAxis[0].x) < 0.3) {
>>>>>>>
export function airDrift (p){
if (Math.abs(player[p].inputs.lStickAxis[0].x) < 0.3){
<<<<<<<
export function fastfall (p){
if (!player[p].phys.fastfalled){
=======
window.fastfall = function(p) {
if (!player[p].phys.fastfalled) {
>>>>>>>
export function fastfall (p){
if (!player[p].phys.fastfalled){
<<<<<<<
export function shieldDepletion (p){
=======
window.shieldDepletion = function(p) {
>>>>>>>
export function shieldDepletion (p){
<<<<<<<
export function shieldSize (p,lock){
//shield size * 0.575 * model scaling
=======
window.shieldSize = function(p, lock) {
//shield size * 0.575 * model scaling
>>>>>>>
export function shieldSize (p,lock){
//shield size * 0.575 * model scaling
<<<<<<<
export function mashOut (p){
if (player[p].inputs.a[0] && !player[p].inputs.a[1]){
=======
window.mashOut = function(p) {
if (player[p].inputs.a[0] && !player[p].inputs.a[1]) {
>>>>>>>
export function mashOut (p){
if (player[p].inputs.a[0] && !player[p].inputs.a[1]){
<<<<<<<
export function checkForSmashes (p){
if (player[p].inputs.a[0] && !player[p].inputs.a[1]){
if (Math.abs(player[p].inputs.lStickAxis[0].x) >= 0.79 && player[p].inputs.lStickAxis[2].x*Math.sign(player[p].inputs.lStickAxis[0].x) < 0.3){
=======
window.checkForSmashes = function(p) {
if (player[p].inputs.a[0] && !player[p].inputs.a[1]) {
if (Math.abs(player[p].inputs.lStickAxis[0].x) >= 0.79 && player[p].inputs.lStickAxis[2].x * Math.sign(player[p].inputs
.lStickAxis[0].x) < 0.3) {
>>>>>>>
export function checkForSmashes (p){
if (player[p].inputs.a[0] && !player[p].inputs.a[1]){
if (Math.abs(player[p].inputs.lStickAxis[0].x) >= 0.79 && player[p].inputs.lStickAxis[2].x*Math.sign(player[p].inputs.lStickAxis[0].x) < 0.3){
<<<<<<<
export function checkForTilts (p,reverse){
=======
window.checkForTilts = function(p, reverse) {
>>>>>>>
export function checkForTilts (p,reverse){
<<<<<<<
export function checkForSpecials (p){
if (player[p].inputs.b[0] && !player[p].inputs.b[1]){
if (player[p].phys.grounded){
if (Math.abs(player[p].inputs.lStickAxis[0].x) > 0.58 || (player[p].inputs.lStickAxis[0].y > 0.58 && Math.abs(player[p].inputs.lStickAxis[0].x) > player[p].inputs.lStickAxis[0].y - 0.2)){
=======
window.checkForSpecials = function(p) {
if (player[p].inputs.b[0] && !player[p].inputs.b[1]) {
if (player[p].phys.grounded) {
if (Math.abs(player[p].inputs.lStickAxis[0].x) > 0.58 || (player[p].inputs.lStickAxis[0].y > 0.58 && Math.abs(
player[p].inputs.lStickAxis[0].x) > player[p].inputs.lStickAxis[0].y - 0.2)) {
>>>>>>>
export function checkForSpecials (p){
if (player[p].inputs.b[0] && !player[p].inputs.b[1]){
if (player[p].phys.grounded){
if (Math.abs(player[p].inputs.lStickAxis[0].x) > 0.58 || (player[p].inputs.lStickAxis[0].y > 0.58 && Math.abs(player[p].inputs.lStickAxis[0].x) > player[p].inputs.lStickAxis[0].y - 0.2)){
<<<<<<<
export function checkForAerials (p){
if (player[p].inputs.cStickAxis[0].x * player[p].phys.face >= 0.3 && player[p].inputs.cStickAxis[1].x * player[p].phys.face < 0.3 && Math.abs(player[p].inputs.cStickAxis[0].x) > Math.abs(player[p].inputs.cStickAxis[0].y) - 0.1){
return [true,"ATTACKAIRF"];
}
else if (player[p].inputs.cStickAxis[0].x * player[p].phys.face <= -0.3 && player[p].inputs.cStickAxis[1].x * player[p].phys.face > -0.3 && Math.abs(player[p].inputs.cStickAxis[0].x) > Math.abs(player[p].inputs.cStickAxis[0].y) - 0.1){
return [true,"ATTACKAIRB"];
}
else if (player[p].inputs.cStickAxis[0].y >= 0.3 && player[p].inputs.cStickAxis[1].y < 0.3){
return [true,"ATTACKAIRU"];
}
else if (player[p].inputs.cStickAxis[0].y < -0.3 && player[p].inputs.cStickAxis[1].y > -0.3){
return [true,"ATTACKAIRD"];
}
else if ((player[p].inputs.a[0] && !player[p].inputs.a[1]) || (player[p].inputs.z[0] && !player[p].inputs.z[1])){
if (player[p].inputs.lStickAxis[0].x * player[p].phys.face > 0.3 && Math.abs(player[p].inputs.lStickAxis[0].x) > Math.abs(player[p].inputs.lStickAxis[0].y) - 0.1){
return [true,"ATTACKAIRF"];
}
else if (player[p].inputs.lStickAxis[0].x * player[p].phys.face < -0.3 && Math.abs(player[p].inputs.lStickAxis[0].x) > Math.abs(player[p].inputs.lStickAxis[0].y) - 0.1){
return [true,"ATTACKAIRB"];
}
else if (player[p].inputs.lStickAxis[0].y > 0.3){
return [true,"ATTACKAIRU"];
}
else if (player[p].inputs.lStickAxis[0].y < -0.3){
return [true,"ATTACKAIRD"];
}
else {
return [true,"ATTACKAIRN"];
=======
window.checkForAerials = function(p) {
if (player[p].inputs.cStickAxis[0].x * player[p].phys.face >= 0.3 && player[p].inputs.cStickAxis[1].x * player[p].phys
.face < 0.3 && Math.abs(player[p].inputs.cStickAxis[0].x) > Math.abs(player[p].inputs.cStickAxis[0].y) - 0.1) {
return [true, "ATTACKAIRF"];
} else if (player[p].inputs.cStickAxis[0].x * player[p].phys.face <= -0.3 && player[p].inputs.cStickAxis[1].x *
player[p].phys.face > -0.3 && Math.abs(player[p].inputs.cStickAxis[0].x) > Math.abs(player[p].inputs.cStickAxis[0]
.y) - 0.1) {
return [true, "ATTACKAIRB"];
} else if (player[p].inputs.cStickAxis[0].y >= 0.3 && player[p].inputs.cStickAxis[1].y < 0.3) {
return [true, "ATTACKAIRU"];
} else if (player[p].inputs.cStickAxis[0].y < -0.3 && player[p].inputs.cStickAxis[1].y > -0.3) {
return [true, "ATTACKAIRD"];
} else if ((player[p].inputs.a[0] && !player[p].inputs.a[1]) || (player[p].inputs.z[0] && !player[p].inputs.z[1])) {
if (player[p].inputs.lStickAxis[0].x * player[p].phys.face > 0.3 && Math.abs(player[p].inputs.lStickAxis[0].x) >
Math.abs(player[p].inputs.lStickAxis[0].y) - 0.1) {
return [true, "ATTACKAIRF"];
} else if (player[p].inputs.lStickAxis[0].x * player[p].phys.face < -0.3 && Math.abs(player[p].inputs.lStickAxis[
0].x) > Math.abs(player[p].inputs.lStickAxis[0].y) - 0.1) {
return [true, "ATTACKAIRB"];
} else if (player[p].inputs.lStickAxis[0].y > 0.3) {
return [true, "ATTACKAIRU"];
} else if (player[p].inputs.lStickAxis[0].y < -0.3) {
return [true, "ATTACKAIRD"];
} else {
return [true, "ATTACKAIRN"];
>>>>>>>
export function checkForAerials (p){
if (player[p].inputs.cStickAxis[0].x * player[p].phys.face >= 0.3 && player[p].inputs.cStickAxis[1].x * player[p].phys
.face < 0.3 && Math.abs(player[p].inputs.cStickAxis[0].x) > Math.abs(player[p].inputs.cStickAxis[0].y) - 0.1) {
return [true, "ATTACKAIRF"];
} else if (player[p].inputs.cStickAxis[0].x * player[p].phys.face <= -0.3 && player[p].inputs.cStickAxis[1].x *
player[p].phys.face > -0.3 && Math.abs(player[p].inputs.cStickAxis[0].x) > Math.abs(player[p].inputs.cStickAxis[0]
.y) - 0.1) {
return [true, "ATTACKAIRB"];
} else if (player[p].inputs.cStickAxis[0].y >= 0.3 && player[p].inputs.cStickAxis[1].y < 0.3) {
return [true, "ATTACKAIRU"];
} else if (player[p].inputs.cStickAxis[0].y < -0.3 && player[p].inputs.cStickAxis[1].y > -0.3) {
return [true, "ATTACKAIRD"];
} else if ((player[p].inputs.a[0] && !player[p].inputs.a[1]) || (player[p].inputs.z[0] && !player[p].inputs.z[1])) {
if (player[p].inputs.lStickAxis[0].x * player[p].phys.face > 0.3 && Math.abs(player[p].inputs.lStickAxis[0].x) >
Math.abs(player[p].inputs.lStickAxis[0].y) - 0.1) {
return [true, "ATTACKAIRF"];
} else if (player[p].inputs.lStickAxis[0].x * player[p].phys.face < -0.3 && Math.abs(player[p].inputs.lStickAxis[
0].x) > Math.abs(player[p].inputs.lStickAxis[0].y) - 0.1) {
return [true, "ATTACKAIRB"];
} else if (player[p].inputs.lStickAxis[0].y > 0.3) {
return [true, "ATTACKAIRU"];
} else if (player[p].inputs.lStickAxis[0].y < -0.3) {
return [true, "ATTACKAIRD"];
} else {
return [true, "ATTACKAIRN"];
<<<<<<<
export function turboGroundedInterrupt (p){
=======
window.turboGroundedInterrupt = function(p) {
>>>>>>>
export function turboGroundedInterrupt (p){ |
<<<<<<<
window.cpuSlider = [new Vec2D(152+15+166+0,595),new Vec2D(152+15+166+225,595),new Vec2D(152+15+166+450,595),new Vec2D(152+15+166+675,595)];
=======
cpuSlider = [new Vec2D(152+15+166+0-50,595),new Vec2D(152+15+166+225-50,595),new Vec2D(152+15+166+450-50,595),new Vec2D(152+15+166+675-50,595)];
>>>>>>>
window.cpuSlider = [new Vec2D(152+15+166+0-50,595),new Vec2D(152+15+166+225-50,595),new Vec2D(152+15+166+450-50,595),new Vec2D(152+15+166+675-50,595)]; |
<<<<<<<
export let transparency = true;
export function setTransparency(val){
transparency = val;
=======
window.transparency = true;
window.makeColour = function(r, g, b, a) {
// maybe some hsl too
if (transparency) {
return "rgba(" + r + "," + g + "," + b + "," + a + ")";
} else {
return "rgb(" + r + "," + g + "," + b + ")";
}
>>>>>>>
export let transparency = true;
export function setTransparency(val){
transparency = val;
<<<<<<<
export const dVfx = {
general : function(j,ang){
let col = makeColour(vfxQueue[j][0].colour[0], vfxQueue[j][0].colour[1], vfxQueue[j][0].colour[2], 0.8 * ((vfxQueue[j][0].frames - vfxQueue[j][1]) / vfxQueue[j][0].frames));
=======
window.dVfx = {
general: function(j, ang) {
var col = makeColour(vfxQueue[j][0].colour[0], vfxQueue[j][0].colour[1], vfxQueue[j][0].colour[2], 0.8 * ((
vfxQueue[j][0].frames - vfxQueue[j][1]) / vfxQueue[j][0].frames));
>>>>>>>
export const dVfx = {
general: function(j, ang) {
var col = makeColour(vfxQueue[j][0].colour[0], vfxQueue[j][0].colour[1], vfxQueue[j][0].colour[2], 0.8 * ((
vfxQueue[j][0].frames - vfxQueue[j][1]) / vfxQueue[j][0].frames));
<<<<<<<
circleDust : function(j){
for (let n=0;n<vfxQueue[j][0].circles.length;n++){
const x = ((vfxQueue[j][2].x+(vfxQueue[j][0].circles[n]*(1+(vfxQueue[j][1]/vfxQueue[j][0].frames))))*stage.scale) + stage.offset[0];
const y = ((vfxQueue[j][2].y+(4*(0+(vfxQueue[j][1]/vfxQueue[j][0].frames))))*-stage.scale) +stage.offset[1];
fg2.fillStyle = makeColour(255,255,255,0.7*((vfxQueue[j][0].frames-vfxQueue[j][1])/vfxQueue[j][0].frames));
=======
circleDust: function(j) {
for (var n = 0; n < vfxQueue[j][0].circles.length; n++) {
var x = ((vfxQueue[j][2].x + (vfxQueue[j][0].circles[n] * (1 + (vfxQueue[j][1] / vfxQueue[j][0].frames)))) *
stage.scale) + stage.offset[0];
var y = ((vfxQueue[j][2].y + (4 * (0 + (vfxQueue[j][1] / vfxQueue[j][0].frames)))) * -stage.scale) + stage.offset[
1];
fg2.fillStyle = makeColour(255, 255, 255, 0.7 * ((vfxQueue[j][0].frames - vfxQueue[j][1]) / vfxQueue[j][0].frames));
>>>>>>>
circleDust: function(j) {
for (var n = 0; n < vfxQueue[j][0].circles.length; n++) {
var x = ((vfxQueue[j][2].x + (vfxQueue[j][0].circles[n] * (1 + (vfxQueue[j][1] / vfxQueue[j][0].frames)))) *
stage.scale) + stage.offset[0];
var y = ((vfxQueue[j][2].y + (4 * (0 + (vfxQueue[j][1] / vfxQueue[j][0].frames)))) * -stage.scale) + stage.offset[
1];
fg2.fillStyle = makeColour(255, 255, 255, 0.7 * ((vfxQueue[j][0].frames - vfxQueue[j][1]) / vfxQueue[j][0].frames));
<<<<<<<
export function makeColour (r,g,b,a){
// maybe some hsl too
if (transparency){
return "rgba("+r+","+g+","+b+","+a+")";
}
else {
return "rgb("+r+","+g+","+b+")";
}
}
export function drawHexagon (r,tX,tY,width){
=======
window.drawHexagon = function(r, tX, tY, width) {
>>>>>>>
export function makeColour (r,g,b,a){
// maybe some hsl too
if (transparency){
return "rgba("+r+","+g+","+b+","+a+")";
}
else {
return "rgb("+r+","+g+","+b+")";
}
}
export function drawHexagon (r,tX,tY,width){ |
<<<<<<<
/* eslint-disable */
window.runAI = function(i){
=======
//var a = 0;
var a = 0;
function NearestEnemy(cpu,p){
var nearestEnemy = -1;
var enemyDistance = 100000;
for (var i=0;i<4;i++){
if (playerType[i] > -1){
if (playerType[i] > -1 && i != p && player[i].actionState != "SLEEP"){
if (i != p){
var dist = Math.pow(cpu.phys.pos.x-player[i].phys.pos.x,2)+Math.pow(cpu.phys.pos.y-player[i].phys.pos.y,2);
if (dist < enemyDistance){
enemyDistance = dist;
nearestEnemy = i;
}
}
}
}
}
if (nearestEnemy == -1){
nearestEnemy = 0;
console.log("cant find nearest enemy");
// fail safe so it doesnt crash at least
}
return nearestEnemy;
}
function generalAI(i) {
>>>>>>>
/* eslint-disable */
var a = 0;
function NearestEnemy(cpu,p){
var nearestEnemy = -1;
var enemyDistance = 100000;
for (var i=0;i<4;i++){
if (playerType[i] > -1){
if (playerType[i] > -1 && i != p && player[i].actionState != "SLEEP"){
if (i != p){
var dist = Math.pow(cpu.phys.pos.x-player[i].phys.pos.x,2)+Math.pow(cpu.phys.pos.y-player[i].phys.pos.y,2);
if (dist < enemyDistance){
enemyDistance = dist;
nearestEnemy = i;
}
}
}
}
}
if (nearestEnemy == -1){
nearestEnemy = 0;
console.log("cant find nearest enemy");
// fail safe so it doesnt crash at least
}
return nearestEnemy;
}
function generalAI(i) {
<<<<<<<
window.NearestEnemy = function(cpu,p){
var nearestEnemy = -1;
var enemyDistance = 100000;
for (var i=0;i<4;i++){
if (playerType[i] > -1){
if (playerType[i] > -1 && i != p && player[i].actionState != "SLEEP"){
if (i != p){
var dist = Math.pow(cpu.phys.pos.x-player[i].phys.pos.x,2)+Math.pow(cpu.phys.pos.y-player[i].phys.pos.y,2);
if (dist < enemyDistance){
enemyDistance = dist;
nearestEnemy = i;
}
=======
function NearestLedge(cpu) {
var closest = [0,10000]; //used to measure which ledge is closer
for (i = 0;i < stage.ledgePos.length; i++) {
var closeness = Math.abs(cpu.phys.pos.x - stage.ledgePos[i].x) + Math.abs(cpu.phys.pos.y - stage.ledgePos[i].y); //distance from ledge
if (closeness < closest[1]) { //if closer to that ledge than others, update closest.
closest = [i,closeness];
>>>>>>>
function NearestLedge(cpu) {
var closest = [0,10000]; //used to measure which ledge is closer
for (var i = 0;i < stage.ledgePos.length; i++) {
var closeness = Math.abs(cpu.phys.pos.x - stage.ledgePos[i].x) + Math.abs(cpu.phys.pos.y - stage.ledgePos[i].y); //distance from ledge
if (closeness < closest[1]) { //if closer to that ledge than others, update closest.
closest = [i,closeness];
<<<<<<<
window.CPULedge = function(cpu,p) {
=======
function CPUSDItoStage(cpu,p) {
var closest = NearestLedge(cpu);
var returnInput = {
lStickX: 0.0,
lStickY: 0.0
}
if (cpu.timer % 2 == 0) {
var theta = Math.atan(((closest.y - 3.5) - cpu.phys.pos.y) / (closest.x - cpu.phys.pos.x)) + imperfection; //some trig to get angles //(cpu.phys.ledgeSnapBoxF.max.y-cpu.phys.ledgeSnapBoxF.min.y)/2
var newX = Math.cos(theta);//* Math.sqrt(2);
var newY = Math.sin(theta); //* Math.sqrt(2);
if (closest.x < cpu.phys.pos.x){
newX *= -1;
newY *= -1;
}
// dont go past 1.0 or -1.0
newX = Math.sign(newX)*Math.min(1.0,Math.abs(newX));
newY = Math.sign(newY)*Math.min(1.0,Math.abs(newY));
returnInput.lstickX = newX;
returnInput.lstickY = newY;
} else {
var imperfection = 0;
var theta = Math.atan(((closest.y - 3.5) - cpu.phys.pos.y) / (closest.x - cpu.phys.pos.x)) + imperfection; //some trig to get angles //(cpu.phys.ledgeSnapBoxF.max.y-cpu.phys.ledgeSnapBoxF.min.y)/2
theta = theta + 0.25 * ((Math.floor((Math.random() * 2) + 1) - 1) * -1.0) * 3.14159265358979323846264338327950288419716939937510582097494459230781;
var newX = Math.cos(theta);//* Math.sqrt(2);
var newY = Math.sin(theta); //* Math.sqrt(2);
if (closest.x < cpu.phys.pos.x){
newX *= -1;
newY *= -1;
}
// dont go past 1.0 or -1.0
newX = Math.sign(newX)*Math.min(1.0,Math.abs(newX));
newY = Math.sign(newY)*Math.min(1.0,Math.abs(newY));
returnInput.lstickX = newX;
returnInput.lstickY = newY;
}
return returnInput;
}
function CPUShield(cpu,p) {
var returnInput = {
lstickX : 0.0,
lstickY : 0.0,
x : false,
b : false,
a : false,
l : true,
cstickX : 0.0,
cstickY : 0.0,
};
var shouldDoSomething = false;
var doSomethingChance = Math.min(100,25 * Math.tan((3.1415926535 / 121) * (60 - cpu.phys.shieldHP)));
//console.log(doSomethingChance);
var randomSeed = Math.floor((Math.random() * 100) + 1);
if (randomSeed <= doSomethingChance) { //do something
returnInput.l = false;
var extra = Math.max(0,15 - cpu.difficulty);
var randomSeed = Math.floor((Math.random() * 30) + 1) + extra;
if (randomSeed <= 30) { //jump or shield drop
if (isAboveGround(cpu.phys.pos.x,cpu.phys.pos.x)[1] == "platform" && cpu.difficulty >= 3) {
//can shield drop
var randomSeed = Math.floor((Math.random() * 2) + 1) + extra;
if (randomSeed != 1) { //shield drop
returnInput.lstickY = -0.66;
cpu.currentAction = "NONE";
} else {
returnInput.x = true;
cpu.currentAction = "NONE";
}
} else {
returnInput.x = true;
cpu.currentAction = "NONE";
}
}
}
return returnInput;
}
function CPULedge(cpu,p) {
>>>>>>>
function CPUSDItoStage(cpu,p) {
var closest = NearestLedge(cpu);
var returnInput = {
lStickX: 0.0,
lStickY: 0.0
}
if (cpu.timer % 2 == 0) {
var theta = Math.atan(((closest.y - 3.5) - cpu.phys.pos.y) / (closest.x - cpu.phys.pos.x)) + imperfection; //some trig to get angles //(cpu.phys.ledgeSnapBoxF.max.y-cpu.phys.ledgeSnapBoxF.min.y)/2
var newX = Math.cos(theta);//* Math.sqrt(2);
var newY = Math.sin(theta); //* Math.sqrt(2);
if (closest.x < cpu.phys.pos.x){
newX *= -1;
newY *= -1;
}
// dont go past 1.0 or -1.0
newX = Math.sign(newX)*Math.min(1.0,Math.abs(newX));
newY = Math.sign(newY)*Math.min(1.0,Math.abs(newY));
returnInput.lstickX = newX;
returnInput.lstickY = newY;
} else {
var imperfection = 0;
var theta = Math.atan(((closest.y - 3.5) - cpu.phys.pos.y) / (closest.x - cpu.phys.pos.x)) + imperfection; //some trig to get angles //(cpu.phys.ledgeSnapBoxF.max.y-cpu.phys.ledgeSnapBoxF.min.y)/2
theta = theta + 0.25 * ((Math.floor((Math.random() * 2) + 1) - 1) * -1.0) * 3.14159265358979323846264338327950288419716939937510582097494459230781;
var newX = Math.cos(theta);//* Math.sqrt(2);
var newY = Math.sin(theta); //* Math.sqrt(2);
if (closest.x < cpu.phys.pos.x){
newX *= -1;
newY *= -1;
}
// dont go past 1.0 or -1.0
newX = Math.sign(newX)*Math.min(1.0,Math.abs(newX));
newY = Math.sign(newY)*Math.min(1.0,Math.abs(newY));
returnInput.lstickX = newX;
returnInput.lstickY = newY;
}
return returnInput;
}
function CPUShield(cpu,p) {
var returnInput = {
lstickX : 0.0,
lstickY : 0.0,
x : false,
b : false,
a : false,
l : true,
cstickX : 0.0,
cstickY : 0.0,
};
var shouldDoSomething = false;
var doSomethingChance = Math.min(100,25 * Math.tan((3.1415926535 / 121) * (60 - cpu.phys.shieldHP)));
//console.log(doSomethingChance);
var randomSeed = Math.floor((Math.random() * 100) + 1);
if (randomSeed <= doSomethingChance) { //do something
returnInput.l = false;
var extra = Math.max(0,15 - cpu.difficulty);
var randomSeed = Math.floor((Math.random() * 30) + 1) + extra;
if (randomSeed <= 30) { //jump or shield drop
if (isAboveGround(cpu.phys.pos.x,cpu.phys.pos.x)[1] == "platform" && cpu.difficulty >= 3) {
//can shield drop
var randomSeed = Math.floor((Math.random() * 2) + 1) + extra;
if (randomSeed != 1) { //shield drop
returnInput.lstickY = -0.66;
cpu.currentAction = "NONE";
} else {
returnInput.x = true;
cpu.currentAction = "NONE";
}
} else {
returnInput.x = true;
cpu.currentAction = "NONE";
}
}
}
return returnInput;
}
function CPULedge(cpu,p) {
<<<<<<<
var closest = [0,10000]; //used to measure which ledge is closer
for (let i = 0;i < stage.ledgePos.length; i++) {
var closeness = Math.abs(cpu.phys.pos.x - stage.ledgePos[i].x) + Math.abs(cpu.phys.pos.y - stage.ledgePos[i].y); //distance from ledge
if (closeness < closest[1]) { //if closer to that ledge than others, update closest.
closest = [i,closeness];
}
}
closest = stage.ledgePos[closest[0]]; //updates closest to instead be the closest ledge.
=======
closest = NearestLedge(cpu);
>>>>>>>
var closest = NearestLedge(cpu); |
<<<<<<<
window.player = [0,0,0,0];
window.renderTime = [10,0,100,0];
window.gamelogicTime = [5,0,100,0];
window.framerate = [0,0,0];
window.cS = [0,0,0,0];
window.vfxQueue = [];
window.shine = 0.5;
=======
layers = {
BG1 : 0,
BG2 : 0,
FG1 : 0,
FG2 : 0,
UI : 0
};
player = [0,0,0,0];
>>>>>>>
window.player = [0,0,0,0];
window.renderTime = [10,0,100,0];
window.gamelogicTime = [5,0,100,0];
window.framerate = [0,0,0];
window.cS = [0,0,0,0];
window.vfxQueue = [];
window.shine = 0.5;
window.layers = {
BG1 : 0,
BG2 : 0,
FG1 : 0,
FG2 : 0,
UI : 0
};
<<<<<<<
window.findPlayers = function(){
var gps = navigator.getGamepads();
=======
function findPlayers(){
var gps = navigator.getGamepads ? navigator.getGamepads() : (navigator.webkitGetGamepads ? navigator.webkitGetGamepads() : []);
>>>>>>>
window.findPlayers = function(){
var gps = navigator.getGamepads ? navigator.getGamepads() : (navigator.webkitGetGamepads ? navigator.webkitGetGamepads() : []);
<<<<<<<
window.bg1 = 0;
window.bg2 = 0;
window.fg1 = 0;
window.fg2 = 0;
window.ui = 0;
window.c = 0;
window.canvasMain = 0;
window.layers = {
BG1 : 0,
BG2 : 0,
FG1 : 0,
FG2 : 0,
UI : 0
};
window.layerSwitches = {
=======
bg1 = 0;
bg2 = 0;
fg1 = 0;
fg2 = 0;
ui = 0;
c = 0;
canvasMain = 0;
layerSwitches = {
>>>>>>>
window.bg1 = 0;
window.bg2 = 0;
window.fg1 = 0;
window.fg2 = 0;
window.ui = 0;
window.c = 0;
window.canvasMain = 0;
window.layerSwitches = { |
<<<<<<<
import {controllerIDNumberFromGamepadID, controllerNameFromIDnumber, axis, button, gpdaxis, gpdbutton, keyboardMap, controllerMaps, scaleToUnitAxes, scaleToMeleeAxes, meleeRescale, scaleToGCTrigger, custcent} from "main/input";
=======
import {controllerIDNumberFromGamepadID, controllerNameFromIDnumber, button, gpdaxis, gpdbutton, controllerMaps, scaleToUnitAxes, scaleToMeleeAxes, scaleToGCTrigger, custcent} from "main/input";
import {toggleTransparency,getTransparency} from "main/vfx/transparency";
import {drawVfx} from "main/vfx/drawVfx";
import {resetVfxQueue} from "main/vfx/vfxQueue";
import {setVsStage, getActiveStage, activeStage} from "../stages/activeStage";
import {music} from "./sfx";
import {getShowSFX, toggleShowSFX} from "main/vfx";
import {renderVfx} from "./vfx/renderVfx";
import {Box2D} from "./util/Box2D";
import {Vec2D} from "./util/Vec2D";
>>>>>>>
import {controllerIDNumberFromGamepadID, controllerNameFromIDnumber, axis, button, gpdaxis, gpdbutton, keyboardMap, controllerMaps, scaleToUnitAxes, scaleToMeleeAxes, meleeRescale, scaleToGCTrigger, custcent} from "main/input";
import {toggleTransparency,getTransparency} from "main/vfx/transparency";
import {drawVfx} from "main/vfx/drawVfx";
import {resetVfxQueue} from "main/vfx/vfxQueue";
import {setVsStage, getActiveStage, activeStage} from "../stages/activeStage";
import {music} from "./sfx";
import {getShowSFX, toggleShowSFX} from "main/vfx";
import {renderVfx} from "./vfx/renderVfx";
import {Box2D} from "./util/Box2D";
import {Vec2D} from "./util/Vec2D"; |
<<<<<<<
document.getElementById('container').style.display = 'block';
return { label:'login', searchState: "simple" };
=======
return { label:'login', searchState: "simple" , providers:["All providers"]};
>>>>>>>
document.getElementById('container').style.display = 'block';
return { label:'login', searchState: "simple" , providers:["All providers"]};
<<<<<<<
if(getUrlVars()['query'])
{
this.onSearchByUrl();
}
=======
ProvidersActions.get();
>>>>>>>
if(getUrlVars()['query'])
{
this.onSearchByUrl();
}
ProvidersActions.get(); |
<<<<<<<
loadLocalStore(user) {
if (!user) {
user = localStorage.getItem('user');
}
if (user) {
console.log('Loading previous session from local store');
let userData = JSON.parse(user);
this._isAdmin = userData.isAdmin;
this._username = userData.username;
this._roles = userData.roles;
this._token = userData.token;
this._isLoggedIn = true;
=======
loadLocalStore: function(){
if (localStorage.token) {
console.log("loadLocalStore");
let user = JSON.parse(localStorage.getItem("user"));
if (user) {
this._isAdmin = user.isAdmin;
this._username = user.username;
this._roles = user.roles;
this._token = user.token;
this._isLoggedIn = true;
this.trigger({
isLoggedIn: this._isLoggedIn,
success: true
});
}
>>>>>>>
loadLocalStore(user) {
if (!user) {
user = localStorage.getItem('user');
}
if (user) {
console.log('Loading previous session from local store');
let userData = JSON.parse(user);
this._isAdmin = userData.isAdmin;
this._username = userData.username;
this._roles = userData.roles;
this._token = userData.token;
this._isLoggedIn = true;
<<<<<<<
Dicoogle.login(user, pass, function(error, data){
if (error)
{
self.trigger({
success: false,
loginFailed: true
=======
Dicoogle.login(user, pass, (error, data) => {
if (error) {
this.trigger({
failed: true
>>>>>>>
Dicoogle.login(user, pass, (error, data) => {
if (error)
{
this.trigger({
success: false,
loginFailed: true
<<<<<<<
self._username = data.user;
self._isAdmin = data.admin;
self._token = data.token;
self._roles = data.roles;
self._isLoggedIn = true;
localStorage.token = self._token;
console.log("Saving token to local storage:", localStorage.token);
self.saveLocalStore();
self.trigger({
isLoggedIn: true,
=======
this._username = data.user;
this._isAdmin = data.admin;
this._token = data.token;
this._roles = data.roles;
this._isLoggedIn = true;
localStorage.token = this._token;
this.saveLocalStore();
console.log("Localstorage token:", localStorage.token);
this.trigger({
isLoggedIn: this._isLoggedIn,
>>>>>>>
this._username = data.user;
this._isAdmin = data.admin;
this._token = data.token;
this._roles = data.roles;
this._isLoggedIn = true;
localStorage.token = this._token;
console.log("Saving token to local storage:", localStorage.token);
this.saveLocalStore();
this.trigger({
isLoggedIn: true, |
<<<<<<<
=======
_trailing_statement: $ => choice(
$.trailing_break_statement,
$.trailing_continue_statement,
$.trailing_throw_statement,
$.trailing_return_statement,
$.trailing_expression_statement,
$.trailing_if_statement,
$.trailing_for_statement,
$.trailing_for_in_statement,
$.trailing_for_of_statement,
$.trailing_while_statement,
$.trailing_do_statement,
$.trailing_variable_statement
),
>>>>>>>
<<<<<<<
semicolon($)
),
=======
terminator()
),
>>>>>>>
')',
$._statement
),
for_in_statement: $ => seq(
'for',
'(',
optional(variableType()),
$._expression,
'in',
$._expression,
')',
$._statement
),
for_of_statement: $ => seq(
'for',
'(',
optional(variableType()),
$._expression,
'of',
$._expression,
')',
$._statement
),
while_statement: $ => seq(
'while',
$._paren_expression,
$._statement
),
do_statement: $ => seq(
'do',
$.statement_block,
'while',
$._paren_expression,
semicolon($)
),
try_statement: $ => seq(
'try',
$.statement_block,
optional($.catch),
optional($.finally)
),
break_statement: $ => seq(
'break',
optional($.identifier),
semicolon($)
),
continue_statement: $ => seq(
'continue',
optional($.identifier),
semicolon($)
),
return_statement: $ => seq(
'return',
optional(choice($._expression, $.comma_op)),
semicolon($)
),
<<<<<<<
seq($._public_field_definition, semicolon($))
=======
seq($.public_field_definition, terminator())
>>>>>>>
seq($.public_field_definition, semicolon($))
<<<<<<<
reserved_identifier: $ => choice('get', 'set', 'async')
=======
_property_name: $ => choice($.identifier, $.reserved_identifier, $.string, $.number),
reserved_identifier: $ => choice('get', 'set', 'async'),
_line_break: $ => '\n'
>>>>>>>
_property_name: $ => choice($.identifier, $.reserved_identifier, $.string, $.number),
reserved_identifier: $ => choice('get', 'set', 'async') |
<<<<<<<
return 'robot.placeMarker()\n'
=======
return 'placeMarker()\n'
}
Blockly.JavaScript.collect_resource = function (block) {
return 'collectResource()\n'
>>>>>>>
return 'robot.placeMarker()\n'
}
Blockly.JavaScript.collect_resource = function (block) {
return 'collectResource()\n' |
<<<<<<<
"sign_in_with_ledger":"LEDGER",
=======
"TRC20_under_maintenance":"TRC20 under maintenance",
"transaction_fewer_than_100000":"1. When there are fewer than 100,000 (including 100,000) transaction data entries, all the data will be displayed.",
"transaction_more_than_100000":"2. When there are more than 100,000 transaction data entries, data of the latest 7 days will be displayed. ",
>>>>>>>
"sign_in_with_ledger":"LEDGER",
"TRC20_under_maintenance":"TRC20 under maintenance",
"transaction_fewer_than_100000":"1. When there are fewer than 100,000 (including 100,000) transaction data entries, all the data will be displayed.",
"transaction_more_than_100000":"2. When there are more than 100,000 transaction data entries, data of the latest 7 days will be displayed. ", |
<<<<<<<
/*! iFrame Resizer (iframeSizer.min.js ) - v2.1.0 - 2014-04-14
=======
/*! iFrame Resizer (iframeSizer.min.js ) - v2.2.3 - 2014-04-07
>>>>>>>
/*! iFrame Resizer (iframeSizer.min.js ) - v2.2.3 - 2014-04-14 |
<<<<<<<
fill_a_valid_ledger_note:'Please confirm that the Transactions Data option in the ledger settings is allowed, otherwise you cannot send notes',
enter_up_to_50_characters:'Enter up to 50 characters',
=======
address_token_less_than_10:'tokens with a value less than 10 TRX',
address_total_tron_power:'Total TRON Power',
address_total_tron_power_remain:'Available TORN Power',
address_total_tron_power_used:'Used TRON Power'
>>>>>>>
fill_a_valid_ledger_note:'Please confirm that the Transactions Data option in the ledger settings is allowed, otherwise you cannot send notes',
enter_up_to_50_characters:'Enter up to 50 characters',
address_token_less_than_10:'tokens with a value less than 10 TRX',
address_total_tron_power:'Total TRON Power',
address_total_tron_power_remain:'Available TORN Power',
address_total_tron_power_used:'Used TRON Power' |
<<<<<<<
err.should.eql("jwt malformed");
=======
err.message.should.eql("Invalid token: no header in signature 'boooooo'");
err.code.should.eql("invalid_token");
>>>>>>>
err.should.eql("jwt malformed");
err.code.should.eql("invalid_token"); |
<<<<<<<
document.body.appendChild(node);
const htmlInlineScriptTemplate = new assetGraph.HtmlInlineScriptTemplate({
=======
document.head.appendChild(node);
var htmlInlineScriptTemplate = new assetGraph.HtmlInlineScriptTemplate({
>>>>>>>
document.head.appendChild(node);
const htmlInlineScriptTemplate = new assetGraph.HtmlInlineScriptTemplate({ |
<<<<<<<
// Fix up sources: [...] urls in source maps:
for (const relation of assetGraph.findRelations({
type: 'SourceMapSource',
from: { url: assetInfos.map(function (url) { return url.url; }) }
})) {
if (relation.href.startsWith('file:///') && !relation.href.startsWith(assetGraph.root)) {
// Probably a file from node_modules outside of assetGraph.root.
// Make it relative so that it points out of the webroot instead of
// ending up as an absolute file:// url:
relation.hrefType = 'relative';
} else if (relation.href.startsWith('file://webpack/')) {
// Some fake webpack url, eg. "webpack/bootstrap 5c89cbd3893270d2912a"
// that got file:// prepended due to devtoolFallbackModuleFilenameTemplate
// Strip the file:// prefix and make it relative so that it sort of
// looks like the webpack output:
relation.to.url = relation.to.url.replace('file', 'webpack');
relation.hrefType = 'relative';
} else {
relation.hrefType = 'rootRelative';
}
}
=======
// Fix up sources: [...] urls in source maps:
assetGraph.findRelations({
type: 'SourceMapSource',
from: { url: assetInfos.map(function (url) { return url.url; }) }
}, true).forEach(function (relation) {
if (relation.href.indexOf('file://webpack/') === 0) {
// Some fake webpack url, eg. "webpack/bootstrap 5c89cbd3893270d2912a"
// that got file:// prepended due to devtoolFallbackModuleFilenameTemplate
// Strip the file:// prefix and make it relative so that it sort of
// looks like the webpack output:
relation.to.url = relation.to.url.substr('file://'.length);
relation.hrefType = 'relative';
relation.refreshHref();
} else {
relation.hrefType = 'rootRelative';
}
});
>>>>>>>
// Fix up sources: [...] urls in source maps:
for (const relation of assetGraph.findRelations({
type: 'SourceMapSource',
from: { url: assetInfos.map(function (url) { return url.url; }) }
})) {
if (relation.href.startsWith('file://webpack/')) {
// Some fake webpack url, eg. "webpack/bootstrap 5c89cbd3893270d2912a"
// that got file:// prepended due to devtoolFallbackModuleFilenameTemplate
// Strip the file:// prefix and make it relative so that it sort of
// looks like the webpack output:
relation.to.url = relation.to.url.replace('file', 'webpack');
relation.hrefType = 'relative';
} else {
relation.hrefType = 'rootRelative';
}
} |
<<<<<<<
this._text = this.isFragment ? this._parseTree.innerHTML : jsdom.serializeDocument(this._parseTree);
=======
this._text = domtohtml.domToHtml(this._parseTree, !this.isPretty);
var templateReplacements = this._templateReplacements;
this._text = Object.keys(templateReplacements).reduce(function (text, key) {
return text.replace(key, templateReplacements[key]);
}, this._text);
>>>>>>>
this._text = this.isFragment ? this._parseTree.innerHTML : jsdom.serializeDocument(this._parseTree);
var templateReplacements = this._templateReplacements;
this._text = Object.keys(templateReplacements).reduce(function (text, key) {
return text.replace(key, templateReplacements[key]);
}, this._text);
<<<<<<<
var text = this.internalText;
var isFragment = this.isFragment;
var document;
=======
var text;
if (typeof this._text === 'string') {
text = this._text;
} else {
text = this._getTextFromRawSrc();
}
var templateReplacements = this._templateReplacements = {};
text = text.replace(/<([%\?])[^\1]*?\1>/g, function (match, sub1, offset) {
var key = 'โ' + offset + 'โ';
templateReplacements[key] = match;
return key;
});
var isEmpty = /^\s*$/.test(text);
>>>>>>>
var text;
if (typeof this._text === 'string') {
text = this._text;
} else {
text = this._getTextFromRawSrc();
}
var templateReplacements = this._templateReplacements = {};
text = text.replace(/<([%\?])[^\1]*?\1>/g, function (match, sub1, offset) {
var key = 'โ' + offset + 'โ';
templateReplacements[key] = match;
return key;
});
var isFragment = this.isFragment;
var document; |
<<<<<<<
addOutgoingRelation({
type: 'HtmlSvgIsland',
to: {
type: 'Svg',
=======
traverse = false;
addOutgoingRelation(new AssetGraph.HtmlSvgIsland({
from: this,
to: new AssetGraph.Svg({
>>>>>>>
traverse = false;
addOutgoingRelation({
type: 'HtmlSvgIsland',
to: {
type: 'Svg', |
<<<<<<<
HtmlConditionalComment: htmlConditionalComment => '<!--[if ' + htmlConditionalComment.condition + ']>',
=======
HtmlPreloadLink: '<link rel=preload>',
HtmlPrefetchLink: '<link rel=prefetch>',
HtmlPreconnectLink: '<link rel=preconnect>',
HtmlDnsPrefetchLink: '<link rel=dns-prefetch>',
HtmlPrerenderLink: '<link rel=prerender>',
HtmlConditionalComment: function (htmlConditionalComment) {
return '<!--[if ' + htmlConditionalComment.condition + ']>';
},
>>>>>>>
HtmlConditionalComment: htmlConditionalComment => '<!--[if ' + htmlConditionalComment.condition + ']>',
HtmlPreloadLink: '<link rel=preload>',
HtmlPrefetchLink: '<link rel=prefetch>',
HtmlPreconnectLink: '<link rel=preconnect>',
HtmlDnsPrefetchLink: '<link rel=dns-prefetch>',
HtmlPrerenderLink: '<link rel=prerender>',
<<<<<<<
return async function drawGraph(assetGraph) {
let dotSrc = 'digraph \"' + targetFileName.replace(/^.*\/|\.[^\/\.]*$/g, '') + '\" {\n';
let nextUniqueId = 1;
const seenNodes = {};
=======
return function drawGraph(assetGraph) {
var dotSrc = [
'digraph \"' + targetFileName.replace(/^.*\/|\.[^\/\.]*$/g, '') + '\" {\n',
'graph[rankdir=LR];',
'nodesep=0.1;',
'ranksep=0.0;'
].join('\n');
var nextUniqueId = 1;
var seenNodes = {};
>>>>>>>
return async function drawGraph(assetGraph) {
let dotSrc = [
'digraph \"' + targetFileName.replace(/^.*\/|\.[^\/\.]*$/g, '') + '\" {\n',
'graph[rankdir=LR];',
'nodesep=0.1;',
'ranksep=0.0;'
].join('\n');
let nextUniqueId = 1;
const seenNodes = {};
<<<<<<<
' style = filled;\n' +
' color = lightgrey;\n' +
' label = "' + path + '";\n' +
'\n' +
assetsByPath[path].map(asset =>
' ' + asset.id + ' [style = ' + (asset.isLoaded ? 'solid' : 'dashed') + ', label = "' +
(asset.url ? Path.basename(asset.url) : 'i:' + asset).replace(/"/g, '\\"') + '"];\n'
).join('') +
(transitionStringsByPath[path] || []).map(transitionString =>
' ' + transitionString + '\n'
).join('') +
=======
' style = filled;\n' +
' color = lightgrey;\n' +
' label = "' + path.replace(assetGraph.root, '/') + '";\n' +
'\n' +
assetsByPath[path].map(function (asset) {
return ' ' + asset.id + ' [style = ' + (asset.isLoaded ? 'solid' : 'dashed') + ', label = "' + (asset.url ? Path.basename(asset.url) : 'i:' + asset).replace(/"/g, '\\"') + '"];\n';
}).join('') +
(transitionStringsByPath[path] || []).map(function (transitionString) {
return ' ' + transitionString + '\n';
}).join('') +
>>>>>>>
' style = filled;\n' +
' color = lightgrey;\n' +
' label = "' + path.replace(assetGraph.root, '/') + '";\n' +
'\n' +
assetsByPath[path].map(asset =>
' ' + asset.id + ' [style = ' + (asset.isLoaded ? 'solid' : 'dashed') + ', label = "' +
(asset.url ? Path.basename(asset.url) : 'i:' + asset).replace(/"/g, '\\"') + '"];\n'
).join('') +
(transitionStringsByPath[path] || []).map(transitionString =>
' ' + transitionString + '\n'
).join('') + |
<<<<<<<
import './table.scss'
import moment from 'moment'
const DEFAULT_FILTER_NUMBER = 5
const DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss'
=======
import "./table.scss";
import moment from "moment";
const DEFAULT_FILTER_NUMBER = 5;
const DATE_FORMAT = "YYYY-MM-DD HH:mm:ss";
const MIN_WIDTH = 130;
>>>>>>>
import './table.scss'
import moment from 'moment'
const DEFAULT_FILTER_NUMBER = 5
const DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss'
const MIN_WIDTH = 130
<<<<<<<
showedColumns: []
}
=======
showedColumns: [],
columns: []
};
>>>>>>>
showedColumns: [],
columns: []
}
<<<<<<<
calColumn () {
=======
onColResize(newWidth, oldWidth, column, event) {
let cols = [...this.columns];
cols.find(x => x.key === column.key).width = newWidth;
this.columns = cols;
},
calColumn() {
>>>>>>>
onColResize (newWidth, oldWidth, column, event) {
let cols = [...this.columns]
cols.find(x => x.key === column.key).width = newWidth
this.columns = cols
},
calColumn () {
<<<<<<<
return 0
}
this.columns = this.tableColumns
=======
return 0;
};
const columns = this.tableColumns
>>>>>>>
return 0
}
const columns = this.tableColumns
<<<<<<<
.sort(compare)
.map(_ => {
if (_.children) {
return {
..._,
children: _.children
.filter(_ => _.isDisplayed || _.displaySeqNo)
.sort(compare)
.map(j => {
return this.renderCol(j)
})
}
} else {
return this.renderCol(_)
}
})
=======
.sort(compare);
const tableWidth = this.$refs.table
? this.$refs.table.$el.clientWidth
: 1000; // ่ทๅtableๅฎฝๅบฆ๏ผ้ป่ฎคๅผ1000
const colLength = columns.length; // ่ทๅไผ ๅ
ฅๅฑ็คบ็column้ฟๅบฆ
this.colWidth = Math.floor(tableWidth / colLength);
this.columns = columns.map((_, idx) => {
const isLast = colLength - 1 === idx;
if (_.children) {
const children = _.children
.filter(_ => _.isDisplayed || _.displaySeqNo)
.sort(compare);
return {
..._,
children: children.map((j, index) => {
const isChildLast = isLast && children.length - 1 === index;
return this.renderCol(j, isChildLast);
})
};
} else {
return this.renderCol(_, isLast);
}
});
>>>>>>>
.sort(compare)
const tableWidth = this.$refs.table
? this.$refs.table.$el.clientWidth
: 1000 // ่ทๅtableๅฎฝๅบฆ๏ผ้ป่ฎคๅผ1000
const colLength = columns.length // ่ทๅไผ ๅ
ฅๅฑ็คบ็column้ฟๅบฆ
this.colWidth = Math.floor(tableWidth / colLength)
this.columns = columns.map((_, idx) => {
const isLast = colLength - 1 === idx
if (_.children) {
const children = _.children
.filter(_ => _.isDisplayed || _.displaySeqNo)
.sort(compare)
return {
..._,
children: children.map((j, index) => {
const isChildLast = isLast && children.length - 1 === index
return this.renderCol(j, isChildLast)
})
}
} else {
return this.renderCol(_, isLast)
}
})
<<<<<<<
renderCol (col) {
=======
renderCol(col, isLastCol = false) {
>>>>>>>
renderCol (col, isLastCol = false) {
<<<<<<<
minWidth: 130,
sortable: this.isSortable ? 'custom' : false,
=======
minWidth: MIN_WIDTH,
width: isLastCol
? null
: this.colWidth < MIN_WIDTH
? MIN_WIDTH
: this.colWidth, // ้คๆๅไธๅ๏ผ้ฝๅ ไธ้ป่ฎคๅฎฝๅบฆ๏ผ็ญๅฎฝ
resizable: !isLastCol, // ้คๆๅไธๅ๏ผ่ฏฅๅฑๆง้ฝไธบtrue
sortable: this.isSortable ? "custom" : false,
>>>>>>>
minWidth: MIN_WIDTH,
width: isLastCol
? null
: this.colWidth < MIN_WIDTH
? MIN_WIDTH
: this.colWidth, // ้คๆๅไธๅ๏ผ้ฝๅ ไธ้ป่ฎคๅฎฝๅบฆ๏ผ็ญๅฎฝ
resizable: !isLastCol, // ้คๆๅไธๅ๏ผ่ฏฅๅฑๆง้ฝไธบtrue
sortable: this.isSortable ? 'custom' : false, |
<<<<<<<
"trc20_history":"Trade History",
"trc20_register":"ไบคๆๅงๆ",
=======
"trc20_hot":"Hot",
"trc20_top_Volume":"Top Volume",
"trc20_top_Rising":"Top Rising",
>>>>>>>
"trc20_history":"Trade History",
"trc20_register":"ไบคๆๅงๆ",
"trc20_hot":"Hot",
"trc20_top_Volume":"Top Volume",
"trc20_top_Rising":"Top Rising", |
<<<<<<<
'text!/api/specs/raw'], function ($, module, data) {
=======
fileTreeJson
], function ($, module, data) {
'use strict';
>>>>>>>
'text!/api/specs/raw'
], function ($, module, data) {
<<<<<<<
var returnObject = function(returnedTreeObj, excludeRootDocument) {
var isSingle = false;
if (getSpecificCat.indexOf('specFile') === -1) {
for (innerCat in returnedTreeObj) {
if ( checkCatInfo(returnedTreeObj[innerCat], innerCat, getCatInfo) ) {
if (innerCat == 'specFile' && (!excludeRootDocument)) {
fileTree[innerCat] = {};
fileTree[innerCat]['specFile'] = returnedTreeObj[innerCat];
} else {
fileTree[innerCat] = returnedTreeObj[innerCat];
}
}
}
} else {
fileTree['specFile'] = {};
fileTree['specFile']['specFile'] = returnedTreeObj;
isSingle = true;
}
return isSingle;
};
=======
>>>>>>>
<<<<<<<
for (var i = 0; i < getSpecificCatArr.length; i++) {
if (checkCat(currentCheckCat, getSpecificCatArr[i])) {
currentCheckCat = getSpecificCatArr[i+1];
=======
for (var j = 0; j < getSpecificCatArr.length; j++) {
if (_this.checkCat(currentCheckCat, getSpecificCatArr[j])) {
currentCheckCat = getSpecificCatArr[j + 1];
>>>>>>>
for (var j = 0; j < getSpecificCatArr.length; j++) {
if (_this.checkCat(currentCheckCat, getSpecificCatArr[j])) {
currentCheckCat = getSpecificCatArr[j + 1];
<<<<<<<
var checkCat = function (currentCat, getSpecificCat, toCheckCat) {
var getSpecificCat = getSpecificCat,
currentCat = currentCat,
toCheckCat = toCheckCat;
=======
ParseFileTree.prototype.checkCat = function (currentCat, getSpecificCat, toCheckCat) {
>>>>>>>
ParseFileTree.prototype.checkCat = function (currentCat, getSpecificCat, toCheckCat) {
<<<<<<<
if (typeof tree[folder] === 'object') {
if ( !checkCatInfo(tree[folder]) ) {
=======
if (typeof tree[folder] === 'object') {
if ( !_this.checkCatInfo(tree[folder]) ) {
>>>>>>>
if (typeof tree[folder] === 'object') {
if ( !_this.checkCatInfo(tree[folder]) ) { |
<<<<<<<
export async function onDragReady(message) {
//console.log('onDragReady', message);
Selections.dragSelection.undeterminedRange = {};
Selections.selection.targetWindow = message.window;
Selections.dragSelection.dragEnteredCount = 1;
Selections.dragSelection.willCloseSelectedTabs = message.startOnClosebox;
Selections.dragSelection.pendingTabs = null;
Selections.dragSelection.dragStartTarget = Selections.dragSelection.firstHoverTarget = Selections.dragSelection.lastHoverTarget = message.tab;
Selections.dragSelection.allTabsOnDragReady = (await browser.tabs.query({ windowId: message.window })).map(TabIdFixer.fixTab);
Commands.clearSelection({
=======
export async function onTabItemDragReady(message) {
//console.log('onTabItemDragReady', message);
mDragSelection.undeterminedRange = {};
Selection.setTargetWindow(message.window);
mDragSelection.dragEnteredCount = 1;
mDragSelection.willCloseSelectedTabs = message.startOnClosebox;
mDragSelection.pendingTabs = null;
mDragSelection.dragStartTarget = mDragSelection.firstHoverTarget = mDragSelection.lastHoverTarget = message.tab;
mDragSelection.allTabsOnDragReady = (await browser.tabs.query({ windowId: message.window })).map(TabIdFixer.fixTab);
Selection.clear({
>>>>>>>
export async function onDragReady(message) {
//console.log('onDragReady', message);
mDragSelection.undeterminedRange = {};
Selection.setTargetWindow(message.window);
mDragSelection.dragEnteredCount = 1;
mDragSelection.willCloseSelectedTabs = message.startOnClosebox;
mDragSelection.pendingTabs = null;
mDragSelection.dragStartTarget = mDragSelection.firstHoverTarget = mDragSelection.lastHoverTarget = message.tab;
mDragSelection.allTabsOnDragReady = (await browser.tabs.query({ windowId: message.window })).map(TabIdFixer.fixTab);
Selection.clear({
<<<<<<<
export async function onDragCancel(message) {
//console.log('onDragCancel', message);
if (Object.keys(Selections.selection.tabs).length > 0) {
=======
export async function onTabItemDragCancel(message) {
//console.log('onTabItemDragCancel', message);
if (Selection.has()) {
>>>>>>>
export async function onDragCancel(message) {
//console.log('onDragCancel', message);
if (Selection.has()) {
<<<<<<<
export async function onDragEnter(message) {
//console.log('onDragEnter', message, message.tab == Selections.dragSelection.lastHoverTarget);
Selections.dragSelection.dragEnteredCount++;
=======
export async function onTabItemDragEnter(message) {
//console.log('onTabItemDragEnter', message, message.tab == mDragSelection.lastHoverTarget);
mDragSelection.dragEnteredCount++;
>>>>>>>
export async function onDragEnter(message) {
//console.log('onDragEnter', message, message.tab == mDragSelection.lastHoverTarget);
mDragSelection.dragEnteredCount++;
<<<<<<<
export async function onDragExit(_message) {
Selections.dragSelection.dragEnteredCount--;
=======
export async function onTabItemDragExit(_message) {
mDragSelection.dragEnteredCount--;
>>>>>>>
export async function onDragExit(_message) {
mDragSelection.dragEnteredCount--; |
<<<<<<<
// control
=======
// controls
var controlWidth = browser.controlPanelWidth ? browser.controlPanelWidth : 50;
>>>>>>>
// controls
var controlWidth = browser.controlPanelWidth ? browser.controlPanelWidth : 50;
<<<<<<<
viewportDiv.style.height = track.height + "px";
viewportDiv.style.left = controlDiv.clientWidth + "px";
=======
viewportDiv.style.left = controlDiv.style.width;
viewportDiv.style.height = viewportHeight + "px";
trackDiv.appendChild(viewportDiv);
>>>>>>>
viewportDiv.style.left = controlDiv.clientWidth + "px";
viewportDiv.style.height = track.height + "px";
trackDiv.appendChild(viewportDiv);
<<<<<<<
contentDiv.appendChild(closeButton);
closeButton.className = "fa fa-times-circle igv-track-disable-button-fontawesome";
=======
closeButton.className = "fa fa-times-circle";
closeButton.style.color = "#222";
closeButton.style.position = "absolute";
closeButton.style.top = "8px";
closeButton.style.right = "12px";
closeButton.style.cursor = "pointer";
>>>>>>>
contentDiv.appendChild(closeButton);
closeButton.className = "fa fa-times-circle igv-track-disable-button-fontawesome"; |
<<<<<<<
function preserveOrder(list, dictionary, indexDictionary) {
var orderedList;
orderedList = Array(Object.keys(dictionary).length);
list.forEach(function (g) {
var key,
index;
key = g.locusSearchString;
index = indexDictionary[ key ];
orderedList[ index ] = g;
});
return orderedList;
// return list;
}
=======
function preserveOrder(list, dictionary, indexDictionary) {
var orderedList;
orderedList = Array(Object.keys(dictionary).length);
list.forEach(function (g) {
var key,
index;
key = g.locusSearchString;
index = indexDictionary[ key ];
orderedList[ index ] = g;
});
// return result;
return orderedList;
}
>>>>>>>
function preserveOrder(list, dictionary, indexDictionary) {
var orderedList;
orderedList = Array(Object.keys(dictionary).length);
list.forEach(function (g) {
var key,
index;
key = g.locusSearchString;
index = indexDictionary[ key ];
orderedList[ index ] = g;
});
return orderedList;
} |
<<<<<<<
import {Client} from "../../../services/api";
import { Collapse, Input, Form, Select } from 'antd';
=======
import { Collapse, Input, Form, Select } from "antd";
>>>>>>>
import { Client } from "../../../services/api";
import { Collapse, Input, Form, Select } from 'antd';
<<<<<<<
import JSONTree from 'react-json-tree'
import SendMultiModal from "../../common/MultiModal/SendModal";
import { transactionMultiResultManager } from "../../../utils/tron"
import xhr from "axios";
=======
import JSONTree from "react-json-tree";
import MonacoEditor from "react-monaco-editor";
>>>>>>>
import JSONTree from 'react-json-tree'
import SendMultiModal from "../../common/MultiModal/SendModal";
import { transactionMultiResultManager } from "../../../utils/tron"
import xhr from "axios";
import MonacoEditor from "react-monaco-editor";
<<<<<<<
tokenId: '',
totalValue: 0,
code:111
=======
tokenId: "",
totalValue: ""
>>>>>>>
tokenId: '',
totalValue: 0,
code:111
<<<<<<<
if ( account.isLoggedIn ) {
let addressHex = tronWeb.address.toHex(address);
let initContract = await tronWeb.contract([contractItem], addressHex)
this.setState({
contract: initContract
}, () => {
=======
if (account.isLoggedIn) {
let addressHex = tronWeb.address.toHex(address);
>>>>>>>
if (account.isLoggedIn) {
let addressHex = tronWeb.address.toHex(address);
<<<<<<<
hideModal = () => {
this.setState({modal: null});
};
MultiSendModal = () => {
let {code} = this.state;
console.log('code',code)
this.setState({
modal: (
<SendMultiModal code={code} onClose={this.hideModal} onMultiSignSend={(permissionId, permissionTime, from) => this.MultiSend(permissionId, permissionTime, from)}/>
)
});
};
Mul (arg1, arg2) {
let r1 = arg1.toString(), r2 = arg2.toString(), m, resultVal, d = arguments[2];
m = (r1.split(".")[1] ? r1.split(".")[1].length : 0) + (r2.split(".")[1] ? r2.split(".")[1].length : 0);
resultVal = Number(r1.replace(".", "")) * Number(r2.replace(".", "")) / Math.pow(10, m);
return typeof d !== "number" ? Number(resultVal) : Number(resultVal.toFixed(parseInt(d)));
=======
Mul(arg1, arg2) {
let r1 = arg1.toString(),
r2 = arg2.toString(),
m,
resultVal,
d = arguments[2];
m =
(r1.split(".")[1] ? r1.split(".")[1].length : 0) +
(r2.split(".")[1] ? r2.split(".")[1].length : 0);
resultVal =
(Number(r1.replace(".", "")) * Number(r2.replace(".", ""))) /
Math.pow(10, m);
return typeof d !== "number"
? Number(resultVal)
: Number(resultVal.toFixed(parseInt(d)));
>>>>>>>
hideModal = () => {
this.setState({modal: null});
};
MultiSendModal = () => {
let {code} = this.state;
console.log('code',code)
this.setState({
modal: (
<SendMultiModal code={code} onClose={this.hideModal} onMultiSignSend={(permissionId, permissionTime, from) => this.MultiSend(permissionId, permissionTime, from)}/>
)
});
};
Mul (arg1, arg2) {
let r1 = arg1.toString(), r2 = arg2.toString(), m, resultVal, d = arguments[2];
m = (r1.split(".")[1] ? r1.split(".")[1].length : 0) + (r2.split(".")[1] ? r2.split(".")[1].length : 0);
resultVal = Number(r1.replace(".", "")) * Number(r2.replace(".", "")) / Math.pow(10, m);
return typeof d !== "number" ? Number(resultVal) : Number(resultVal.toFixed(parseInt(d)));
<<<<<<<
if (!tokenId || tokenId == '_') {
options = { callValue: this.Mul(totalValue,Math.pow(10, sendTokenDecimals)) };
} else {
options = {
tokenId: tokenId,
tokenValue: this.Mul(totalValue,Math.pow(10, sendTokenDecimals))
};
}
console.log('options',options)
=======
if (!tokenId || tokenId == "_") {
options = {
callValue: this.Mul(totalValue, Math.pow(10, sendTokenDecimals))
};
} else {
options = {
tokenId: tokenId,
tokenValue: this.Mul(totalValue, Math.pow(10, sendTokenDecimals))
};
}
>>>>>>>
if (!tokenId || tokenId == "_") {
options = {
callValue: this.Mul(totalValue, Math.pow(10, sendTokenDecimals))
};
} else {
options = {
tokenId: tokenId,
tokenValue: this.Mul(totalValue, Math.pow(10, sendTokenDecimals))
};
}
<<<<<<<
).send(options)
=======
).send(options);
>>>>>>>
).send(options);
<<<<<<<
<div className="d-flex">
<div className="search-btn" onClick={() => this.Send()}>Send</div>
<div className="search-btn ml-5" onClick={() => this.MultiSendModal()}>Multi Send</div>
</div>
{
result && <JSONTree data={result} theme={theme} invertTheme={true} hide/>
}
=======
<div className="search-btn" onClick={() => this.Send()}>
Send
</div>
{result && (
<JSONTree data={result} theme={theme} invertTheme={true} hide />
)}
>>>>>>>
<div className="d-flex">
<div className="search-btn" onClick={() => this.Send()}>Send</div>
<div className="search-btn ml-5" onClick={() => this.MultiSendModal()}>Multi Send</div>
</div>
{
result && <JSONTree data={result} theme={theme} invertTheme={true} hide/>
}
<<<<<<<
<div className="d-flex">
<div className="search-btn" onClick={() => this.MultiSend()}>Send</div>
<div className="search-btn ml-2" onClick={() => this.MultiSendModal()}>Multi Send</div>
</div>
{
result && <JSONTree data={result} theme={theme} invertTheme={true}/>
}
=======
<div className="search-btn" onClick={() => this.Send()}>
Send
</div>
{result && (
<JSONTree data={result} theme={theme} invertTheme={true} />
)}
>>>>>>>
<div className="d-flex">
<div className="search-btn" onClick={() => this.MultiSend()}>Send</div>
<div className="search-btn ml-2" onClick={() => this.MultiSendModal()}>Multi Send</div>
</div>
{
result && <JSONTree data={result} theme={theme} invertTheme={true}/>
} |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.