conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
<nav className={ this.classes }>
=======
<div className={ this.classes } { ...tagComponent('menu', this.props) }>
>>>>>>>
<nav className={ this.classes } { ...tagComponent('menu', this.props) }> |
<<<<<<<
didDrop: PropTypes.func,
};
=======
/**
* @private
* @ignore
*/
didDrop: PropTypes.func
}
>>>>>>>
/**
* @private
* @ignore
*/
didDrop: PropTypes.func,
}; |
<<<<<<<
// Demonology Azerite traits and effects
DEMONIC_METEOR: {
id: 278737,
name: 'Demonic Meteor',
icon: 'ability_warlock_handofguldan',
},
=======
UMBRAL_BLAZE: {
id: 273523,
name: 'Umbral Blaze',
icon: 'ability_warlock_everlastingaffliction',
},
UMBRAL_BLAZE_DEBUFF: {
id: 273526,
name: 'Umbral Blaze',
icon: 'ability_warlock_everlastingaffliction',
},
>>>>>>>
// Demonology Azerite traits and effects
DEMONIC_METEOR: {
id: 278737,
name: 'Demonic Meteor',
icon: 'ability_warlock_handofguldan',
},
UMBRAL_BLAZE: {
id: 273523,
name: 'Umbral Blaze',
icon: 'ability_warlock_everlastingaffliction',
},
UMBRAL_BLAZE_DEBUFF: {
id: 273526,
name: 'Umbral Blaze',
icon: 'ability_warlock_everlastingaffliction',
}, |
<<<<<<<
MASTER_OF_SHADOWS: {
id: 252091,
name: 'Master of Shadows',
icon: 'spell_shadow_shadesofdarkness',
},
LIGHT_SPEED: {
id: 252088,
name: 'Light Speed',
icon: 'ability_rogue_sprint',
},
=======
FEEDBACK_LOOP: {
id: 253269,
name: 'Feedback Loop',
icon: 'spell_holy_dispelmagic',
},
>>>>>>>
MASTER_OF_SHADOWS: {
id: 252091,
name: 'Master of Shadows',
icon: 'spell_shadow_shadesofdarkness',
},
LIGHT_SPEED: {
id: 252088,
name: 'Light Speed',
icon: 'ability_rogue_sprint',
FEEDBACK_LOOP: {
id: 253269,
name: 'Feedback Loop',
icon: 'spell_holy_dispelmagic',
}, |
<<<<<<<
this.state.open && (
<Portal>
<div { ...tagComponent('flash', this.props) }>
<div className={ this.classes }>
<CSSTransitionGroup
transitionAppear
transitionAppearTimeout={ 500 }
transitionName='carbon-flash__slider'
transitionEnterTimeout={ 600 }
transitionLeave
transitionLeaveTimeout={ 600 }
>
{ sliderHTML }
<CSSTransitionGroup
component='div'
transitionName='carbon-flash__content'
transitionEnterTimeout={ 200 }
transitionLeave
transitionLeaveTimeout={ 600 }
>
{ flashHTML }
</CSSTransitionGroup>
</CSSTransitionGroup>
</div>
{ this.dialogs }
</div>
</Portal>
)
=======
<div { ...tagComponent('flash', this.props) }>
<div className={ this.classes }>
<CSSTransitionGroup
component='div'
transitionName='carbon-flash__slider'
transitionEnterTimeout={ 600 }
transitionLeaveTimeout={ 600 }
>
{ sliderHTML }
<CSSTransitionGroup
component='div'
transitionName='carbon-flash__content'
transitionEnterTimeout={ 800 }
transitionLeaveTimeout={ 500 }
>
{ flashHTML }
</CSSTransitionGroup>
</CSSTransitionGroup>
</div>
{ this.dialogs }
</div>
>>>>>>>
this.state.open && (
<Portal>
<div { ...tagComponent('flash', this.props) }>
<div className={ this.classes }>
<CSSTransitionGroup
component='div'
transitionAppear
transitionAppearTimeout={ 500 }
transitionName='carbon-flash__slider'
transitionEnterTimeout={ 600 }
transitionLeave
transitionLeaveTimeout={ 600 }
>
{ sliderHTML }
<CSSTransitionGroup
component='div'
transitionName='carbon-flash__content'
transitionEnterTimeout={ 200 }
transitionLeave
transitionLeaveTimeout={ 600 }
>
{ flashHTML }
</CSSTransitionGroup>
</CSSTransitionGroup>
</div>
{ this.dialogs }
</div>
</Portal>
) |
<<<<<<<
import getDocGenInfo from '../../../utils/helpers/docgen-info';
Form.__docgenInfo = getDocGenInfo(
require('./docgenInfo.json'),
/form\.component/
);
=======
import Button from '../../../components/button';
import Link from '../../../components/link';
const additionalFormActions = (innerText) => {
return {
Button: <Button>{ innerText }</Button>,
Link: <Link href='./?path=/story/experimental-form--default'>{ innerText }</Link>
};
};
>>>>>>>
import Button from '../../../components/button';
import Link from '../../../components/link';
import getDocGenInfo from '../../../utils/helpers/docgen-info';
Form.__docgenInfo = getDocGenInfo(
require('./docgenInfo.json'),
/form\.component/
);
const additionalFormActions = (innerText) => {
return {
Button: <Button>{ innerText }</Button>,
Link: <Link href='./?path=/story/experimental-form--default'>{ innerText }</Link>
};
}; |
<<<<<<<
import guid from '../../../utils/helpers/guid';
import FormField from '../form-field';
=======
import { InputGroupBehaviour } from '../../../__internal__/input-behaviour';
>>>>>>>
import guid from '../../../utils/helpers/guid';
import FormField from '../form-field';
import { InputGroupBehaviour } from '../../../__internal__/input-behaviour';
<<<<<<<
<FormField
label={ label }
useValidationIcon={ validationOnLabel }
id={ uniqueId }
error={ error }
warning={ warning }
info={ info }
labelInline={ labelInline }
labelWidth={ labelWidth }
labelAlign={ labelAlign }
labelHelp={ labelHelp }
fieldHelp={ fieldHelp }
>
<StyledNumeralDate
name={ name }
onBlur={ handleBlur }
onKeyPress={ onKeyPress }
data-component='numeral-date'
>
{
dateFormat.map((datePart, index) => {
const isEnd = index === dateFormat.length - 1;
const isMiddle = index === 1;
return (
<StyledDateField
key={ datePart }
isYearInput={ datePart.length === 4 }
isMiddle={ isMiddle }
isEnd={ isEnd }
hasValidationIcon={ typeof (error || warning || info) === 'string' }
>
<Textbox
{ ...(index === 0 && { id: uniqueId }) }
placeholder={ datePart }
value={ dateValue[datePart] }
onChange={ e => handleChange(e, datePart) }
onBlur={ handleBlur }
error={ !!error }
warning={ !!warning }
info={ !!info }
{
...(isEnd && !validationOnLabel && {
error,
warning,
info
})
}
/>
</StyledDateField>
);
})
}
</StyledNumeralDate>
</FormField>
=======
<InputGroupBehaviour>
<StyledNumeralDate
name={ name }
id={ id }
isActive={ isActive }
onBlur={ handleBlur }
onKeyPress={ onKeyPress }
onFocus={ handleOnFocus }
data-component='numeral-date'
>
{
dateFormat.map((datePart, textboxNumber) => {
const isEnd = textboxNumber === dateFormat.length - 1;
return (
<StyledDateField
key={ datePart }
isYearInput={ datePart.length === 4 }
isMiddle={ textboxNumber === 1 }
isEnd={ isEnd }
hasValidationIcon={ error || warning || info }
twoPartDate={ textboxNumber <= 1 }
dateFormatLength={ dateFormat.length }
>
<Textbox
placeholder={ datePart }
value={ dateValue[datePart] }
onChange={ e => handleChange(e, datePart) }
onBlur={ handleBlur }
error={ !!error }
warning={ !!warning }
info={ !!info }
{
...(isEnd && {
error,
warning,
info
})
}
/>
</StyledDateField>
);
})
}
</StyledNumeralDate>
</InputGroupBehaviour>
>>>>>>>
<InputGroupBehaviour>
<FormField
label={ label }
useValidationIcon={ validationOnLabel }
id={ uniqueId }
error={ error }
warning={ warning }
info={ info }
labelInline={ labelInline }
labelWidth={ labelWidth }
labelAlign={ labelAlign }
labelHelp={ labelHelp }
fieldHelp={ fieldHelp }
>
<StyledNumeralDate
name={ name }
onBlur={ handleBlur }
onKeyPress={ onKeyPress }
data-component='numeral-date'
>
{
dateFormat.map((datePart, index) => {
const isEnd = index === dateFormat.length - 1;
const isMiddle = index === 1;
return (
<StyledDateField
key={ datePart }
isYearInput={ datePart.length === 4 }
isMiddle={ isMiddle }
isEnd={ isEnd }
hasValidationIcon={ typeof (error || warning || info) === 'string' }
>
<Textbox
{ ...(index === 0 && { id: uniqueId }) }
placeholder={ datePart }
value={ dateValue[datePart] }
onChange={ e => handleChange(e, datePart) }
onBlur={ handleBlur }
error={ !!error }
warning={ !!warning }
info={ !!info }
{
...(isEnd && !validationOnLabel && {
error,
warning,
info
})
}
/>
</StyledDateField>
);
})
}
</StyledNumeralDate>
</FormField>
</InputGroupBehaviour> |
<<<<<<<
import Spinner from '../spinner';
import Button from '../button/button.component';
=======
import Spinner from '../../__deprecated__/components/spinner';
import { OriginalButton } from '../button/button.component';
>>>>>>>
import Button from '../button';
import Spinner from '../../__deprecated__/components/spinner';
<<<<<<<
if (isInsideButton) {
return (
<Button buttonType='primary' disabled={ !isActive }>
<Loader
size={ size } isInsideButton={ isInsideButton }
isActive={ isActive }
/>
</Button>
);
}
return <Loader size={ size } style={ styles } />;
},
{
info: {
text: info,
propTablesExclude: [Button]
},
notes: { markdown: notes }
=======
if (isInsideButton) {
return (
<OriginalButton buttonType='primary' disabled={ !isActive }>
<Loader
size={ size } isInsideButton={ isInsideButton }
isActive={ isActive }
/>
</OriginalButton>
);
>>>>>>>
if (isInsideButton) {
return (
<Button buttonType='primary' disabled={ !isActive }>
<Loader
size={ size } isInsideButton={ isInsideButton }
isActive={ isActive }
/>
</Button>
); |
<<<<<<<
'Atlassian Jira': { cats: { 1: 13 }, env: /^jira$/i, html: /Powered by <a href=.http:\/\/www\.atlassian\.com\/software\/jira/i, implies: [ 'Java' ] },
=======
'Atlassian Jira': { cats: { 1: 13 }, html: /Powered by <a href=.http:\/\/www\.atlassian\.com\/software\/jira/i },
'Alloy': { cats: { 1: 12 }, env: /^AUI$/ },
>>>>>>>
'Atlassian Jira': { cats: { 1: 13 }, env: /^jira$/i, html: /Powered by <a href=.http:\/\/www\.atlassian\.com\/software\/jira/i, implies: [ 'Java' ] },
'Alloy': { cats: { 1: 12 }, env: /^AUI$/ },
<<<<<<<
'OpenLayers': { cats: { 1: 5 }, script: /openlayers/, env:/^OpenLayers$/ },
'Open Web Analytics': { cats: { 1: 10 }, html: /<!-- (Start|End) Open Web Analytics Tracker -->/, env: /^_?owa_/i },
=======
'OpenLayers': { cats: { 1: 5 }, script: /openlayers/, env:/^OpenLayers$/ },
>>>>>>>
'OpenLayers': { cats: { 1: 5 }, script: /openlayers/, env:/^OpenLayers$/ },
'Open Web Analytics': { cats: { 1: 10 }, html: /<!-- (Start|End) Open Web Analytics Tracker -->/, env: /^_?owa_/i }, |
<<<<<<<
change(date(2020, 10, 16), <>Added <SpellLink id={SPELLS.GREENSKINS_WICKERS.id} /> Legendary</>, [Tyndi]),
=======
change(date(2020, 10, 18), 'Converted legacy listeners to new event filters', Zeboot),
>>>>>>>
change(date(2020, 10, 18), 'Converted legacy listeners to new event filters', Zeboot),
change(date(2020, 10, 16), <>Added <SpellLink id={SPELLS.GREENSKINS_WICKERS.id} /> Legendary</>, [Tyndi]), |
<<<<<<<
function sendCachedResponse(request, response, cacheObject, toggle, duration) {
=======
function sendCachedResponse(request, response, cacheObject, toggle, next) {
>>>>>>>
function sendCachedResponse(request, response, cacheObject, toggle, next, duration) {
<<<<<<<
Object.assign(headers, filterBlacklistedHeaders(cacheObject.headers || {}), {
'apicache-store': globalOptions.redisClient ? 'redis' : 'memory',
'apicache-version': pkg.version,
// set properly-decremented max-age header. This ensures that max-age is in sync with the cache expiration.
'cache-control': 'max-age=' + ((duration/1000 - (new Date().getTime()/1000 - cacheObject.timestamp))).toFixed(0)
})
=======
Object.assign(headers, filterBlacklistedHeaders(cacheObject.headers || {}))
// only embed apicache headers when not in production environment
if (process.env.NODE_ENV !== 'production') {
Object.assign(headers, {
'apicache-store': globalOptions.redisClient ? 'redis' : 'memory',
'apicache-version': pkg.version
})
}
>>>>>>>
Object.assign(headers, filterBlacklistedHeaders(cacheObject.headers || {}), {
// set properly-decremented max-age header. This ensures that max-age is in sync with the cache expiration.
'cache-control': 'max-age=' + ((duration/1000 - (new Date().getTime()/1000 - cacheObject.timestamp))).toFixed(0)
})
// only embed apicache headers when not in production environment
if (process.env.NODE_ENV !== 'production') {
Object.assign(headers, {
'apicache-store': globalOptions.redisClient ? 'redis' : 'memory',
'apicache-version': pkg.version
})
}
<<<<<<<
return sendCachedResponse(req, res, cached, middlewareToggle, duration)
=======
return sendCachedResponse(req, res, cached, middlewareToggle, next)
>>>>>>>
return sendCachedResponse(req, res, cached, middlewareToggle, next, duration)
<<<<<<<
return sendCachedResponse(req, res, JSON.parse(obj.response), middlewareToggle, duration)
=======
return sendCachedResponse(req, res, JSON.parse(obj.response), middlewareToggle, next)
>>>>>>>
return sendCachedResponse(req, res, JSON.parse(obj.response), middlewareToggle, next, duration) |
<<<<<<<
change(date(2020, 9, 26), 'Added a new search option to the homepage to view a list of reports for a guild.', Dambroda),
=======
change(date(2020, 9, 26), 'Updated mana costs for all healers.', Abelito75),
change(date(2020, 9, 26), 'Updated abilities effiency tracker to default to 0 if no casts were possible.', Abelito75),
change(date(2020, 9, 22), 'Added holy power tracking for prot and holy paladin specs.', HolySchmidt),
change(date(2020, 9, 22), 'Updated search in Event tab to allow for multi-word searching in quotes.', Abelito75),
change(date(2020, 9, 22), 'Add some early checks to see if a player has a given conduit, soulbind or covenant.', Putro),
change(date(2020, 9, 22), 'Add some scripts for generating conduit information.', Putro),
>>>>>>>
change(date(2020, 9, 26), 'Added a new search option to the homepage to view a list of reports for a guild.', Dambroda),
change(date(2020, 9, 26), 'Updated mana costs for all healers.', Abelito75),
change(date(2020, 9, 26), 'Updated abilities effiency tracker to default to 0 if no casts were possible.', Abelito75),
change(date(2020, 9, 22), 'Added holy power tracking for prot and holy paladin specs.', HolySchmidt),
change(date(2020, 9, 22), 'Updated search in Event tab to allow for multi-word searching in quotes.', Abelito75),
change(date(2020, 9, 22), 'Add some early checks to see if a player has a given conduit, soulbind or covenant.', Putro),
change(date(2020, 9, 22), 'Add some scripts for generating conduit information.', Putro), |
<<<<<<<
import { Queues } from "/imports/api/queues/queues";
=======
import moment from 'moment';
import { Queues } from '/imports/api/queues/queues';
>>>>>>>
import moment from 'moment';
import { Queues } from "/imports/api/queues/queues";
<<<<<<<
Meteor.publish("queues.inRange", function inRange(
courseId,
startTime,
endTime
) {
if (
!Roles.userIsInRole(this.userId, ["admin", "mta", "hta", "ta"], courseId)
) {
throw new Meteor.Error(
"queues.inRange.unauthorized",
"Only TAs and above can get queues from a specified range."
);
=======
Meteor.publish('queues.recentlyEnded', function recentlyEnded() {
const cutoff = moment().subtract(5, 'minutes').toDate();
return Queues.find({ status: 'ended', endedAt: { $gt: cutoff } });
});
Meteor.publish('queues.inRange', function inRange(courseId, startTime, endTime) {
if (!Roles.userIsInRole(this.userId, ['admin', 'mta', 'hta', 'ta'], courseId)) {
throw new Meteor.Error('queues.inRange.unauthorized',
'Only TAs and above can get queues from a specified range.');
>>>>>>>
Meteor.publish('queues.recentlyEnded', function recentlyEnded() {
const cutoff = moment().subtract(5, 'minutes').toDate();
return Queues.find({ status: 'ended', endedAt: { $gt: cutoff } });
});
Meteor.publish("queues.inRange", function inRange(
courseId,
startTime,
endTime
) {
if (
!Roles.userIsInRole(this.userId, ["admin", "mta", "hta", "ta"], courseId)
) {
throw new Meteor.Error(
"queues.inRange.unauthorized",
"Only TAs and above can get queues from a specified range."
); |
<<<<<<<
import moment from 'moment';
import { Courses } from '/imports/api/courses/courses.js';
import { Locations } from '/imports/api/locations/locations.js';
import { Queues } from '/imports/api/queues/queues.js';
import { Sessions } from '/imports/api/sessions/sessions.js';
=======
import { Courses } from '/imports/api/courses/courses';
import { Locations } from '/imports/api/locations/locations';
import { Queues } from '/imports/api/queues/queues';
import { Sessions } from '/imports/api/sessions/sessions';
>>>>>>>
import moment from 'moment';
import { Courses } from '/imports/api/courses/courses';
import { Locations } from '/imports/api/locations/locations';
import { Queues } from '/imports/api/queues/queues';
import { Sessions } from '/imports/api/sessions/sessions'; |
<<<<<<<
import CharacterParses from './Character/CharacterParses';
import CharacterSelecter from './Character/CharacterSelecter';
=======
import Header from './Header';
>>>>>>>
import CharacterParses from './Character/CharacterParses';
import Header from './Header';
<<<<<<<
<header>
<div className="container image-overlay">
<div className="row">
<div className="col-lg-6 col-md-10">
<h1>WoW­Analyzer</h1>
<div className="description">
Analyze your raid logs to get personal suggestions and metrics to improve your performance.
</div>
<div className="tabs">
<span onClick={() => this.setState({ reportActive: true }) } className={ this.state.reportActive ? 'selected' : '' }>Report</span>
<span onClick={() => this.setState({ reportActive: false }) } className={ this.state.reportActive ? '' : 'selected' }>Character</span>
</div>
{this.showReportSelecter && this.state.reportActive && (
<ReportSelecter />
)}
{this.showReportSelecter && !this.state.reportActive && (
<CharacterSelecter />
)}
{process.env.NODE_ENV !== 'test' && <ServiceStatus style={{ marginBottom: 5 }} />}
<div className="about">
<Link to={makeNewsUrl(AboutArticleTitle)}>About WoWAnalyzer</Link>
{' '}| <Link to={makeNewsUrl(UnlistedLogsTitle)}>About unlisted logs</Link>
{' '}| <a href="https://discord.gg/AxphPxU">Join Discord</a>
{' '}| <a href="https://github.com/WoWAnalyzer/WoWAnalyzer">View source</a>
{' '}| <a href="https://www.patreon.com/wowanalyzer">Become a Patron</a>
{' '}| <a href="https://status.wowanalyzer.com/">Status</a>
</div>
</div>
</div>
</div>
</header>
=======
<Header showReportSelecter={this.showReportSelecter} />
>>>>>>>
<Header showReportSelecter={this.showReportSelecter} /> |
<<<<<<<
change(date(2019, 8, 4), 'General responsive improvements for better mobile experience.', Amrux),
=======
change(date(2019, 8, 6), <>Shows <SpellLink id={SPELLS.ABYSSAL_HEALING_POTION.id} /> in death recap now!</>, Abelito75),
>>>>>>>
change(date(2019, 8, 6), 'General responsive improvements for better mobile experience.', Amrux),
change(date(2019, 8, 6), <>Shows <SpellLink id={SPELLS.ABYSSAL_HEALING_POTION.id} /> in death recap now!</>, Abelito75), |
<<<<<<<
// Listen for Data Submitted by the User
var data = new Data(id);
self.$on('dataChange', function(index, value, label) {
data.collect(index, value, label);
});
self.$on('dataSave', function() {
data.save();
});
=======
self.$data.onDone = '/make/' + id + '/share';
>>>>>>>
self.$data.onDone = '/make/' + id + '/share';
// Listen for Data Submitted by the User
var data = new Data(id);
self.$on('dataChange', function(index, value, label) {
data.collect(index, value, label);
});
self.$on('dataSave', function() {
data.save();
}); |
<<<<<<<
$data.mainColorSelected = false;
=======
>>>>>>>
<<<<<<<
this.onSelect(colorGroups[i], true);
=======
this.selectFromGroup(colorGroups[i]);
this.$data.mode = 'group';
>>>>>>>
this.selectFromGroup(colorGroups[i]);
this.$data.mode = 'group'; |
<<<<<<<
* If set to true, Web Audio Inspector no longer tracks web audio calls so that
* AudioNodes can be GC-ed. This is desired when the user is not using developer
* tools.
*/
audion.entryPoints.audioUpdatesAreMissing_ = false;
/**
=======
* A reference to a native function that performs the logic of
* Function.prototype.bind([CONSTRUCTOR], arguments ...). We need this reference
* because we rely on using that logic to construct various objects, but some
* libraries such as prototype.js override the native bind and apply methods.
* @private {!Function}
*/
audion.entryPoints.nativeBindApplyMethod_ = Function.prototype.apply.bind(
Function.prototype.bind);
/**
>>>>>>>
* If set to true, Web Audio Inspector no longer tracks web audio calls so that
* AudioNodes can be GC-ed. This is desired when the user is not using developer
* tools.
*/
audion.entryPoints.audioUpdatesAreMissing_ = false;
* A reference to a native function that performs the logic of
* Function.prototype.bind([CONSTRUCTOR], arguments ...). We need this reference
* because we rely on using that logic to construct various objects, but some
* libraries such as prototype.js override the native bind and apply methods.
* @private {!Function}
*/
audion.entryPoints.nativeBindApplyMethod_ = Function.prototype.apply.bind(
Function.prototype.bind);
/**
<<<<<<<
if (audion.entryPoints.audioUpdatesAreMissing_) {
// The user would have to refresh to use Web Audio Inspector anyway. Let
// resources such as AudioNodes be GC-ed.
return newContext;
}
=======
>>>>>>>
if (audion.entryPoints.audioUpdatesAreMissing_) {
// The user would have to refresh to use Web Audio Inspector anyway. Let
// resources such as AudioNodes be GC-ed.
return newContext;
} |
<<<<<<<
* Applies a scale and a translation to the inner SVG element of the graph.
=======
* Handles a click event on the graph container.
*/
function handleClickOnGraphContainer() {
// Keep climbing the DOM tree til we hit an interesting element, ie a node.
var thingClickedOn = d3.event.target;
while (thingClickedOn && this != thingClickedOn) {
var data = d3.select(thingClickedOn).data();
if (!(data && data.length == 1)) {
// We do not know if the user clicked on something interesting yet.
continue;
}
var graphNodeId = data[0];
var node = audioGraph.node(graphNodeId);
if (node) {
// The user clicked on a node.
postToPanelWindow({
type: 'update_active_audio_node',
graphNodeId: graphNodeId
});
break;
}
thingClickedOn = thingClickedOn.parentElement;
}
}
/**
* The dev panel had updated the active AudioNode (the one being inspected).
* Take care of any changes.
* @param {!Object} message
*/
function handleAudioNodeUpdatedByDevPanel(message) {
if (message.audioNodeData) {
// The pane should highlight an AudioNode node.
paneController.highlightAudioNode(message.audioNodeData);
} else {
// The pane is highlighting no AudioNode. Hide it.
paneController.hidePane();
}
}
/**
* Applies a scale and a translate to the inner SVG element of the graph.
>>>>>>>
* Handles a click event on the graph container.
*/
function handleClickOnGraphContainer() {
// Keep climbing the DOM tree til we hit an interesting element, ie a node.
var thingClickedOn = d3.event.target;
while (thingClickedOn && this != thingClickedOn) {
var data = d3.select(thingClickedOn).data();
if (!(data && data.length == 1)) {
// We do not know if the user clicked on something interesting yet.
continue;
}
var graphNodeId = data[0];
var node = audioGraph.node(graphNodeId);
if (node) {
// The user clicked on a node.
postToPanelWindow({
type: 'update_active_audio_node',
graphNodeId: graphNodeId
});
break;
}
thingClickedOn = thingClickedOn.parentElement;
}
}
/**
* The dev panel had updated the active AudioNode (the one being inspected).
* Take care of any changes.
* @param {!Object} message
*/
function handleAudioNodeUpdatedByDevPanel(message) {
if (message.audioNodeData) {
// The pane should highlight an AudioNode node.
paneController.highlightAudioNode(message.audioNodeData);
} else {
// The pane is highlighting no AudioNode. Hide it.
paneController.hidePane();
}
}
/**
* Applies a scale and a translation to the inner SVG element of the graph. |
<<<<<<<
MERRIAM_WEBSTER_COLOR: '#375c71',
=======
OWLBOT_COLOR: '#82d2d4',
>>>>>>>
OWLBOT_COLOR: '#82d2d4',
MERRIAM_WEBSTER_COLOR: '#375c71', |
<<<<<<<
MERRIAM_WEBSTER_COLOR: '#375c71',
=======
FLATHUB_COLOR: '#4A86CF',
>>>>>>>
FLATHUB_COLOR: '#4A86CF',
MERRIAM_WEBSTER_COLOR: '#375c71', |
<<<<<<<
const fse = require('fs-extra')
=======
const sander = require('sander')
>>>>>>>
const fse = require('fs-extra')
const sander = require('sander') |
<<<<<<<
WIKIPEDIA_COLOR: '#e6e6e8',
=======
PACKAGIST_COLOR: '#d8dff2',
>>>>>>>
PACKAGIST_COLOR: '#d8dff2',
WIKIPEDIA_COLOR: '#e6e6e8', |
<<<<<<<
=======
const moment = require('moment')
const snekfetch = require('snekfetch')
const INTERVAL = 12 * 60 * 60 * 1000
>>>>>>>
const moment = require('moment')
const snekfetch = require('snekfetch') |
<<<<<<<
import Checklist from './modules/features/checklist/Module';
=======
import Channeling from './modules/features/Channeling';
import Checklist from './modules/features/checklist/Module';
>>>>>>>
import Channeling from './modules/features/Channeling';
import Checklist from './modules/features/checklist/Module';
<<<<<<<
import RampageCancelled from './modules/features/RampageCancelled';
=======
import RampageCancelled from './modules/spells/RampageCancelled';
>>>>>>>
import RampageCancelled from './modules/spells/RampageCancelled';
<<<<<<<
import Siegebreaker from './modules/talents/Siegebreaker';
=======
import Recklessness from './modules/spells/Recklessness';
import RecklessFlurry from './modules/azerite/RecklessFlurry';
import Warpaint from './modules/talents/Warpaint';
>>>>>>>
import Siegebreaker from './modules/talents/Siegebreaker';
import Recklessness from './modules/spells/Recklessness';
import RecklessFlurry from './modules/azerite/RecklessFlurry';
import Warpaint from './modules/talents/Warpaint';
<<<<<<<
checklist: Checklist,
=======
channeling: Channeling,
checklist: Checklist,
>>>>>>>
channeling: Channeling,
checklist: Checklist,
<<<<<<<
siegebreaker: Siegebreaker,
=======
recklessness: Recklessness,
recklessFlurry: RecklessFlurry,
warpaint: Warpaint,
>>>>>>>
siegebreaker: Siegebreaker,
recklessness: Recklessness,
recklessFlurry: RecklessFlurry,
warpaint: Warpaint, |
<<<<<<<
this.initializeCommands('./src/commands') // Custom commands directory?
this.initializeListeners('./src/listeners') // Custom listeners directory?
this.initializei18next('./src/locales')
=======
this.initializeApis('./src/apis')
this.initializeCommands('./src/commands')
this.initializeListeners('./src/listeners')
>>>>>>>
this.initializeApis('./src/apis')
this.initializeCommands('./src/commands')
this.initializeListeners('./src/listeners')
this.initializei18next('./src/locales')
<<<<<<<
/**
* Initializes i18next.
*/
initializei18next (dirPath) {
const locales = fs.readdirSync(dirPath)
try {
i18next.use(translationBackend).init({
debug: true,
ns: ['commands', 'commons', 'permissions'],
preload: locales,
fallbackLng: 'en_US',
backend: {
loadPath: 'src/locales/{{lng}}/{{ns}}.json'
}
})
} catch (e) {
this.logError(e)
}
}
=======
// APIs
/**
* Adds a new listener to the Client.
* @param {Object} api - API to be added
*/
addApi (api) {
if (api instanceof APIWrapper && api.canLoad()) {
this.apis[api.name] = api.load()
}
}
/**
* Initializes all API Wrappers.
* @param {string} dirPath - Path to the listeners directory
*/
initializeApis (dirPath) {
try {
fs.readdirSync(dirPath).forEach(file => {
if (file.endsWith('.js')) {
const RequiredAPI = require(path.resolve(dirPath, file))
this.addApi(new RequiredAPI())
this.log(`${file} loaded.`, 'APIs')
} else if (fs.statSync(path.resolve(dirPath, file)).isDirectory()) {
this.initializeApis(path.resolve(dirPath, file))
}
})
} catch (e) {
this.logError(e)
}
}
>>>>>>>
// APIs
/**
* Adds a new listener to the Client.
* @param {Object} api - API to be added
*/
addApi (api) {
if (api instanceof APIWrapper && api.canLoad()) {
this.apis[api.name] = api.load()
}
}
/**
* Initializes all API Wrappers.
* @param {string} dirPath - Path to the listeners directory
*/
initializeApis (dirPath) {
try {
fs.readdirSync(dirPath).forEach(file => {
if (file.endsWith('.js')) {
const RequiredAPI = require(path.resolve(dirPath, file))
this.addApi(new RequiredAPI())
this.log(`${file} loaded.`, 'APIs')
} else if (fs.statSync(path.resolve(dirPath, file)).isDirectory()) {
this.initializeApis(path.resolve(dirPath, file))
}
})
} catch (e) {
this.logError(e)
}
}
/**
* Initializes i18next.
*/
initializei18next (dirPath) {
const locales = fs.readdirSync(dirPath)
try {
i18next.use(translationBackend).init({
debug: true,
ns: ['commands', 'commons', 'permissions'],
preload: locales,
fallbackLng: 'en_US',
backend: {
loadPath: 'src/locales/{{lng}}/{{ns}}.json'
}
})
} catch (e) {
this.logError(e)
}
} |
<<<<<<<
OWLBOT_COLOR: '#82d2d4',
=======
FLATHUB_COLOR: '#4A86CF',
>>>>>>>
FLATHUB_COLOR: '#4A86CF',
OWLBOT_COLOR: '#82d2d4', |
<<<<<<<
keypress.simple_combo("meta o", function(){ tabView.emit('toggle') });
keypress.simple_combo("meta f", function(){ editorView.emit('search') });
=======
keypress.simple_combo("meta o", function(){ tabView.emit('toggle', 'click', 'tab-control') });
>>>>>>>
keypress.simple_combo("meta f", function(){ editorView.emit('search') });
keypress.simple_combo("meta o", function(){ tabView.emit('toggle', 'click', 'tab-control') }); |
<<<<<<<
var subEl = parent.find('p');
var codeEl = parent.find('code');
=======
var subEl = parent.find('h3');
var bodyEl = parent.find('p');
>>>>>>>
var subEl = parent.find('p');
var codeEl = parent.find('code');
var bodyEl = parent.find('p');
<<<<<<<
codeEl.empty();
=======
bodyEl.empty();
>>>>>>>
codeEl.empty();
bodyEl.empty();
<<<<<<<
code: function code(html) {
return codeEl.html(html);
},
=======
body: function body(text) {
return bodyEl.text(text);
},
>>>>>>>
code: function code(html) {
return codeEl.html(html);
body: function body(text) {
return bodyEl.text(text);
}, |
<<<<<<<
case SPECS.MARKSMANSHIP_HUNTER:
return 0.05 + this.masteryRating / 64000;
case SPECS.SUBTLETY_ROGUE:
return 0.2208 + this.masteryRating / 14492.61221;
=======
case SPECS.SUBTLETY_ROGUE:
return 0.2208 + this.masteryRating / 14492.61221;
case SPECS.BEAST_MASTERY_HUNTER:
return 0.18 + this.masteryRating / 17777.7777777;
>>>>>>>
case SPECS.MARKSMANSHIP_HUNTER:
return 0.05 + this.masteryRating / 64000;
case SPECS.SUBTLETY_ROGUE:
return 0.2208 + this.masteryRating / 14492.61221;
case SPECS.BEAST_MASTERY_HUNTER:
return 0.18 + this.masteryRating / 17777.7777777; |
<<<<<<<
import Nightmare from 'nightmare'
require('nightmare-upload')(Nightmare)
=======
import nightmare from 'nightmare'
import url from 'url'
>>>>>>>
import Nightmare from 'nightmare'
import url from 'url'
require('nightmare-upload')(Nightmare)
<<<<<<<
const nightmare = Nightmare(config)
return nightmare.goto('http://localhost:3000' + path)
=======
return nightmare(config).goto(location)
>>>>>>>
const nightmare = Nightmare(config)
return nightmare.goto(location) |
<<<<<<<
global['jasmine'].DEFAULT_TIMEOUT_INTERVAL = process.env.TEST_TIMEOUT || 6000
=======
global['jasmine'].DEFAULT_TIMEOUT_INTERVAL = process.env.TEST_TIMEOUT || 60000
>>>>>>>
global['jasmine'].DEFAULT_TIMEOUT_INTERVAL = process.env.TEST_TIMEOUT || 60000
<<<<<<<
gotoTimeout: process.env.NIGHTMARE_GOTO_TIMEOUT || 4000
=======
gotoTimeout: 30000,
waitTimeout: 30000,
loadTimeout: 30000,
executionTimeout: 30000
>>>>>>>
gotoTimeout: process.env.NIGHTMARE_GOTO_TIMEOUT || 30000,
waitTimeout: 30000,
loadTimeout: 30000,
executionTimeout: 30000 |
<<<<<<<
import FathuulsFloodguards from '../shared/modules/items/bfa/raids/crucibleofstorms/FathuulsFloodguards';
=======
import FathomDredgers from '../shared/modules/items/bfa/raids/crucibleofstorms/FathomDredgers';
import HarbingersInscrutableWill from '../shared/modules/items/bfa/raids/crucibleofstorms/HarbingersInscrutableWill';
import IdolOfIndiscriminateConsumption from '../shared/modules/items/bfa/raids/crucibleofstorms/IdolOfIndiscriminateConsumption';
import GripsOfForsakenSanity from '../shared/modules/items/bfa/raids/crucibleofstorms/GripsOfForsakenSanity';
>>>>>>>
import FathuulsFloodguards from '../shared/modules/items/bfa/raids/crucibleofstorms/FathuulsFloodguards';
import FathomDredgers from '../shared/modules/items/bfa/raids/crucibleofstorms/FathomDredgers';
import HarbingersInscrutableWill from '../shared/modules/items/bfa/raids/crucibleofstorms/HarbingersInscrutableWill';
import IdolOfIndiscriminateConsumption from '../shared/modules/items/bfa/raids/crucibleofstorms/IdolOfIndiscriminateConsumption';
import GripsOfForsakenSanity from '../shared/modules/items/bfa/raids/crucibleofstorms/GripsOfForsakenSanity';
<<<<<<<
fathuulsFloodguards: FathuulsFloodguards,
=======
fathomDredgers: FathomDredgers,
harbingersInscrutableWill: HarbingersInscrutableWill,
idolOfIndiscriminateConsumption: IdolOfIndiscriminateConsumption,
gripsOfForsakenSanity: GripsOfForsakenSanity,
>>>>>>>
fathuulsFloodguards: FathuulsFloodguards,
fathomDredgers: FathomDredgers,
harbingersInscrutableWill: HarbingersInscrutableWill,
idolOfIndiscriminateConsumption: IdolOfIndiscriminateConsumption,
gripsOfForsakenSanity: GripsOfForsakenSanity, |
<<<<<<<
maybeSetOpusOptions, jsSHA, io, callstats, DOMException */
=======
maybeRemoveVideoFec, maybeSetOpusOptions */
>>>>>>>
maybeRemoveVideoFec, maybeSetOpusOptions, jsSHA, io, callstats,
DOMException */ |
<<<<<<<
this.collectStatsStartTime = Date.now();
call.gatherStats(call.pc1, this.analyzeStats_.bind(this), this.encoderSetupTime_.bind(this), 100);
setTimeoutWithProgressBar(function() {
=======
call.gatherStats(call.pc1, this.analyzeStats_.bind(this), 1000);
setTimeoutWithProgressBar(function() {
>>>>>>>
this.collectStatsStartTime = Date.now();
call.gatherStats(call.pc1, this.analyzeStats_.bind(this), 1000);
setTimeoutWithProgressBar(function() { |
<<<<<<<
=======
'samples/web/content/manual-test/**/*',
'samples/web/content/apprtc/js/compiled/*.js',
>>>>>>>
'samples/web/content/apprtc/js/compiled/*.js', |
<<<<<<<
if(batavia.isinstance(other, [batavia.types.Bytes, batavia.types.Bytearray])){
throw new batavia.builtins.TypeError("unorderable types: list() < " + batavia.type_name(other) + "()")
}
return this.valueOf() <= other;
=======
if (other !== null) {
if (batavia.isinstance(other, batavia.types.List)) {
/* update this line to get Pythonic list < list behavior */
return this.valueOf() < other;
} else {
throw new batavia.builtins.TypeError("unorderable types: list() < " + batavia.type_name(other) + "()");
}
} else {
throw new batavia.builtins.TypeError("unorderable types: list() < NoneType()");
}
>>>>>>>
if(batavia.isinstance(other, [batavia.types.Bytes, batavia.types.Bytearray])){
throw new batavia.builtins.TypeError("unorderable types: list() < " + batavia.type_name(other) + "()")
}
if (other !== null) {
if (batavia.isinstance(other, batavia.types.List)) {
/* update this line to get Pythonic list < list behavior */
return this.valueOf() < other;
} else {
throw new batavia.builtins.TypeError("unorderable types: list() < " + batavia.type_name(other) + "()");
}
} else {
throw new batavia.builtins.TypeError("unorderable types: list() < NoneType()");
}
<<<<<<<
if(batavia.isinstance(other, [batavia.types.Bytes, batavia.types.Bytearray])){
throw new batavia.builtins.TypeError("unorderable types: list() <= " + batavia.type_name(other) + "()")
}
return this.valueOf() <= other;
=======
if (other !== null) {
if (batavia.isinstance(other, batavia.types.List)) {
/* update this line to get Pythonic list <= list behavior */
return this.valueOf() <= other;
} else {
throw new batavia.builtins.TypeError("unorderable types: list() <= " + batavia.type_name(other) + "()");
}
} else {
throw new batavia.builtins.TypeError("unorderable types: list() <= NoneType()");
}
>>>>>>>
if(batavia.isinstance(other, [batavia.types.Bytes, batavia.types.Bytearray])){
throw new batavia.builtins.TypeError("unorderable types: list() <= " + batavia.type_name(other) + "()")
}
if (other !== null) {
if (batavia.isinstance(other, batavia.types.List)) {
/* update this line to get Pythonic list <= list behavior */
return this.valueOf() <= other;
} else {
throw new batavia.builtins.TypeError("unorderable types: list() <= " + batavia.type_name(other) + "()");
}
} else {
throw new batavia.builtins.TypeError("unorderable types: list() <= NoneType()");
}
<<<<<<<
if(batavia.isinstance(other, [batavia.types.Bytes, batavia.types.Bytearray])){
throw new batavia.builtins.TypeError("unorderable types: list() > " + batavia.type_name(other) + "()")
}
return this.valueOf() > other;
=======
if (other !== null) {
if (batavia.isinstance(other, batavia.types.List)) {
/* update this line to get Pythonic list > list behavior */
return this.valueOf() > other;
} else {
throw new batavia.builtins.TypeError("unorderable types: list() > " + batavia.type_name(other) + "()");
}
} else {
throw new batavia.builtins.TypeError("unorderable types: list() > NoneType()");
}
>>>>>>>
if(batavia.isinstance(other, [batavia.types.Bytes, batavia.types.Bytearray])){
throw new batavia.builtins.TypeError("unorderable types: list() > " + batavia.type_name(other) + "()")
}
if (other !== null) {
if (batavia.isinstance(other, batavia.types.List)) {
/* update this line to get Pythonic list > list behavior */
return this.valueOf() > other;
} else {
throw new batavia.builtins.TypeError("unorderable types: list() > " + batavia.type_name(other) + "()");
}
} else {
throw new batavia.builtins.TypeError("unorderable types: list() > NoneType()");
}
<<<<<<<
if(batavia.isinstance(other, [batavia.types.Bytes, batavia.types.Bytearray])){
throw new batavia.builtins.TypeError("unorderable types: list() >= " + batavia.type_name(other) + "()")
}
return this.valueOf() >= other;
=======
if (other !== null) {
if (batavia.isinstance(other, batavia.types.List)) {
/* update this line to get Pythonic list >= list behavior */
return this.valueOf() >= other;
} else {
throw new batavia.builtins.TypeError("unorderable types: list() >= " + batavia.type_name(other) + "()");
}
} else {
throw new batavia.builtins.TypeError("unorderable types: list() >= NoneType()");
}
>>>>>>>
if(batavia.isinstance(other, [batavia.types.Bytes, batavia.types.Bytearray])){
throw new batavia.builtins.TypeError("unorderable types: list() >= " + batavia.type_name(other) + "()")
}
if (other !== null) {
if (batavia.isinstance(other, batavia.types.List)) {
/* update this line to get Pythonic list >= list behavior */
return this.valueOf() >= other;
} else {
throw new batavia.builtins.TypeError("unorderable types: list() >= " + batavia.type_name(other) + "()");
}
} else {
throw new batavia.builtins.TypeError("unorderable types: list() >= NoneType()");
} |
<<<<<<<
localStorage: $ElementType<State, 'localStorage'>,
};
=======
|};
type Props = {| ...OwnProps, ...StateProps |};
>>>>>>>
localStorage: $ElementType<State, 'localStorage'>,
|};
type Props = {| ...OwnProps, ...StateProps |};
<<<<<<<
{networkConfig.hasSignVerify && (
=======
{network.type === 'ethereum' && !isAccountImported && (
>>>>>>>
{networkConfig.hasSignVerify && (
<<<<<<<
localStorage: state.localStorage,
}),
null
=======
})
>>>>>>>
localStorage: state.localStorage,
}),
null |
<<<<<<<
type: 'error',
title: <FormattedMessage {...l10nMessages.TR_TRANSACTION_ERROR} />,
=======
variant: 'error',
title: 'Transaction error',
>>>>>>>
variant: 'error',
title: <FormattedMessage {...l10nMessages.TR_TRANSACTION_ERROR} />,
<<<<<<<
type: 'success',
title: <FormattedMessage {...l10nMessages.TR_TRANSACTION_SUCCESS} />,
=======
variant: 'success',
title: 'Transaction success',
>>>>>>>
variant: 'success',
title: <FormattedMessage {...l10nMessages.TR_TRANSACTION_SUCCESS} />,
<<<<<<<
type: 'error',
title: <FormattedMessage {...l10nMessages.TR_TRANSACTION_ERROR} />,
=======
variant: 'error',
title: 'Transaction error',
>>>>>>>
variant: 'error',
title: <FormattedMessage {...l10nMessages.TR_TRANSACTION_ERROR} />, |
<<<<<<<
<Label><FormattedMessage {...l10nMessages.TR_BALANCE} /></Label>
{fiatRate && (
<FiatValue>${fiat}</FiatValue>
)}
=======
<Label>Balance</Label>
<TooltipWrapper>
<FiatValue>{fiatRate ? `$ ${fiat}` : 'N/A'}</FiatValue>
{!fiatRate && NoRatesTooltip}
</TooltipWrapper>
>>>>>>>
<Label><FormattedMessage {...l10nMessages.TR_BALANCE} /></Label>
<TooltipWrapper>
<FiatValue>{fiatRate ? `$ ${fiat}` : 'N/A'}</FiatValue>
{!fiatRate && NoRatesTooltip}
</TooltipWrapper>
<<<<<<<
{fiatRate && (
<BalanceRateWrapper>
<Label><FormattedMessage {...l10nMessages.TR_RATE} /></Label>
<FiatValueRate>${fiatRateValue}</FiatValueRate>
<CoinBalance>1.00 {network.symbol}</CoinBalance>
</BalanceRateWrapper>
)}
=======
<BalanceRateWrapper>
<Label>Rate</Label>
<TooltipWrapper>
<FiatValueRate>{fiatRate ? `$ ${fiatRateValue}` : 'N/A'}</FiatValueRate>
{!fiatRate && NoRatesTooltip}
</TooltipWrapper>
<CoinBalance>1 {network.symbol}</CoinBalance>
</BalanceRateWrapper>
>>>>>>>
<BalanceRateWrapper>
<Label><FormattedMessage {...l10nMessages.TR_RATE} /></Label>
<TooltipWrapper>
<FiatValueRate>{fiatRate ? `$ ${fiatRateValue}` : 'N/A'}</FiatValueRate>
{!fiatRate && NoRatesTooltip}
</TooltipWrapper>
<CoinBalance>1 {network.symbol}</CoinBalance>
</BalanceRateWrapper> |
<<<<<<<
type: 'error',
title: <FormattedMessage {...l10nMessages.TR_ACCOUNT_DISCOVERY_ERROR} />,
=======
variant: 'error',
title: 'Discovery error',
>>>>>>>
variant: 'error',
title: <FormattedMessage {...l10nMessages.TR_ACCOUNT_DISCOVERY_ERROR} />,
<<<<<<<
type: 'error',
title: <FormattedMessage {...l10nMessages.TR_ACCOUNT_DISCOVERY_ERROR} />,
=======
variant: 'error',
title: 'Account discovery error',
>>>>>>>
variant: 'error',
title: <FormattedMessage {...l10nMessages.TR_ACCOUNT_DISCOVERY_ERROR} />, |
<<<<<<<
import { Icon, Tooltip, icons, colors } from 'trezor-ui-components';
import { FONT_SIZE } from 'config/variables';
=======
import colors from 'config/colors';
import { FONT_SIZE, SCREEN_SIZE } from 'config/variables';
import Icon from 'components/Icon';
>>>>>>>
import { Icon, Tooltip, icons, colors } from 'trezor-ui-components';
import { FONT_SIZE, SCREEN_SIZE } from 'config/variables';
<<<<<<<
<Sidebar isOpen={props.wallet.showSidebar}>
<Header
isSelected
testId="Main__page__device__header"
isHoverable={false}
onClickWrapper={() => {
if (isDeviceAccessible || this.props.devices.length > 1) {
this.handleOpen();
}
}}
device={selectedDevice}
disabled={!isDeviceAccessible && this.props.devices.length === 1}
isOpen={this.props.wallet.dropdownOpened}
icon={
<React.Fragment>
{showWalletType && (
<Tooltip
content={
<WalletTooltipMsg
walletType={walletType}
isDeviceReady={isDeviceReady}
/>
}
maxWidth={200}
placement="bottom"
mouseEnterDelay={0.5}
>
<DeviceIconWrapper>
<WalletTypeIcon
onClick={e => {
if (selectedDevice && isDeviceReady) {
this.props.duplicateDevice(selectedDevice);
e.stopPropagation();
=======
<>
<StyledBackdrop
show={props.wallet.showSidebar}
onClick={props.toggleSidebar}
animated
/>
<Sidebar isOpen={props.wallet.showSidebar}>
<Header
isSelected
testId="Main__page__device__header"
isHoverable={false}
onClickWrapper={() => {
if (isDeviceAccessible || this.props.devices.length > 1) {
this.handleOpen();
}
}}
device={selectedDevice}
disabled={!isDeviceAccessible && this.props.devices.length === 1}
isOpen={this.props.wallet.dropdownOpened}
icon={
<React.Fragment>
{showWalletType && (
<Tooltip
content={
<WalletTooltipMsg
walletType={walletType}
isDeviceReady={isDeviceReady}
/>
}
maxWidth={200}
placement="bottom"
enterDelayMs={0.5}
>
<WalletTypeIconWrapper>
<WalletTypeIcon
onClick={e => {
if (selectedDevice && isDeviceReady) {
this.props.duplicateDevice(selectedDevice);
e.stopPropagation();
}
}}
hoverColor={
isDeviceReady
? colors.TEXT_PRIMARY
: colors.TEXT_SECONDARY
>>>>>>>
<Sidebar isOpen={props.wallet.showSidebar}>
<StyledBackdrop
show={props.wallet.showSidebar}
onClick={props.toggleSidebar}
animated
/>
<Header
isSelected
testId="Main__page__device__header"
isHoverable={false}
onClickWrapper={() => {
if (isDeviceAccessible || this.props.devices.length > 1) {
this.handleOpen();
}
}}
device={selectedDevice}
disabled={!isDeviceAccessible && this.props.devices.length === 1}
isOpen={this.props.wallet.dropdownOpened}
icon={
<React.Fragment>
{showWalletType && (
<Tooltip
content={
<WalletTooltipMsg
walletType={walletType}
isDeviceReady={isDeviceReady}
/>
}
maxWidth={200}
placement="bottom"
mouseEnterDelay={0.5}
>
<DeviceIconWrapper>
<WalletTypeIcon
onClick={e => {
if (selectedDevice && isDeviceReady) {
this.props.duplicateDevice(selectedDevice);
e.stopPropagation();
<<<<<<<
}}
hoverColor={
isDeviceReady
? colors.TEXT_PRIMARY
: colors.TEXT_SECONDARY
}
type={walletType}
size={16}
color={colors.TEXT_SECONDARY}
/>
</DeviceIconWrapper>
</Tooltip>
)}
{this.props.devices.length > 1 && (
<Tooltip
content={
<FormattedMessage {...l10nMessages.TR_NUMBER_OF_DEVICES} />
}
maxWidth={200}
placement="bottom"
mouseEnterDelay={0.5}
>
<DeviceIconWrapper>
<Counter>{this.props.devices.length}</Counter>
</DeviceIconWrapper>
</Tooltip>
)}
{/* <Tooltip
=======
type={walletType}
size={25}
color={colors.TEXT_SECONDARY}
/>
</WalletTypeIconWrapper>
</Tooltip>
)}
{this.props.devices.length > 1 && (
<Tooltip
content={
<FormattedMessage
{...l10nMessages.TR_NUMBER_OF_DEVICES}
/>
}
maxWidth={200}
placement="bottom"
enterDelayMs={0.5}
>
<Counter>{this.props.devices.length}</Counter>
</Tooltip>
)}
{/* <Tooltip
>>>>>>>
}}
hoverColor={
isDeviceReady
? colors.TEXT_PRIMARY
: colors.TEXT_SECONDARY
}
type={walletType}
size={16}
color={colors.TEXT_SECONDARY}
/>
</DeviceIconWrapper>
</Tooltip>
)}
{this.props.devices.length > 1 && (
<Tooltip
content={
<FormattedMessage {...l10nMessages.TR_NUMBER_OF_DEVICES} />
}
maxWidth={200}
placement="bottom"
mouseEnterDelay={0.5}
>
<DeviceIconWrapper>
<Counter>{this.props.devices.length}</Counter>
</DeviceIconWrapper>
</Tooltip>
)}
{/* <Tooltip
<<<<<<<
<IconDivider />
<Icon
canAnimate={this.state.clicked === true}
isActive={this.props.wallet.dropdownOpened}
size={16}
color={colors.TEXT_SECONDARY}
icon={icons.ARROW_DOWN}
/>
</React.Fragment>
}
{...this.props}
/>
<Body minHeight={this.state.bodyMinHeight}>
{dropdownOpened && <DeviceMenu ref={this.deviceMenuRef} {...this.props} />}
{isDeviceAccessible && menu}
</Body>
<Footer data-test="Main__page__footer" key="sticky-footer">
<Help>
<A
href="https://trezor.io/support/"
target="_blank"
rel="noreferrer noopener"
>
<StyledIcon size={14} icon={icons.CHAT} color={colors.TEXT_SECONDARY} />
<FormattedMessage {...l10nMessages.TR_NEED_HELP} />
</A>
</Help>
</Footer>
</Sidebar>
=======
<Icon
canAnimate={this.state.clicked === true}
isActive={this.props.wallet.dropdownOpened}
size={25}
color={colors.TEXT_SECONDARY}
icon={icons.ARROW_DOWN}
/>
</React.Fragment>
}
{...this.props}
/>
<Body minHeight={this.state.bodyMinHeight}>
{dropdownOpened && <DeviceMenu ref={this.deviceMenuRef} {...this.props} />}
{isDeviceAccessible && menu}
</Body>
<Footer data-test="Main__page__footer" key="sticky-footer">
<Help>
<A
href="https://trezor.io/support/"
target="_blank"
rel="noreferrer noopener"
>
<Icon size={26} icon={icons.CHAT} color={colors.TEXT_SECONDARY} />
<FormattedMessage {...l10nMessages.TR_NEED_HELP} />
</A>
</Help>
</Footer>
</Sidebar>
</>
>>>>>>>
<IconDivider />
<Icon
canAnimate={this.state.clicked === true}
isActive={this.props.wallet.dropdownOpened}
size={16}
color={colors.TEXT_SECONDARY}
icon={icons.ARROW_DOWN}
/>
</React.Fragment>
}
{...this.props}
/>
<Body minHeight={this.state.bodyMinHeight}>
{dropdownOpened && <DeviceMenu ref={this.deviceMenuRef} {...this.props} />}
{isDeviceAccessible && menu}
</Body>
<Footer data-test="Main__page__footer" key="sticky-footer">
<Help>
<A
href="https://trezor.io/support/"
target="_blank"
rel="noreferrer noopener"
>
<StyledIcon size={14} icon={icons.CHAT} color={colors.TEXT_SECONDARY} />
<FormattedMessage {...l10nMessages.TR_NEED_HELP} />
</A>
</Help>
</Footer>
</Sidebar> |
<<<<<<<
copyToClipboard: typeof LogActions.copyToClipboard,
resetCopyState: typeof LogActions.resetCopyState,
}
=======
copyToClipboard: typeof LogActions.copyToClipboard,
};
>>>>>>>
copyToClipboard: typeof LogActions.copyToClipboard,
resetCopyState: typeof LogActions.resetCopyState,
};
<<<<<<<
resetCopyState: bindActionCreators(LogActions.resetCopyState, dispatch),
}),
=======
})
>>>>>>>
resetCopyState: bindActionCreators(LogActions.resetCopyState, dispatch),
}) |
<<<<<<<
model: PropTypes.oneOf([1, 2]).isRequired,
text: PropTypes.string,
=======
model: PropTypes.oneOf(['1', '2']).isRequired,
children: PropTypes.node.isRequired,
size: PropTypes.number,
};
Prompt.defaultProps = {
size: 32,
>>>>>>>
model: PropTypes.oneOf([1, 2]).isRequired,
children: PropTypes.node.isRequired,
size: PropTypes.number,
};
Prompt.defaultProps = {
size: 32, |
<<<<<<<
=======
import type { TrezorDevice } from 'flowtype';
import COLORS from 'config/colors';
import { FONT_SIZE, FONT_WEIGHT } from 'config/variables';
import { SLIDE_DOWN } from 'config/animations';
>>>>>>>
import COLORS from 'config/colors';
import { FONT_SIZE, FONT_WEIGHT } from 'config/variables';
import { SLIDE_DOWN } from 'config/animations';
<<<<<<<
=======
const StyledDivider = styled(Divider)`
background: #fff;
color: ${COLORS.TEXT_PRIMARY};
font-weight: ${FONT_WEIGHT.MEDIUM};
font-size: ${FONT_SIZE.BASE};
border: none;
`;
type DeviceMenuItem = {
type: string;
label: string;
}
>>>>>>>
const StyledDivider = styled(Divider)`
background: #fff;
color: ${COLORS.TEXT_PRIMARY};
font-weight: ${FONT_WEIGHT.MEDIUM};
font-size: ${FONT_SIZE.BASE};
border: none;
`;
<<<<<<<
=======
onDeviceMenuClick(item: DeviceMenuItem, device: TrezorDevice): void {
if (item.type === 'reload') {
this.props.acquireDevice();
} else if (item.type === 'forget') {
this.props.forgetDevice(device);
} else if (item.type === 'clone') {
this.props.duplicateDevice(device);
} else if (item.type === 'settings') {
this.props.toggleDeviceDropdown(false);
this.props.gotoDeviceSettings(device);
}
}
getMenuHeight(): number {
return this.myRef.current ? this.myRef.current.getBoundingClientRect().height : 0;
}
>>>>>>>
getMenuHeight(): number {
return this.myRef.current ? this.myRef.current.getBoundingClientRect().height : 0;
} |
<<<<<<<
<H1>Your device is not initialized</H1>
<StyledParagraph>Please use Bitcoin wallet interface to start initialization process</StyledParagraph>
<A href={getOldWalletUrl(props.device)} target="_self">
<Button>Take me to the Bitcoin wallet</Button>
=======
<H1><FormattedMessage {...l10nMessages.TR_YOUR_DEVICE_IS_NOT_INITIALIZED} /></H1>
<StyledParagraph><FormattedMessage {...l10nMessages.TR_PLEASE_USE_TO_START_INITIALIZATION} /></StyledParagraph>
<A href={getOldWalletUrl(props.device)}>
<Button><FormattedMessage {...l10nCommonMessages.TR_TAKE_ME_TO_BITCOIN_WALLET} /></Button>
>>>>>>>
<H1><FormattedMessage {...l10nMessages.TR_YOUR_DEVICE_IS_NOT_INITIALIZED} /></H1>
<StyledParagraph><FormattedMessage {...l10nMessages.TR_PLEASE_USE_TO_START_INITIALIZATION} /></StyledParagraph>
<A href={getOldWalletUrl(props.device)} target="_self">
<Button><FormattedMessage {...l10nCommonMessages.TR_TAKE_ME_TO_BITCOIN_WALLET} /></Button> |
<<<<<<<
//doc-width-too-large
sendIssue(sink, "doc-width-too-large", this.name, this.category);
=======
sink.emit('err', checker.l10n.report(this.category, this.name, "rr"));
sink.emit('done');
>>>>>>>
sendIssue(sink, "doc-width-too-large", this.name, this.category); |
<<<<<<<
//console.log(self.webAppData);
=======
>>>>>>>
console.log(self.webAppData); |
<<<<<<<
socket.on('tip', function(data) {
=======
//server event : add report header and some infos
/*socket.on('tip', function(data) {
>>>>>>>
socket.on('tip', function(data) {
//server event : add report header and some infos |
<<<<<<<
beforeEach(function(){
var self = this;
=======
>>>>>>>
var self = this;
<<<<<<<
this.mockWebSocketManager = {
onMessage: function() {},
applyFilter: function() {}
};
var mockWebSocketManagerClass = {
create: function() {
return self.mockWebSocketManager;
}
};
this.mockMessageParser = { addMessage : function() {} };
this.mockClientIdGenerator = { generate: function(){} };
this.mockSettingsStore = { exists: function(){}, get: function() {} };
=======
this.mockWebSocketManager = { onMessage: function () { },
applyFilter: function () { } };
this.mockMessageParser = { addMessage : function () { } };
this.mockClientIdGenerator = { generate: function () { } };
this.mockSettingsStore = { exists: function (){ }, get: function () { } };
>>>>>>>
this.mockWebSocketManager = {
onMessage: function() {},
applyFilter: function() {}
};
var mockWebSocketManagerClass = {
create: function() {
return self.mockWebSocketManager;
}
};
this.mockMessageParser = { addMessage : function () { } };
this.mockClientIdGenerator = { generate: function () { } };
this.mockSettingsStore = { exists: function (){ }, get: function () { } };
<<<<<<<
this.appStart = function() {
app.start('localhost', 8000, {
messageParser: this.mockMessageParser,
appViewClass: this.mockAppViewClass,
settingsStore: this.mockSettingsStore,
clientIdGenerator: this.mockClientIdGenerator,
webSocketManagerClass: mockWebSocketManagerClass
});
=======
this.appStart = function () {
app.start(this.mockWebSocketManager, this.mockMessageParser,
this.mockAppViewClass, this.mockSettingsStore,
this.mockClientIdGenerator);
>>>>>>>
this.appStart = function() {
app.start('localhost', 8000, {
messageParser: this.mockMessageParser,
appViewClass: this.mockAppViewClass,
settingsStore: this.mockSettingsStore,
clientIdGenerator: this.mockClientIdGenerator,
webSocketManagerClass: mockWebSocketManagerClass
}); |
<<<<<<<
require('./utils/handlebarsHelpers');
var _ = require('lodash');
var WebSocketManager = require('./webSocketManager');
var MessageParser = require('./messageParser');
var AppView = require('./views/app');
var SettingsStore = require('./settingsStore');
var ClientIdGenerator = require('./clientIdGenerator');
var WebSocketManager = require('./webSocketManager');
=======
>>>>>>>
require('./utils/handlebarsHelpers');
var _ = require('lodash');
var WebSocketManager = require('./webSocketManager');
var MessageParser = require('./messageParser');
var AppView = require('./views/app');
var SettingsStore = require('./settingsStore');
var ClientIdGenerator = require('./clientIdGenerator');
var WebSocketManager = require('./webSocketManager');
<<<<<<<
webSocketManager.applyFilter(opts.settingsStore.get('channel'));
=======
webSocketManager.applyFilter(settingsStore.get('channel'));
>>>>>>>
webSocketManager.applyFilter(opts.settingsStore.get('channel'));
<<<<<<<
opts.messageParser.addMessage(message);
=======
messageParser.addMessage(message);
>>>>>>>
opts.messageParser.addMessage(message);
<<<<<<<
module.exports = window.app = app;
=======
module.exports = app;
>>>>>>>
module.exports = window.app = app; |
<<<<<<<
return StdLib.Promises.callbackPromise(['apps', 'packages', 'unknownApps', 'unknownPackages'], callback, (accept, reject) => {
requestType = requestType || PICSRequestType.User;
=======
requestType = requestType || PICSRequestType.User;
// Steam can send us the full response in multiple responses, so we need to buffer them into one callback
var appids = [];
var packageids = [];
var response = {
"apps": {},
"packages": {},
"unknownApps": [],
"unknownPackages": []
};
var callbackFired = false;
apps = apps.map(function(app) {
if (typeof app === 'object') {
appids.push(app.appid);
return app;
} else {
appids.push(app);
return {"appid": app};
}
});
>>>>>>>
return StdLib.Promises.callbackPromise(['apps', 'packages', 'unknownApps', 'unknownPackages'], callback, (accept, reject) => {
requestType = requestType || PICSRequestType.User;
<<<<<<<
accept(response);
});
=======
if (!callbackFired) {
callbackFired = true;
callback(response.apps, response.packages, response.unknownApps, response.unknownPackages);
}
>>>>>>>
if (!callbackFired) {
callbackFired = true;
accept(response);
} |
<<<<<<<
this.getProductInfo(appids, [], null, PICSRequestType.PackageContents);
=======
self.getProductInfo(appids, [], false, null, PICSRequestType.PackageContents);
>>>>>>>
this.getProductInfo(appids, [], false, null, PICSRequestType.PackageContents);
<<<<<<<
callback(null, response.apps, response.packages, response.unknownApps, response.unknownPackages);
=======
if (inclTokens) {
var tokenlessAppids = [];
var tokenlessPackages = [];
for (var appid in response.apps) {
if (response.apps[appid].missingToken) {
tokenlessAppids.push(parseInt(appid, 10));
}
}
for (var packageid in response.packages) {
if (response.packages[packageid].missingToken) {
tokenlessPackages.push(parseInt(packageid, 10));
}
}
if (tokenlessAppids.length > 0 || tokenlessPackages.length > 0) {
self.getProductAccessToken(tokenlessAppids, tokenlessPackages, function(appTokens, packageTokens) {
var tokenApps = [];
var tokenPackages = [];
for (appid in appTokens) {
tokenApps.push({appid: parseInt(appid, 10), access_token: appTokens[appid]})
}
for (packageid in packageTokens) {
tokenPackages.push({appid: parseInt(packageid, 10), access_token: packageTokens[appid]})
}
self.getProductInfo(tokenApps, tokenPackages, false, function(apps, packages) {
for (appid in apps) {
response.apps[appid] = apps[appid];
var index = response.unknownApps.indexOf(parseInt(appid, 10));
if (index != -1) {
response.unknownApps.splice(index, 1);
}
}
for (packageid in packages) {
response.packages[packageid] = packages[packageid];
var index = response.unknownPackages.indexOf(parseInt(packageid, 10));
if (index != -1) {
response.unknownPackages.splice(index, 1);
}
}
callback(response.apps, response.packages, response.unknownApps, response.unknownPackages);
});
});
} else {
callback(response.apps, response.packages, response.unknownApps, response.unknownPackages);
}
} else {
callback(response.apps, response.packages, response.unknownApps, response.unknownPackages);
}
>>>>>>>
if (inclTokens) {
var tokenlessAppids = [];
var tokenlessPackages = [];
for (var appid in response.apps) {
if (response.apps[appid].missingToken) {
tokenlessAppids.push(parseInt(appid, 10));
}
}
for (var packageid in response.packages) {
if (response.packages[packageid].missingToken) {
tokenlessPackages.push(parseInt(packageid, 10));
}
}
if (tokenlessAppids.length > 0 || tokenlessPackages.length > 0) {
self.getProductAccessToken(tokenlessAppids, tokenlessPackages, function(appTokens, packageTokens) {
var tokenApps = [];
var tokenPackages = [];
for (appid in appTokens) {
tokenApps.push({appid: parseInt(appid, 10), access_token: appTokens[appid]})
}
for (packageid in packageTokens) {
tokenPackages.push({appid: parseInt(packageid, 10), access_token: packageTokens[appid]})
}
self.getProductInfo(tokenApps, tokenPackages, false, function(apps, packages) {
for (appid in apps) {
response.apps[appid] = apps[appid];
var index = response.unknownApps.indexOf(parseInt(appid, 10));
if (index != -1) {
response.unknownApps.splice(index, 1);
}
}
for (packageid in packages) {
response.packages[packageid] = packages[packageid];
var index = response.unknownPackages.indexOf(parseInt(packageid, 10));
if (index != -1) {
response.unknownPackages.splice(index, 1);
}
}
callback(null, response.apps, response.packages, response.unknownApps, response.unknownPackages);
});
});
} else {
callback(null, response.apps, response.packages, response.unknownApps, response.unknownPackages);
}
} else {
callback(null, response.apps, response.packages, response.unknownApps, response.unknownPackages);
}
<<<<<<<
this.getProductInfo(ourApps, ourPackages, null, PICSRequestType.Changelist);
=======
self.getProductInfo(ourApps, ourPackages, false, null, PICSRequestType.Changelist);
>>>>>>>
this.getProductInfo(ourApps, ourPackages, false, null, PICSRequestType.Changelist);
<<<<<<<
this.getProductInfo([], packageids, (apps, packages) => {
=======
var self = this;
this.getProductInfo([], packageids, false, function(apps, packages) {
>>>>>>>
this.getProductInfo([], packageids, false, (apps, packages) => {
<<<<<<<
this.getProductInfo(appids, [], (apps, packages) => {
this.emit('appOwnershipCached');
=======
self.getProductInfo(appids, [], false, function(apps, packages) {
self.emit('appOwnershipCached');
>>>>>>>
this.getProductInfo(appids, [], false, (apps, packages) => {
this.emit('appOwnershipCached');
<<<<<<<
(pkg.appids || []).forEach((appid) => {
if (appids.indexOf(appid) == -1) {
appids.push(appid);
=======
(pkg.appids || []).forEach(function(appid) {
if (!appids[appid]) {
appids[appid] = true;
>>>>>>>
(pkg.appids || []).forEach((appid) => {
if (!appids[appid]) {
appids[appid] = true; |
<<<<<<<
download("http://" + StdLib.IPv4.intToString(server.server_ip) + ":" + server.server_port + "/serverlist/" + this.cellID + "/20/", "cs.steamcontent.com", (err, res) => {
=======
download("http://" + Helpers.ipIntToString(server.server_ip) + ":" + server.server_port + "/serverlist/" + this.cellID + "/20/", "cs.steamcontent.com", (err, res) => {
>>>>>>>
download("http://" + StdLib.IPv4.intToString(server.server_ip) + ":" + server.server_port + "/serverlist/" + this.cellID + "/20/", "cs.steamcontent.com", (err, res) => {
<<<<<<<
this.storage.readFile("depot_key_" + appID + "_" + depotID + ".bin", (err, file) => {
if (file && Math.floor(Date.now() / 1000) - file.readUInt32LE(0) < (60 * 60 * 24 * 14)) {
=======
appID = parseInt(appID, 10);
depotID = parseInt(depotID, 10);
this.storage.readFile("depot_key_" + appID + "_" + depotID + ".bin", (err, file) => {
if (file && file.length > 4 && Math.floor(Date.now() / 1000) - file.readUInt32LE(0) < (60 * 60 * 24 * 14)) {
>>>>>>>
appID = parseInt(appID, 10);
depotID = parseInt(depotID, 10);
this.storage.readFile("depot_key_" + appID + "_" + depotID + ".bin", (err, file) => {
if (file && file.length > 4 && Math.floor(Date.now() / 1000) - file.readUInt32LE(0) < (60 * 60 * 24 * 14)) {
<<<<<<<
this.storage.writeFile("depot_key_" + appID + "_" + depotID + ".bin", file, function() {
=======
this.storage.writeFile("depot_key_" + appID + "_" + depotID + ".bin", file, () => {
>>>>>>>
this.storage.writeFile("depot_key_" + appID + "_" + depotID + ".bin", file, () => {
<<<<<<<
this.getDepotDecryptionKey(appID, depotID, (err, key) => {
=======
this.getDepotDecryptionKey(appID, depotID, function(err, key) {
>>>>>>>
this.getDepotDecryptionKey(appID, depotID, (err, key) => {
<<<<<<<
FS.open(outputFilePath, "w", function(err, fd) {
=======
fs.open(outputFilePath, "w", (err, fd) => {
>>>>>>>
FS.open(outputFilePath, "w", (err, fd) => {
<<<<<<<
FS.truncate(outputFd, parseInt(fileManifest.size, 10), function(err) {
=======
fs.truncate(outputFd, parseInt(fileManifest.size, 10), (err) => {
>>>>>>>
FS.truncate(outputFd, parseInt(fileManifest.size, 10), (err) => {
<<<<<<<
this.downloadChunk(appID, depotID, chunk.sha, servers[serverIdx], (err, data) => {
=======
self.downloadChunk(appID, depotID, chunk.sha, servers[serverIdx], (err, data) => {
>>>>>>>
this.downloadChunk(appID, depotID, chunk.sha, servers[serverIdx], (err, data) => {
<<<<<<<
FS.write(outputFd, data, 0, data.length, parseInt(chunk.offset, 10), function(err) {
=======
fs.write(outputFd, data, 0, data.length, parseInt(chunk.offset, 10), (err) => {
>>>>>>>
FS.write(outputFd, data, 0, data.length, parseInt(chunk.offset, 10), (err) => {
<<<<<<<
FS.close(outputFd, function(err) {
=======
fs.close(outputFd, (err) => {
>>>>>>>
FS.close(outputFd, (err) => {
<<<<<<<
FS.createReadStream(outputFilePath).pipe(hash);
hash.on('readable', function() {
=======
fs.createReadStream(outputFilePath).pipe(hash);
hash.on('readable', () => {
>>>>>>>
FS.createReadStream(outputFilePath).pipe(hash);
hash.on('readable', () => { |
<<<<<<<
// Dungeons
import RevitalizingVoodooTotem from './Modules/Items/BFA/Dungeons/RevitalizingVoodooTotem';
=======
// Dungeons
import LingeringSporepods from './Modules/Items/BFA/Dungeons/LingeringSporepods';
import FangsOfIntertwinedEssence from './Modules/Items/BFA/Dungeons/FangsOfIntertwinedEssence';
>>>>>>>
// Dungeons
import RevitalizingVoodooTotem from './Modules/Items/BFA/Dungeons/RevitalizingVoodooTotem';
import LingeringSporepods from './Modules/Items/BFA/Dungeons/LingeringSporepods';
import FangsOfIntertwinedEssence from './Modules/Items/BFA/Dungeons/FangsOfIntertwinedEssence';
<<<<<<<
revitalizingVoodooTotem: RevitalizingVoodooTotem,
=======
// Dungeons
lingeringSporepods: LingeringSporepods,
fangsOfIntertwinedEssence: FangsOfIntertwinedEssence,
>>>>>>>
revitalizingVoodooTotem: RevitalizingVoodooTotem,
// Dungeons
lingeringSporepods: LingeringSporepods,
fangsOfIntertwinedEssence: FangsOfIntertwinedEssence, |
<<<<<<<
require('./components/utility.js');
require('./components/trading.js');
require('./components/friends.js');
require('./components/chat.js');
/**
* Called when the request completes.
* @callback SteamUser~genericEResultCallback
* @param {EResult} eresult - The result of the operation
*/
=======
require('./components/utility.js');
require('./components/twofactor.js');
>>>>>>>
require('./components/utility.js');
require('./components/trading.js');
require('./components/friends.js');
require('./components/chat.js');
require('./components/twofactor.js');
/**
* Called when the request completes.
* @callback SteamUser~genericEResultCallback
* @param {EResult} eresult - The result of the operation
*/ |
<<<<<<<
</div>`;
}
inject() {
$(this.content).appendTo($(".list-title"));
=======
</div>`
this.searchContent = () => {
$(this.content).appendTo($(".list-title"));
};
this.danmakuSearchProgress = (e) => {
let action = e.target.id;
let range = this.searchList.length;
if (action === "acfun-helper-search-title") {
$("#acfun-helper-search>div").addClass("search-hidden");
}
if (action === "acfun-helper-search-button" || e.keyCode === 13) {
if (!this.lock) return;
this.startSearch();
}
if (action === "acfun-helper-search-next") {
let changePage = !$(".next-page").hasClass("disabled");
this.i = this.i + 1;
if (this.i == range || range === 0) {
if (changePage) {
$(".next-page").click();
this.pageNum++;
this.i = 0;
return;
} else {
this.i = 0;
}
}
let target = this.i;
this.danmakuSearchJump(this.searchList, target);
}
if (action === "acfun-helper-search-last") {
let changePage = !$(".last-page").hasClass("disabled");
this.i = this.i - 1;
if (this.i === -1 || range === 0) {
if (changePage) {
$(".last-page").click();
this.pageNum--;
this.i = "end";
return;
} else {
this.i = range - 1;
}
}
let target = this.i;
this.danmakuSearchJump(this.searchList, target);
}
if (action === "acfun-helper-search-close") {
this.buttonStatusChange(true);
$("#acfun-helper-search-input").val("");
$("#acfun-helper-search>div").removeClass("search-hidden");
$(".danmaku-items").unbind("DOMNodeInserted");
this.searchList.forEach((item, index) => {
$(item.item).css({ background: "", color: "" });
});
this.searchList = [];
this.i = 0;
}
};
}
inject(){
this.searchContent();
>>>>>>>
</div>`;
}
inject() {
$(this.content).appendTo($(".list-title"));
<<<<<<<
=======
>>>>>>> |
<<<<<<<
data = 0; //TODO:记得删
if(data === 1){
$('#update-box').css('display','inline-block')
$('.update-letter').html('助手有轻量更新，点击查看')
$('.head').addClass('lightUpdate')
$('#update-box').click(()=>{
window.open('https://www.acfun.cn')
})
=======
// data.Upgradeable = 0; //TODO:测试用，记得删
if(data.Upgradeable === 1){
$('#update-box').css('display','inline-block');
>>>>>>>
if(data.Upgradeable === 1){
$('#update-box').css('display','inline-block')
$('.update-letter').html('助手有轻量更新，点击查看')
$('.head').addClass('lightUpdate')
$('#update-box').click(()=>{
window.open('https://www.acfun.cn')
})
<<<<<<<
if(data === 2){
$('#update-box').css('display','inline-block')
$('.update-letter').html('助手有重大更新，点击查看')
$('.update-icon').css('background','red')
$('#update-box').click(()=>{
window.open('https://www.acfun.cn')
})
$('.head').addClass('heavyUpdate')
=======
if(data.Upgradeable === 2){
$('#update-box').css('display','inline-block');
$('.update-icon').css('background','red');
$('.head > div.item')[0].style.backgroundColor = "yellow";
>>>>>>>
if(data.Upgradeable === 2){
$('#update-box').css('display','inline-block')
$('.update-letter').html('助手有重大更新，点击查看')
$('.update-icon').css('background','red')
$('#update-box').click(()=>{
window.open('https://www.acfun.cn')
})
$('.head').addClass('heavyUpdate') |
<<<<<<<
enabled: true, //开启关闭插件
auto_throw: false,
to_attention: true,
to_attention_num: 5,
to_special_items: [],
activeTabKey: "activeTabId",
extendsName: "AcFun助手",
upUrlTemplate: "https://www.acfun.cn/u/{uid}",
userInfo: "https://www.acfun.cn/rest/pc-direct/user/userInfo?userId={uid}",
banana_notice: true,
mark: false, //评论用户标记
scan: false, //评论用户扫描
upHighlight: true, //up主评论高亮
receive: false, //接收用户情报
filter: false, //屏蔽up
beautify_nav: true, //首页右侧导航
beautify_personal: true, //个人中心入口
show_like: false, //显示点赞数
custom_rate: true, //开启自定义倍速
player_mode: "default", //进入页面时播放器的状态，default:默认 film:观影模式 web:网页全屏 screen:桌面全屏
=======
enabled:true,//开启关闭插件
auto_throw:false,
to_attention:true,
to_attention_num:5,
to_special_items:[],
activeTabKey:'activeTabId',
extendsName:'AcFun助手',
upUrlTemplate:'https://www.acfun.cn/u/{uid}',
userInfo:'https://www.acfun.cn/rest/pc-direct/user/userInfo?userId={uid}',
banana_notice:true,
mark:false,//评论用户标记
scan:false,//评论用户扫描
upHighlight:true,//up主评论高亮
receive:false,//接收用户情报
filter:false,//屏蔽up
beautify_nav:true,//首页右侧导航
beautify_personal:true,//个人中心入口
show_like:false,//显示点赞数
custom_rate:true,//开启自定义倍速
player_mode:'default',//进入页面时播放器的状态，default:默认 film:观影模式 web:网页全屏 screen:桌面全屏
liveFloowNotif:false,
videoQualityStrategy:'0',
>>>>>>>
enabled:true,//开启关闭插件
auto_throw:false,
to_attention:true,
to_attention_num:5,
to_special_items:[],
activeTabKey:'activeTabId',
extendsName:'AcFun助手',
upUrlTemplate:'https://www.acfun.cn/u/{uid}',
userInfo:'https://www.acfun.cn/rest/pc-direct/user/userInfo?userId={uid}',
banana_notice:true,
mark:false,//评论用户标记
scan:false,//评论用户扫描
upHighlight:true,//up主评论高亮
receive:false,//接收用户情报
filter:false,//屏蔽up
beautify_nav:true,//首页右侧导航
beautify_personal:true,//个人中心入口
show_like:false,//显示点赞数
custom_rate:true,//开启自定义倍速
player_mode:'default',//进入页面时播放器的状态，default:默认 film:观影模式 web:网页全屏 screen:桌面全屏
liveFloowNotif:false,
videoQualityStrategy:'0',
<<<<<<<
video: new RegExp("http(s)?:\\/\\/www.acfun.cn\\/v\\/ac\\d+"), //视频
bangumi: new RegExp("http(s)?:\\/\\/www.acfun.cn\\/bangumi\\/.*"), //番剧
article: new RegExp("http(s)?:\\/\\/www.acfun.cn\\/a\\/ac\\d+"), //文章
msg_comment: new RegExp(
"http(s)?:\\/\\/www.acfun.cn\\/(a|v)\\/ac\\d+#ncid=(\\d+)"
), //从我的消息-评论跳转
mlive: new RegExp("https://m.acfun.cn/live/detail/*"), //移动版直播
live: new RegExp("https://live.acfun.cn/live/*"), //直播
};
=======
video:new RegExp('http(s)?:\\/\\/www.acfun.cn\\/v\\/ac\\d+'),//视频
bangumi:new RegExp('http(s)?:\\/\\/www.acfun.cn\\/bangumi\\/.*'),//番剧
article:new RegExp('http(s)?:\\/\\/www.acfun.cn\\/a\\/ac\\d+'),//文章
msg_comment:new RegExp('http(s)?:\\/\\/www.acfun.cn\\/(a|v)\\/ac\\d+#ncid=(\\d+)'),//从我的消息-评论跳转
mlive:new RegExp("https://m.acfun.cn/live/detail/*"),//移动版直播
live:new RegExp("https://live.acfun.cn/live/*"),//直播
liveIndex:new RegExp("https://live.acfun.cn")//直播主页
}
>>>>>>>
video:new RegExp('http(s)?:\\/\\/www.acfun.cn\\/v\\/ac\\d+'),//视频
bangumi:new RegExp('http(s)?:\\/\\/www.acfun.cn\\/bangumi\\/.*'),//番剧
article:new RegExp('http(s)?:\\/\\/www.acfun.cn\\/a\\/ac\\d+'),//文章
msg_comment:new RegExp('http(s)?:\\/\\/www.acfun.cn\\/(a|v)\\/ac\\d+#ncid=(\\d+)'),//从我的消息-评论跳转
mlive:new RegExp("https://m.acfun.cn/live/detail/*"),//移动版直播
live:new RegExp("https://live.acfun.cn/live/*"),//直播
liveIndex:new RegExp("https://live.acfun.cn")//直播主页
}
<<<<<<<
};
re();
}
=======
}
//从Up名称解析为UID
async function toUpInfo(upName){
let upUrl = fetch('https://www.acfun.cn/u/' + upName.toString()).then((response)=>{
let upUrl = response.url
return upUrl
})
return upUrl
}
// let uil =await toUpInfo('qyqx')
// console.log(uil)
>>>>>>>
};
re();
}
//从Up名称解析为UID
async function toUpInfo(upName){
let upUrl = fetch('https://www.acfun.cn/u/' + upName.toString()).then((response)=>{
let upUrl = response.url
return upUrl
})
return upUrl
}
// let uil =await toUpInfo('qyqx')
// console.log(uil) |
<<<<<<<
}),
new webpack.optimize.DedupePlugin(),
new BundleAnalyzerPlugin({
analyzerMode: 'static',
defaultSizes: 'gzip',
openAnalyzer: false,
generateStatsFile: true,
reportFilename: 'bundle-stats.html',
statsFilename: 'bundle-stats.json',
}),
=======
})
>>>>>>>
}),
new BundleAnalyzerPlugin({
analyzerMode: 'static',
defaultSizes: 'gzip',
openAnalyzer: false,
generateStatsFile: true,
reportFilename: 'bundle-stats.html',
statsFilename: 'bundle-stats.json',
}) |
<<<<<<<
return Promise.resolve(npmOptions.prefix || defaultPrefix(npmOptions)).then(prefix => {
var fullArgs = [].concat(
=======
return Promise.resolve(npmOptions.prefix || defaultPrefix(npmOptions)).then(function (prefix) {
const fullArgs = [].concat(
>>>>>>>
return Promise.resolve(npmOptions.prefix || defaultPrefix(npmOptions)).then(prefix => {
const fullArgs = [].concat(
<<<<<<<
.then(result => {
var json = parseJson(result, {
=======
.then(function (result) {
const json = parseJson(result, {
>>>>>>>
.then(result => {
const json = parseJson(result, {
<<<<<<<
greatestMajor: function (packageName, currentVersion, pre) {
return view(packageName, 'versions').then(versions => {
var resultVersions = pre ? versions : filterOutPrereleaseVersions(versions);
=======
greatestMajor(packageName, currentVersion, pre) {
return view(packageName, 'versions').then(function (versions) {
const resultVersions = pre ? versions : filterOutPrereleaseVersions(versions);
>>>>>>>
greatestMajor(packageName, currentVersion, pre) {
return view(packageName, 'versions').then(versions => {
const resultVersions = pre ? versions : filterOutPrereleaseVersions(versions);
<<<<<<<
greatestMinor: function (packageName, currentVersion, pre) {
return view(packageName, 'versions').then(versions => {
var resultVersions = pre ? versions : filterOutPrereleaseVersions(versions);
=======
greatestMinor(packageName, currentVersion, pre) {
return view(packageName, 'versions').then(function (versions) {
const resultVersions = pre ? versions : filterOutPrereleaseVersions(versions);
>>>>>>>
greatestMinor(packageName, currentVersion, pre) {
return view(packageName, 'versions').then(versions => {
const resultVersions = pre ? versions : filterOutPrereleaseVersions(versions); |
<<<<<<<
/** Get platform-specific default prefix to pass on to npm.
* @param options.global
* @param options.prefix
*/
function defaultPrefix(options) {
return spawn('npm', ['config', 'get', 'prefix']).then(function(prefix) {
// FIX: for ncu -g doesn't work on homebrew or windows #146
// https://github.com/tjunnone/npm-check-updates/issues/146
return options.prefix || (options.global && prefix.match('Cellar') ? '/usr/local' :
// Workaround: get prefix on windows for global packages
// Only needed when using npm api directly
process.platform === 'win32' && options.global && !process.env.prefix ?
process.env.AppData + '\\npm' :
null)
})
}
module.exports = {
=======
module.exports = {
/**
* @param args.global
* @param args.registry
* @param args.prefix
*/
init: function (args) {
args = args || {};
// use pickBy to eliminate undefined values
return npm.loadAsync(_.pickBy({
silent: true,
global: args.global || undefined,
prefix: args.prefix || undefined
}, _.identity))
.then(function () {
// configure registry
if (args.registry) {
npm.config.set('registry', args.registry);
}
rawPromisify(npm.commands);
// FIX: for ncu -g doesn't work on homebrew or windows #146
// https://github.com/tjunnone/npm-check-updates/issues/146
if (args.global && npm.config.get('prefix').match('Cellar')) {
npm.config.set('prefix', '/usr/local');
}
// Workaround: set prefix on windows for global packages
// Only needed when using npm api directly
if (process.platform === 'win32' && npm.config.get('global') && !process.env.prefix) {
npm.config.set('prefix', process.env.AppData + '\\npm');
}
return initialized = true;
});
},
>>>>>>>
/** Get platform-specific default prefix to pass on to npm.
* @param options.global
* @param options.prefix
*/
function defaultPrefix(options) {
return spawn('npm', ['config', 'get', 'prefix']).then(function(prefix) {
// FIX: for ncu -g doesn't work on homebrew or windows #146
// https://github.com/tjunnone/npm-check-updates/issues/146
return options.prefix || (options.global && prefix.match('Cellar') ? '/usr/local' :
// Workaround: get prefix on windows for global packages
// Only needed when using npm api directly
process.platform === 'win32' && options.global && !process.env.prefix ?
process.env.AppData + '\\npm' :
null)
})
}
module.exports = {
<<<<<<<
.then(function (versions) {
return _.last(pre ? versions : filterOutPrereleaseVersions(versions));
});
=======
.then(_.partialRight(_.pullAll, ['modified', 'created']))
.then(_.last);
>>>>>>>
.then(_.partialRight(_.pullAll, ['modified', 'created']))
.then(function (versions) {
return _.last(pre ? versions : filterOutPrereleaseVersions(versions));
}); |
<<<<<<<
it('should filter by package name with one arg', () => {
var upgraded = ncu.run({
packageData: fs.readFileSync(__dirname + '/ncu/package2.json', 'utf-8'),
=======
it('should filter by package name with one arg', function () {
const upgraded = ncu.run({
packageData: fs.readFileSync(`${__dirname}/ncu/package2.json`, 'utf-8'),
>>>>>>>
it('should filter by package name with one arg', () => {
const upgraded = ncu.run({
packageData: fs.readFileSync(`${__dirname}/ncu/package2.json`, 'utf-8'),
<<<<<<<
it('should filter by package name with multiple args', () => {
var upgraded = ncu.run({
packageData: fs.readFileSync(__dirname + '/ncu/package2.json', 'utf-8'),
=======
it('should filter by package name with multiple args', function () {
const upgraded = ncu.run({
packageData: fs.readFileSync(`${__dirname}/ncu/package2.json`, 'utf-8'),
>>>>>>>
it('should filter by package name with multiple args', () => {
const upgraded = ncu.run({
packageData: fs.readFileSync(`${__dirname}/ncu/package2.json`, 'utf-8'),
<<<<<<<
it('should suggest upgrades to versions within the specified version range if jsonUpraded is true', () => {
var upgraded = ncu.run({
=======
it('should suggest upgrades to versions within the specified version range if jsonUpraded is true', function () {
const upgraded = ncu.run({
>>>>>>>
it('should suggest upgrades to versions within the specified version range if jsonUpraded is true', () => {
const upgraded = ncu.run({
<<<<<<<
it('should not suggest upgrades to versions within the specified version range if jsonUpraded is true and minimial is true', () => {
var upgraded = ncu.run({
=======
it('should not suggest upgrades to versions within the specified version range if jsonUpraded is true and minimial is true', function () {
const upgraded = ncu.run({
>>>>>>>
it('should not suggest upgrades to versions within the specified version range if jsonUpraded is true and minimial is true', () => {
const upgraded = ncu.run({
<<<<<<<
return spawn('node', [process.cwd() + '/bin/ncu'], {cwd: tmp.dirSync().name})
.catch(stderr => {
=======
return spawn('node', [`${process.cwd()}/bin/ncu`], {cwd: tmp.dirSync().name})
.catch(function (stderr) {
>>>>>>>
return spawn('node', [`${process.cwd()}/bin/ncu`], {cwd: tmp.dirSync().name})
.catch(stderr => {
<<<<<<<
it('should read --packageFile', () => {
var tempFile = 'test/temp_package.json';
=======
it('should read --packageFile', function () {
const tempFile = 'test/temp_package.json';
>>>>>>>
it('should read --packageFile', () => {
const tempFile = 'test/temp_package.json';
<<<<<<<
it('should write to --packageFile', () => {
var tempFile = 'test/temp_package.json';
=======
it('should write to --packageFile', function () {
const tempFile = 'test/temp_package.json';
>>>>>>>
it('should write to --packageFile', () => {
const tempFile = 'test/temp_package.json';
<<<<<<<
.catch(() => {
var upgradedPkg = JSON.parse(fs.readFileSync(tempFile, 'utf-8'));
=======
.catch(function () {
const upgradedPkg = JSON.parse(fs.readFileSync(tempFile, 'utf-8'));
>>>>>>>
.catch(() => {
const upgradedPkg = JSON.parse(fs.readFileSync(tempFile, 'utf-8'));
<<<<<<<
it('should ignore stdin if --packageFile is specified', () => {
var tempFile = 'test/temp_package.json';
=======
it('should ignore stdin if --packageFile is specified', function () {
const tempFile = 'test/temp_package.json';
>>>>>>>
it('should ignore stdin if --packageFile is specified', () => {
const tempFile = 'test/temp_package.json';
<<<<<<<
.then(() => {
var upgradedPkg = JSON.parse(fs.readFileSync(tempFile, 'utf-8'));
=======
.then(function () {
const upgradedPkg = JSON.parse(fs.readFileSync(tempFile, 'utf-8'));
>>>>>>>
.then(() => {
const upgradedPkg = JSON.parse(fs.readFileSync(tempFile, 'utf-8'));
<<<<<<<
it('should read --configFilePath', () => {
var tempFilePath = './test/';
var tempFileName = '.ncurc.json';
=======
it('should read --configFilePath', function () {
const tempFilePath = './test/';
const tempFileName = '.ncurc.json';
>>>>>>>
it('should read --configFilePath', () => {
const tempFilePath = './test/';
const tempFileName = '.ncurc.json';
<<<<<<<
it('should read --configFileName', () => {
var tempFilePath = './test/';
var tempFileName = '.rctemp.json';
=======
it('should read --configFileName', function () {
const tempFilePath = './test/';
const tempFileName = '.rctemp.json';
>>>>>>>
it('should read --configFileName', () => {
const tempFilePath = './test/';
const tempFileName = '.rctemp.json';
<<<<<<<
it('should override config with arguments', () => {
var tempFilePath = './test/';
var tempFileName = '.ncurc.json';
=======
it('should override config with arguments', function () {
const tempFilePath = './test/';
const tempFileName = '.ncurc.json';
>>>>>>>
it('should override config with arguments', () => {
const tempFilePath = './test/';
const tempFileName = '.ncurc.json'; |
<<<<<<<
const { colorizeDiff, isGithubUrl, getGithubUrlTag, isNpmAlias, parseNpmAlias } = require('./version-util')
=======
const chalk = require('chalk')
const { colorizeDiff } = require('./version-util')
>>>>>>>
const chalk = require('chalk')
const { colorizeDiff, isGithubUrl, getGithubUrlTag, isNpmAlias, parseNpmAlias } = require('./version-util') |
<<<<<<<
return Promise.map(versions, function (version) {
if (version.isRejected()) {
var reason = version.reason();
// ignore 404's
if (reason.message == 404) { // eslint-disable-line eqeqeq
return null;
} else {
throw new Error(reason);
}
} else {
return version.value();
}
});
})
.then(function (versions) {
=======
>>>>>>>
return Promise.map(versions, function (version) {
if (version.isRejected()) {
var reason = version.reason();
// ignore 404's
if (reason.message == 404) { // eslint-disable-line eqeqeq
return null;
} else {
throw new Error(reason);
}
} else {
return version.value();
}
});
})
.then(function (versions) { |
<<<<<<<
operator_info_div : $operator_info_div,
emptyDiv: $emptyDiv,
=======
input_output : $operator_inputs_outputs,
>>>>>>>
operator_info_div : $operator_info_div,
emptyDiv: $emptyDiv,
input_output : $operator_inputs_outputs,
<<<<<<<
// change to unique color later
fullElement.operator_info_div.css({
"background" : "#F0F0F0",
});
=======
fullElement.input_output.css({
"background" : "url(" + operatorData.properties.image + ")",
"background-size" : "100% 100%"
});
fullElement.title.css({
"background" : operatorData.properties.color,
});
>>>>>>>
// change to unique color later
fullElement.operator_info_div.css({
"background" : operatorData.properties.color,
});
fullElement.input_output.css({
"background" : "url(" + operatorData.properties.image + ")",
"background-size" : "100% 100%"
});
fullElement.title.css({
"background" : operatorData.properties.color,
}); |
<<<<<<<
var defaultRegex = "zika\s*(virus|fever)";
var defaultKeyword = "Zika";
var defaultDict = "SampleDict1.txt";
var defaultFuzzy = "FuzzyWuzzy";
var thresholdRatio = 0.8;
var nlpArray = ["noun", "verb", "adjective", "adverb", "ne_all", "number", "location", "person", "organization", "money", "percent", "date", "time"];
var defaultNlp = "ne_all";
var defaultDataSource = "collection name";
var defaultFileSink = "output.txt";
var defaultAttributeID = "John";
var defaultPredicateType = "CharacterDistance";
var defaultDistance = 10;
var defaultAttributes = "first name, last name";
var defaultLimit = 10;
var defaultOffset = 5;
=======
var DEFAULT_KEYWORD = "Zika";
var DEFAULT_REGEX = "zika\s*(virus|fever)";
var DEFAULT_ATTRIBUTES = "first name, last name";
var DEFAULT_LIMIT = 10;
var DEFAULT_OFFSET = 5;
>>>>>>>
var defaultDict = "SampleDict1.txt";
var defaultFuzzy = "FuzzyWuzzy";
var thresholdRatio = 0.8;
var nlpArray = ["noun", "verb", "adjective", "adverb", "ne_all", "number", "location", "person", "organization", "money", "percent", "date", "time"];
var defaultNlp = "ne_all";
var defaultDataSource = "collection name";
var defaultFileSink = "output.txt";
var defaultAttributeID = "John";
var defaultPredicateType = "CharacterDistance";
var defaultDistance = 10;
var DEFAULT_KEYWORD = "Zika";
var DEFAULT_REGEX = "zika\s*(virus|fever)";
var DEFAULT_ATTRIBUTES = "first name, last name";
var DEFAULT_LIMIT = 10;
var DEFAULT_OFFSET = 5; |
<<<<<<<
exports.canonicalHeaderName = canonicalHeaderName;
function canonicalHeaderName(name) {
=======
exports.canonicalHeaderName = function (name) {
>>>>>>>
exports.canonicalHeaderName = canonicalHeaderName;
function canonicalHeaderName(name) {
<<<<<<<
exports.capitalizedHeaderName = capitalizedHeaderName;
function capitalizedHeaderName(name) {
return canonicalHeaderName(name).replace(/-/g, '');
}
=======
exports.capitalizedHeaderName = function (name) {
return exports.canonicalHeaderName(name).replace(/-/g, '');
};
>>>>>>>
exports.capitalizedHeaderName = capitalizedHeaderName;
function capitalizedHeaderName(name) {
return canonicalHeaderName(name).replace(/-/g, '');
}
<<<<<<<
exports.propertyName = propertyName;
function propertyName(name) {
var capitalName = capitalizedHeaderName(name)
=======
exports.propertyName = function (name) {
var capitalName = exports.capitalizedHeaderName(name)
>>>>>>>
exports.propertyName = propertyName;
function propertyName(name) {
var capitalName = capitalizedHeaderName(name)
<<<<<<<
exports.byteSizeFormat = byteSizeFormat;
function byteSizeFormat(size) {
=======
exports.byteSizeFormat = function (size) {
>>>>>>>
exports.byteSizeFormat = byteSizeFormat;
function byteSizeFormat(size) {
<<<<<<<
exports.escapeHtml = escapeHtml;
function escapeHtml(string) {
=======
exports.escapeHtml = function (string) {
>>>>>>>
exports.escapeHtml = escapeHtml;
function escapeHtml(string) {
<<<<<<<
exports.escapeRe = escapeRe;
function escapeRe(string) {
=======
exports.escapeRe = function (string) {
>>>>>>>
exports.escapeRe = escapeRe;
function escapeRe(string) {
<<<<<<<
exports.compileRoute = compileRoute;
function compileRoute(route, keys) {
=======
exports.compileRoute = function (route, keys) {
>>>>>>>
exports.compileRoute = compileRoute;
function compileRoute(route, keys) {
<<<<<<<
exports.isEmptyObject = isEmptyObject;
function isEmptyObject(obj) {
=======
exports.isSafeRequestMethod = function (requestMethod) {
return exports.SAFE_REQUEST_METHODS.indexOf(requestMethod.toUpperCase()) !== -1;
};
/**
* Returns true if the given obj has no enumerable properties.
*/
exports.isEmptyObject = function (obj) {
>>>>>>>
exports.isSafeRequestMethod = isSafeRequestMethod;
function isSafeRequestMethod(requestMethod) {
return SAFE_REQUEST_METHODS.indexOf(requestMethod.toUpperCase()) !== -1;
}
/**
* Converts the given header name to its canonical form.
*
* "accept" => "Accept"
* "content-type" => "Content-Type"
* "x-forwarded-ssl" => "X-Forwarded-Ssl"
*/
exports.canonicalHeaderName = canonicalHeaderName;
function canonicalHeaderName(name) {
return name.toLowerCase().replace(/(^|-)([a-z])/g, function (s, a, b) {
return a + b.toUpperCase();
});
}
/**
* Converts the given header name to a string of that name that is
* capitalized, sans dashes.
*
* "accept" => "Accept"
* "content-type" => "ContentType"
* "x-forwarded-ssl" => "XForwardedSsl"
*/
exports.capitalizedHeaderName = capitalizedHeaderName;
function capitalizedHeaderName(name) {
return canonicalHeaderName(name).replace(/-/g, '');
}
/**
* Converts the given header name to a string that could be used as a
* JavaScript object property name.
*
* "accept" => "accept"
* "content-type" => "contentType"
* "x-forwarded-ssl" => "xForwardedSsl"
*/
exports.propertyName = propertyName;
function propertyName(name) {
var capitalName = capitalizedHeaderName(name)
return capitalName.substring(0, 1).toLowerCase() + capitalName.substring(1);
}
/**
* Returns a human-friendly string of the given byte size.
*/
exports.byteSizeFormat = byteSizeFormat;
function byteSizeFormat(size) {
var tier = size > 0 ? Math.floor(Math.log(size) / Math.log(1024)) : 0;
var n = size / Math.pow(1024, tier);
if (tier > 0) {
n = Math.floor(n * 10) / 10; // Preserve only 1 digit after decimal.
}
return String(n) + ['B', 'K', 'M', 'G', 'T'][tier];
}
var escapeMap = {
'&': '&',
'<': '<',
'>': '>',
'"': '"',
"'": '''
};
/**
* Escapes all special HTML characters in the given string.
*/
exports.escapeHtml = escapeHtml;
function escapeHtml(string) {
return String(string).replace(/[&<>"']/g, function (c) {
return escapeMap[c];
});
}
/**
* Escapes all special regular expression characters in the given string.
*/
exports.escapeRe = escapeRe;
function escapeRe(string) {
return String(string).replace(/([.?*+^$[\]\\(){}-])/g, '\\$1');
}
/**
* Compiles the given route string into a RegExp that can be used to match
* it. The route may contain named keys in the form of a colon followed by a
* valid JavaScript identifier (e.g. ":name", ":_name", or ":$name" are all
* valid keys). If it does, these keys will be added to the given keys array.
*
* If the route contains the special "*" symbol, it will automatically create a
* key named "splat" and will substituted with a "(.*?)" pattern in the
* resulting RegExp.
*/
exports.compileRoute = compileRoute;
function compileRoute(route, keys) {
var pattern = route.replace(/((:[a-z_$][a-z0-9_$]*)|[*.+()])/ig, function (match) {
switch (match) {
case '*':
keys.push('splat');
return '(.*?)';
case '.':
case '+':
case '(':
case ')':
return exports.escapeRe(match);
}
keys.push(match.substring(1));
return '([^./?#]+)';
});
return new RegExp('^' + pattern + '$');
}
/**
* Returns true if the given obj has no enumerable properties.
*/
exports.isEmptyObject = isEmptyObject;
function isEmptyObject(obj) {
<<<<<<<
exports.compareLength = compareLength;
function compareLength(a, b) {
if (a.length < b.length) {
return -1;
}
if (b.length < a.length) {
return 1;
}
return 0;
}
=======
exports.compareLength = function (a, b) {
return (a.length < b.length) ? -1 : (b.length < a.length ? 1 : 0);
};
>>>>>>>
exports.compareLength = compareLength;
function compareLength(a, b) {
return (a.length < b.length) ? -1 : (b.length < a.length ? 1 : 0);
}
<<<<<<<
}
// A helper for returning a 404 Not Found response.
exports.notFound = notFound;
function notFound(env, callback) {
=======
};
exports.notFound = function (env, callback) {
>>>>>>>
}
// A helper for returning a 404 Not Found response.
exports.notFound = notFound;
function notFound(env, callback) {
<<<<<<<
}
exports.ok = makeResponderForStatus(200);
exports.badRequest = makeResponderForStatus(400);
exports.forbidden = makeResponderForStatus(403);
exports.serverError = makeResponderForStatus(500);
=======
};
>>>>>>>
}
exports.ok = makeResponderForStatus(200);
exports.badRequest = makeResponderForStatus(400);
exports.forbidden = makeResponderForStatus(403);
exports.serverError = makeResponderForStatus(500); |
<<<<<<<
.concat([[undoItem, redoItem]])
export const edMenuPlugin = new Plugin({
props: {
menuContent: edBarMenu,
floatingMenu: false,
},
})
export const edMenuEmptyPlugin = new Plugin({
props: {
menuContent: [],
floatingMenu: false,
},
})
=======
.concat([[undoItem, redoItem]])
// Monkeypatch menu with feature flags
export function patchMenuWithFeatureFlags (featureFlags) {
function returnFalse () { return false }
if (featureFlags.edCta === false) {
menuCta.spec.class = 'flaggedFeature'
menuCta.spec.run = returnFalse
}
if (featureFlags.edEmbed === false) {
menuUserhtml.spec.class = 'flaggedFeature'
menuUserhtml.spec.run = returnFalse
}
return edBarMenu
}
>>>>>>>
.concat([[undoItem, redoItem]])
export const edMenuPlugin = new Plugin({
props: {
menuContent: edBarMenu,
floatingMenu: false,
},
})
export const edMenuEmptyPlugin = new Plugin({
props: {
menuContent: [],
floatingMenu: false,
},
})
// Monkeypatch menu with feature flags
export function patchMenuWithFeatureFlags (featureFlags) {
function returnFalse () { return false }
if (featureFlags.edCta === false) {
menuCta.spec.class = 'flaggedFeature'
menuCta.spec.run = returnFalse
}
if (featureFlags.edEmbed === false) {
menuUserhtml.spec.class = 'flaggedFeature'
menuUserhtml.spec.run = returnFalse
}
} |
<<<<<<<
import {isMediaType} from './convert/types'
=======
import './menu/context-menu'
>>>>>>>
import {isMediaType} from './convert/types'
import './menu/context-menu'
<<<<<<<
// Plugins setup
this.pluginContainer = document.createElement('div')
this.pluginContainer.className = 'EdPlugins'
this.container.appendChild(this.pluginContainer)
let plugins = [PluginWidget, UrlEmbedder, CodeEmbedder]
=======
let plugins = [PluginWidget, CodeEmbedder]
>>>>>>>
// Plugins setup
this.pluginContainer = document.createElement('div')
this.pluginContainer.className = 'EdPlugins'
this.container.appendChild(this.pluginContainer)
let plugins = [PluginWidget, CodeEmbedder] |
<<<<<<<
let str = await request('http://localhost:3000/201')
same(str, 'ok')
=======
let str = await request(u('/echo.js?statusCode=201&body=ok'))
t.same(str, 'ok')
>>>>>>>
let str = await request(u('/echo.js?statusCode=201&body=ok'))
same(str, 'ok')
<<<<<<<
same(buffer.toString(), 'hello world')
=======
t.same(buffer.toString(), 'ok')
>>>>>>>
same(buffer.toString(), 'ok') |
<<<<<<<
this.scriptingEvents.assertConvoBegin({convo: this, container: container})
.catch(err => {
reject(new Error(`${this.header.name}: error on ConvoBegin assertion ${util.inspect(err)}`))
})
async.mapSeries(this.conversation,
=======
let lastMeMsg = null
async.eachSeries(this.conversation,
>>>>>>>
this.scriptingEvents.assertConvoBegin({convo: this, container: container})
.catch(err => {
reject(new Error(`${this.header.name}: error on ConvoBegin assertion ${util.inspect(err)}`))
})
let lastMeMsg = null
async.eachSeries(this.conversation,
<<<<<<<
container.UserSays(new BotiumMockMessage(convoStep))
.then(() => convoStepDone(null, {me: convoStep.messageText, bot: null}))
=======
new Promise(resolve => {
if (container.caps.SIMULATE_WRITING_SPEED && convoStep.messageText && convoStep.messageText.length) {
setTimeout(() => resolve(), container.caps.SIMULATE_WRITING_SPEED * convoStep.messageText.length)
} else {
resolve()
}
})
.then(() => {
lastMeMsg = convoStep
return container.UserSays(new BotiumMockMessage(convoStep))
})
.then(() => convoStepDone())
>>>>>>>
new Promise(resolve => {
if (container.caps.SIMULATE_WRITING_SPEED && convoStep.messageText && convoStep.messageText.length) {
setTimeout(() => resolve(), container.caps.SIMULATE_WRITING_SPEED * convoStep.messageText.length)
} else {
resolve()
}
})
.then(() => {
lastMeMsg = convoStep
return container.UserSays(new BotiumMockMessage(convoStep))
})
.then(() => convoStepDone(null, {me: convoStep.messageText, bot: null})) |
<<<<<<<
let hasMessageText = false
const jsonPathsTexts = this._getAllCapValues(Capabilities.SIMPLEREST_RESPONSE_JSONPATH)
for (const jsonPath of jsonPathsTexts) {
debug(`eval json path ${jsonPath}`)
=======
let hasMessageText = false
const jsonPathsTexts = this._getAllCapValues(Capabilities.SIMPLEREST_RESPONSE_JSONPATH)
jsonPathsTexts.forEach(jsonPath => {
debug(`eval json path ${jsonPath}`)
>>>>>>>
let hasMessageText = false
const jsonPathsTexts = this._getAllCapValues(Capabilities.SIMPLEREST_RESPONSE_JSONPATH)
for (const jsonPath of jsonPathsTexts) {
debug(`eval json path ${jsonPath}`)
<<<<<<<
return this._buildRequest(msg)
.then((requestOptions) => new Promise((resolve, reject) => {
debug(`constructed requestOptions ${JSON.stringify(requestOptions, null, 2)}`)
=======
return new Promise((resolve, reject) => {
const requestOptions = this._buildRequest(msg)
debug(`constructed requestOptions ${JSON.stringify(requestOptions, null, 2)}`)
msg.sourceData = msg.sourceData || {}
msg.sourceData.requestOptions = requestOptions
>>>>>>>
return this._buildRequest(msg)
.then((requestOptions) => new Promise((resolve, reject) => {
debug(`constructed requestOptions ${JSON.stringify(requestOptions, null, 2)}`)
msg.sourceData = msg.sourceData || {}
msg.sourceData.requestOptions = requestOptions
<<<<<<<
debug(`_waitForPingUrl success on url check ${pingConfig.uri}: ${err}`)
return body
=======
debug(`_waitForPingUrl success on url check ${pingConfig.uri}`)
return response
>>>>>>>
debug(`_waitForPingUrl success on url check ${pingConfig.uri}`)
return body |
<<<<<<<
it('should match case sensitive response', async function () {
assert.isTrue(this.compiler.Match('This is a long text', 'This .*'))
})
it('should not match uppercase response', async function () {
assert.isFalse(this.compiler.Match('THIS is a long text', 'This .*'))
})
})
describe('matching.matchingmode.regexpIgnoreCase', function () {
beforeEach(async function () {
const myCaps = {
[Capabilities.PROJECTNAME]: 'matching.matchingmode',
[Capabilities.CONTAINERMODE]: echoConnector,
[Capabilities.SCRIPTING_MATCHING_MODE]: 'regexpIgnoreCase'
}
const driver = new BotDriver(myCaps)
this.compiler = driver.BuildCompiler()
this.container = await driver.Build()
})
afterEach(async function () {
this.container && await this.container.Clean()
})
it('should check matching with regex', async function () {
this.compiler.ReadScript(path.resolve(__dirname, 'convos'), 'regex.convo.txt')
await this.compiler.convos[0].Run(this.container)
})
it('should match case sensitive response', async function () {
assert.isTrue(this.compiler.Match('This is a long text', 'This .*'))
})
it('should match uppercase response', async function () {
assert.isTrue(this.compiler.Match('THIS is a long text', 'This .*'))
})
})
describe('matching.matchingmode.include', function () {
beforeEach(async function () {
const myCaps = {
[Capabilities.PROJECTNAME]: 'matching.matchingmode',
[Capabilities.CONTAINERMODE]: echoConnector,
[Capabilities.SCRIPTING_MATCHING_MODE]: 'include'
}
const driver = new BotDriver(myCaps)
this.compiler = driver.BuildCompiler()
this.container = await driver.Build()
})
afterEach(async function () {
this.container && await this.container.Clean()
})
it('should match int response with string', async function () {
assert.isTrue(this.compiler.Match(123, '123'))
})
it('should match JSON response with string', async function () {
assert.isTrue(this.compiler.Match({ myvalue: 123 }, '123'))
})
})
describe('matching.matchingmode.wildcard', function () {
beforeEach(async function () {
const myCaps = {
[Capabilities.PROJECTNAME]: 'matching.matchingmode',
[Capabilities.CONTAINERMODE]: echoConnector,
[Capabilities.SCRIPTING_MATCHING_MODE]: 'wildcard'
}
const driver = new BotDriver(myCaps)
this.compiler = driver.BuildCompiler()
this.container = await driver.Build()
})
afterEach(async function () {
this.container && await this.container.Clean()
})
it('should match long response with wildcard', async function () {
assert.isTrue(this.compiler.Match('this is a long text', 'this is a * text'))
})
it('should match very long response with wildcard', async function () {
assert.isTrue(this.compiler.Match('this is a long text this is a long text this is a long text this is a long text', 'this is a * text this is a * text this is a * text'))
})
it('should not match long uppcercase response with wildcard', async function () {
assert.isFalse(this.compiler.Match('THIS IS A LONG TEXT', 'this is a * text'))
})
it('should match very long response with very long wildcard', async function () {
assert.isTrue(this.compiler.Match('begin this is a long text this is a long text this is a long text this is a long text end', 'begin * end'))
})
})
describe('matching.matchingmode.wildcardIgnoreCase', function () {
beforeEach(async function () {
const myCaps = {
[Capabilities.PROJECTNAME]: 'matching.matchingmode',
[Capabilities.CONTAINERMODE]: echoConnector,
[Capabilities.SCRIPTING_MATCHING_MODE]: 'wildcardIgnoreCase'
}
const driver = new BotDriver(myCaps)
this.compiler = driver.BuildCompiler()
this.container = await driver.Build()
})
afterEach(async function () {
this.container && await this.container.Clean()
})
it('should match long response with wildcard', async function () {
assert.isTrue(this.compiler.Match('this is a long text', 'this is a * text'))
})
it('should match long uppcercase response with wildcard', async function () {
assert.isTrue(this.compiler.Match('THIS IS A LONG TEXT', 'this is a * text'))
})
=======
})
describe('matching.matchingmode.include', function () {
beforeEach(async function () {
const myCaps = {
[Capabilities.PROJECTNAME]: 'matching.matchingmode',
[Capabilities.CONTAINERMODE]: echoConnector,
[Capabilities.SCRIPTING_MATCHING_MODE]: 'include'
}
const driver = new BotDriver(myCaps)
this.compiler = driver.BuildCompiler()
this.container = await driver.Build()
})
afterEach(async function () {
this.container && await this.container.Clean()
})
it('should match int response with string', async function () {
assert.isTrue(this.compiler.Match(123, '123'))
})
it('should match JSON response with string', async function () {
assert.isTrue(this.compiler.Match({ myvalue: 123 }, '123'))
})
>>>>>>>
it('should match case sensitive response', async function () {
assert.isTrue(this.compiler.Match('This is a long text', 'This .*'))
})
it('should not match uppercase response', async function () {
assert.isFalse(this.compiler.Match('THIS is a long text', 'This .*'))
})
})
describe('matching.matchingmode.regexpIgnoreCase', function () {
beforeEach(async function () {
const myCaps = {
[Capabilities.PROJECTNAME]: 'matching.matchingmode',
[Capabilities.CONTAINERMODE]: echoConnector,
[Capabilities.SCRIPTING_MATCHING_MODE]: 'regexpIgnoreCase'
}
const driver = new BotDriver(myCaps)
this.compiler = driver.BuildCompiler()
this.container = await driver.Build()
})
afterEach(async function () {
this.container && await this.container.Clean()
})
it('should check matching with regex', async function () {
this.compiler.ReadScript(path.resolve(__dirname, 'convos'), 'regex.convo.txt')
await this.compiler.convos[0].Run(this.container)
})
it('should match case sensitive response', async function () {
assert.isTrue(this.compiler.Match('This is a long text', 'This .*'))
})
it('should match uppercase response', async function () {
assert.isTrue(this.compiler.Match('THIS is a long text', 'This .*'))
})
})
describe('matching.matchingmode.include', function () {
beforeEach(async function () {
const myCaps = {
[Capabilities.PROJECTNAME]: 'matching.matchingmode',
[Capabilities.CONTAINERMODE]: echoConnector,
[Capabilities.SCRIPTING_MATCHING_MODE]: 'include'
}
const driver = new BotDriver(myCaps)
this.compiler = driver.BuildCompiler()
this.container = await driver.Build()
})
afterEach(async function () {
this.container && await this.container.Clean()
})
it('should match int response with string', async function () {
assert.isTrue(this.compiler.Match(123, '123'))
})
it('should match JSON response with string', async function () {
assert.isTrue(this.compiler.Match({ myvalue: 123 }, '123'))
})
})
describe('matching.matchingmode.wildcard', function () {
beforeEach(async function () {
const myCaps = {
[Capabilities.PROJECTNAME]: 'matching.matchingmode',
[Capabilities.CONTAINERMODE]: echoConnector,
[Capabilities.SCRIPTING_MATCHING_MODE]: 'wildcard'
}
const driver = new BotDriver(myCaps)
this.compiler = driver.BuildCompiler()
this.container = await driver.Build()
})
afterEach(async function () {
this.container && await this.container.Clean()
})
it('should match long response with wildcard', async function () {
assert.isTrue(this.compiler.Match('this is a long text', 'this is a * text'))
})
it('should match very long response with wildcard', async function () {
assert.isTrue(this.compiler.Match('this is a long text this is a long text this is a long text this is a long text', 'this is a * text this is a * text this is a * text'))
})
it('should not match long uppcercase response with wildcard', async function () {
assert.isFalse(this.compiler.Match('THIS IS A LONG TEXT', 'this is a * text'))
})
it('should match very long response with very long wildcard', async function () {
assert.isTrue(this.compiler.Match('begin this is a long text this is a long text this is a long text this is a long text end', 'begin * end'))
})
})
describe('matching.matchingmode.wildcardIgnoreCase', function () {
beforeEach(async function () {
const myCaps = {
[Capabilities.PROJECTNAME]: 'matching.matchingmode',
[Capabilities.CONTAINERMODE]: echoConnector,
[Capabilities.SCRIPTING_MATCHING_MODE]: 'wildcardIgnoreCase'
}
const driver = new BotDriver(myCaps)
this.compiler = driver.BuildCompiler()
this.container = await driver.Build()
})
afterEach(async function () {
this.container && await this.container.Clean()
})
it('should match long response with wildcard', async function () {
assert.isTrue(this.compiler.Match('this is a long text', 'this is a * text'))
})
it('should match long uppcercase response with wildcard', async function () {
assert.isTrue(this.compiler.Match('THIS IS A LONG TEXT', 'this is a * text'))
})
})
describe('matching.matchingmode.include', function () {
beforeEach(async function () {
const myCaps = {
[Capabilities.PROJECTNAME]: 'matching.matchingmode',
[Capabilities.CONTAINERMODE]: echoConnector,
[Capabilities.SCRIPTING_MATCHING_MODE]: 'include'
}
const driver = new BotDriver(myCaps)
this.compiler = driver.BuildCompiler()
this.container = await driver.Build()
})
afterEach(async function () {
this.container && await this.container.Clean()
})
it('should match int response with string', async function () {
assert.isTrue(this.compiler.Match(123, '123'))
})
it('should match JSON response with string', async function () {
assert.isTrue(this.compiler.Match({ myvalue: 123 }, '123'))
}) |
<<<<<<<
let hasMessageText = false
const jsonPathsTexts = this._getAllCapValues(Capabilities.SIMPLEREST_RESPONSE_JSONPATH)
for (const jsonPath of jsonPathsTexts) {
debug(`eval json path ${jsonPath}`)
=======
let hasMessageText = false
const jsonPathsTexts = this._getAllCapValues(Capabilities.SIMPLEREST_RESPONSE_JSONPATH)
jsonPathsTexts.forEach(jsonPath => {
debug(`eval json path ${jsonPath}`)
>>>>>>>
let hasMessageText = false
const jsonPathsTexts = this._getAllCapValues(Capabilities.SIMPLEREST_RESPONSE_JSONPATH)
for (const jsonPath of jsonPathsTexts) {
debug(`eval json path ${jsonPath}`)
<<<<<<<
return this._buildRequest(msg)
.then((requestOptions) => new Promise((resolve, reject) => {
debug(`constructed requestOptions ${JSON.stringify(requestOptions, null, 2)}`)
=======
return new Promise((resolve, reject) => {
const requestOptions = this._buildRequest(msg)
debug(`constructed requestOptions ${JSON.stringify(requestOptions, null, 2)}`)
msg.sourceData = msg.sourceData || {}
msg.sourceData.requestOptions = requestOptions
>>>>>>>
return this._buildRequest(msg)
.then((requestOptions) => new Promise((resolve, reject) => {
debug(`constructed requestOptions ${JSON.stringify(requestOptions, null, 2)}`)
msg.sourceData = msg.sourceData || {}
msg.sourceData.requestOptions = requestOptions
<<<<<<<
debug(`_waitForPingUrl success on url check ${pingConfig.uri}: ${err}`)
return body
=======
debug(`_waitForPingUrl success on url check ${pingConfig.uri}`)
return response
>>>>>>>
debug(`_waitForPingUrl success on url check ${pingConfig.uri}`)
return body |
<<<<<<<
change(date(2020, 3, 30), <>Added <SpellLink id={SPELLS.ESSENCE_OF_THE_FOCUSING_IRIS_RANK_THREE_FOUR.id} /> and <SpellLink id={SPELLS.FOCUSED_ENERGY_BUFF.id} />.</>, Putro),
=======
change(date(2020, 3, 16), "Add the possibility to modify stat multipliers to be able to support some of the new corruption effects.", niseko),
>>>>>>>
change(date(2020, 3, 30), <>Added <SpellLink id={SPELLS.ESSENCE_OF_THE_FOCUSING_IRIS_RANK_THREE_FOUR.id} /> and <SpellLink id={SPELLS.FOCUSED_ENERGY_BUFF.id} />.</>, Putro),
change(date(2020, 3, 30), "Add the possibility to modify stat multipliers to be able to support some of the new corruption effects.", niseko), |
<<<<<<<
const DEFAULT_ASSERTERS = [
{ name: 'BUTTONS', className: 'ButtonsAsserter' },
{ name: 'MEDIA', className: 'MediaAsserter' },
{ name: 'CARDS', className: 'CardsAsserter' },
{ name: 'PAUSE_ASSERTER', className: 'PauseAsserter' },
{ name: 'ENTITIES', className: 'EntitiesAsserter' },
{ name: 'ENTITY_VALUES', className: 'EntityValuesAsserter' },
{ name: 'INTENT', className: 'IntentAsserter' },
{ name: 'INTENT_UNIQUE', className: 'IntentUniqueAsserter' },
{ name: 'INTENT_CONFIDENCE', className: 'IntentConfidenceAsserter' },
{ name: 'JSON_PATH', className: 'JsonPathAsserter' },
{ name: 'RESPONSE_LENGTH', className: 'ResponseLengthAsserter' }
]
=======
>>>>>>> |
<<<<<<<
new Promise(resolve => {
if (container.caps.SIMULATE_WRITING_SPEED) {
setTimeout(() => resolve(), container.caps.SIMULATE_WRITING_SPEED * convoStep.messageText.length)
} else {
resolve()
}
})
.then(() => container.UserSays(new BotiumMockMessage(convoStep)))
=======
lastMeMsg = convoStep
container.UserSays(new BotiumMockMessage(convoStep))
>>>>>>>
new Promise(resolve => {
if (container.caps.SIMULATE_WRITING_SPEED) {
setTimeout(() => resolve(), container.caps.SIMULATE_WRITING_SPEED * convoStep.messageText.length)
} else {
resolve()
}
})
.then(() => container.UserSays(new BotiumMockMessage(convoStep)))
lastMeMsg = convoStep
container.UserSays(new BotiumMockMessage(convoStep)) |
<<<<<<<
scriptingMemory = scriptingMemory || {}
=======
str = toString(str)
>>>>>>>
scriptingMemory = scriptingMemory || {}
str = toString(str) |
<<<<<<<
const instanceId = ctx.user.instanceId
const db = new CouchDB(instanceId)
let record = await db.get(ctx.params.id)
=======
const db = new CouchDB(ctx.user.instanceId)
let record = await db.get(ctx.params.id)
>>>>>>>
const instanceId = ctx.user.instanceId
const db = new CouchDB(instanceId)
let record = await db.get(ctx.params.id)
<<<<<<<
const instanceId = ctx.user.instanceId
const db = new CouchDB(instanceId)
let record = ctx.request.body
=======
const db = new CouchDB(ctx.user.instanceId)
let record = ctx.request.body
>>>>>>>
const instanceId = ctx.user.instanceId
const db = new CouchDB(instanceId)
let record = ctx.request.body
<<<<<<<
}
exports.fetchEnrichedRecord = async function(ctx) {
const instanceId = ctx.user.instanceId
const db = new CouchDB(instanceId)
const modelId = ctx.params.modelId
const recordId = ctx.params.recordId
if (instanceId == null || modelId == null || recordId == null) {
ctx.status = 400
ctx.body = {
status: 400,
error:
"Cannot handle request, URI params have not been successfully prepared.",
}
return
}
// // need model to work out where links go in record
const modelAndRecord = await Promise.all([db.get(modelId), db.get(recordId)])
const model = modelAndRecord[0]
const record = modelAndRecord[1]
// get the link docs
const linkVals = await linkRecords.getLinkDocuments({
instanceId,
modelId,
recordId,
})
// look up the actual records based on the ids
const response = await db.allDocs({
include_docs: true,
keys: linkVals.map(linkVal => linkVal.id),
})
// need to include the IDs in these records for any links they may have
let linkedRecords = await linkRecords.attachLinkInfo(
instanceId,
response.rows.map(row => row.doc)
)
// insert the link records in the correct place throughout the main record
for (let fieldName of Object.keys(model.schema)) {
let field = model.schema[fieldName]
if (field.type === "link") {
record[fieldName] = linkedRecords.filter(
linkRecord => linkRecord.modelId === field.modelId
)
}
}
ctx.body = record
ctx.status = 200
=======
}
function coerceRecordValues(rec, model) {
const record = cloneDeep(rec)
for (let [key, value] of Object.entries(record)) {
const field = model.schema[key]
if (!field) continue
// eslint-disable-next-line no-prototype-builtins
if (TYPE_TRANSFORM_MAP[field.type].hasOwnProperty(value)) {
record[key] = TYPE_TRANSFORM_MAP[field.type][value]
} else if (TYPE_TRANSFORM_MAP[field.type].parse) {
record[key] = TYPE_TRANSFORM_MAP[field.type].parse(value)
}
}
return record
}
const TYPE_TRANSFORM_MAP = {
string: {
"": "",
[null]: "",
[undefined]: undefined,
},
number: {
"": null,
[null]: null,
[undefined]: undefined,
parse: n => parseFloat(n),
},
datetime: {
"": null,
[undefined]: undefined,
[null]: null,
},
attachment: {
"": [],
[null]: [],
[undefined]: undefined,
},
boolean: {
"": null,
[null]: null,
[undefined]: undefined,
true: true,
false: false,
},
>>>>>>>
}
exports.fetchEnrichedRecord = async function(ctx) {
const instanceId = ctx.user.instanceId
const db = new CouchDB(instanceId)
const modelId = ctx.params.modelId
const recordId = ctx.params.recordId
if (instanceId == null || modelId == null || recordId == null) {
ctx.status = 400
ctx.body = {
status: 400,
error:
"Cannot handle request, URI params have not been successfully prepared.",
}
return
}
// // need model to work out where links go in record
const modelAndRecord = await Promise.all([db.get(modelId), db.get(recordId)])
const model = modelAndRecord[0]
const record = modelAndRecord[1]
// get the link docs
const linkVals = await linkRecords.getLinkDocuments({
instanceId,
modelId,
recordId,
})
// look up the actual records based on the ids
const response = await db.allDocs({
include_docs: true,
keys: linkVals.map(linkVal => linkVal.id),
})
// need to include the IDs in these records for any links they may have
let linkedRecords = await linkRecords.attachLinkInfo(
instanceId,
response.rows.map(row => row.doc)
)
// insert the link records in the correct place throughout the main record
for (let fieldName of Object.keys(model.schema)) {
let field = model.schema[fieldName]
if (field.type === "link") {
record[fieldName] = linkedRecords.filter(
linkRecord => linkRecord.modelId === field.modelId
)
}
}
ctx.body = record
ctx.status = 200
}
function coerceRecordValues(rec, model) {
const record = cloneDeep(rec)
for (let [key, value] of Object.entries(record)) {
const field = model.schema[key]
if (!field) continue
// eslint-disable-next-line no-prototype-builtins
if (TYPE_TRANSFORM_MAP[field.type].hasOwnProperty(value)) {
record[key] = TYPE_TRANSFORM_MAP[field.type][value]
} else if (TYPE_TRANSFORM_MAP[field.type].parse) {
record[key] = TYPE_TRANSFORM_MAP[field.type].parse(value)
}
}
return record
}
const TYPE_TRANSFORM_MAP = {
string: {
"": "",
[null]: "",
[undefined]: undefined,
},
number: {
"": null,
[null]: null,
[undefined]: undefined,
parse: n => parseFloat(n),
},
datetime: {
"": null,
[undefined]: undefined,
[null]: null,
},
attachment: {
"": [],
[null]: [],
[undefined]: undefined,
},
boolean: {
"": null,
[null]: null,
[undefined]: undefined,
true: true,
false: false,
}, |
<<<<<<<
const { username, password, name, roleId } = ctx.request.body
=======
const { email, password, name, accessLevelId, permissions } = ctx.request.body
>>>>>>>
const { email, username, password, name, roleId } = ctx.request.body |
<<<<<<<
const { email, username, password, name, roleId } = ctx.request.body
=======
const { email, password, accessLevelId, permissions } = ctx.request.body
>>>>>>>
const { email, password, roleId } = ctx.request.body |
<<<<<<<
{
spell: SPELLS.EARTH_ELEMENTAL,
category: Abilities.SPELL_CATEGORIES.UTILITY,
cooldown: 300,
gcd: {
base: 1500,
},
timelineSortIndex: 80,
},
=======
{
spell: SPELLS.NATURES_GUARDIAN_TALENT,
category: Abilities.SPELL_CATEGORIES.DEFENSIVE,
cooldown: 45,
enabled: combatant.hasTalent(SPELLS.NATURES_GUARDIAN_TALENT.id),
},
>>>>>>>
{
spell: SPELLS.EARTH_ELEMENTAL,
category: Abilities.SPELL_CATEGORIES.UTILITY,
cooldown: 300,
gcd: {
base: 1500,
},
timelineSortIndex: 80,
},
{
spell: SPELLS.NATURES_GUARDIAN_TALENT,
category: Abilities.SPELL_CATEGORIES.DEFENSIVE,
cooldown: 45,
enabled: combatant.hasTalent(SPELLS.NATURES_GUARDIAN_TALENT.id),
}, |
<<<<<<<
ctx.eventEmitter.emit(`record:save`, {
record,
instanceId: ctx.params.instanceId,
})
=======
>>>>>>>
ctx.eventEmitter.emit(`record:save`, {
record,
instanceId: ctx.params.instanceId,
})
<<<<<<<
ctx.eventEmitter.emit(`record:delete`, record)
=======
}
exports.validate = async function(ctx) {
const errors = await validate({
instanceId: ctx.params.instanceId,
modelId: ctx.params.modelId,
record: ctx.request.body,
})
ctx.status = 200
ctx.body = errors
}
async function validate({ instanceId, modelId, record, model }) {
if (!model) {
const db = new CouchDB(instanceId)
model = await db.get(modelId)
}
const errors = {}
for (let fieldName in model.schema) {
const res = validateJs.single(
record[fieldName],
model.schema[fieldName].constraints
)
if (res) errors[fieldName] = res
}
return { valid: Object.keys(errors).length === 0, errors }
>>>>>>>
ctx.eventEmitter.emit(`record:delete`, record)
}
exports.validate = async function(ctx) {
const errors = await validate({
instanceId: ctx.params.instanceId,
modelId: ctx.params.modelId,
record: ctx.request.body,
})
ctx.status = 200
ctx.body = errors
}
async function validate({ instanceId, modelId, record, model }) {
if (!model) {
const db = new CouchDB(instanceId)
model = await db.get(modelId)
}
const errors = {}
for (let fieldName in model.schema) {
const res = validateJs.single(
record[fieldName],
model.schema[fieldName].constraints
)
if (res) errors[fieldName] = res
}
return { valid: Object.keys(errors).length === 0, errors } |
<<<<<<<
=======
triggerWorkflow: triggerWorkflow(apiOpts),
createRecord,
updateRecord,
>>>>>>>
createRecord,
updateRecord, |
<<<<<<<
const persistanceTraits = this.owner.modules.combatants.selected.traitsBySpellId[SPELLS.PERSISTENCE_TRAIT.id] || 0;
=======
this.hasSotf = this.combatants.selected.hasTalent(SPELLS.SOUL_OF_THE_FOREST_TALENT_RESTORATION.id);
this.hasSota = this.combatants.selected.hasFinger(ITEMS.SOUL_OF_THE_ARCHDRUID.id);
this.active = this.hasSotf || this.hasSota;
const persistanceTraits = this.owner.modules.combatants.selected.traitsBySpellId[SPELLS.PERSISTANCE_TRAIT.id] || 0;
>>>>>>>
this.hasSotf = this.combatants.selected.hasTalent(SPELLS.SOUL_OF_THE_FOREST_TALENT_RESTORATION.id);
this.hasSota = this.combatants.selected.hasFinger(ITEMS.SOUL_OF_THE_ARCHDRUID.id);
this.active = this.hasSotf || this.hasSota;
const persistanceTraits = this.owner.modules.combatants.selected.traitsBySpellId[SPELLS.PERSISTENCE_TRAIT.id] || 0; |
<<<<<<<
views: {
// view collation information, read before writing any complex views:
// https://docs.couchdb.org/en/master/ddocs/views/collation.html#collation-specification
by_username: {
map: function(doc) {
if (doc.type === "user") {
emit([doc.username], doc._id)
}
}.toString(),
},
by_type: {
map: function(doc) {
emit([doc.type], doc._id)
}.toString(),
},
by_automation_trigger: {
map: function(doc) {
if (doc.type === "automation") {
const trigger = doc.definition.trigger
if (trigger) {
emit([trigger.event], trigger)
}
}
}.toString(),
},
},
=======
views: {},
>>>>>>>
// view collation information, read before writing any complex views:
// https://docs.couchdb.org/en/master/ddocs/views/collation.html#collation-specification
views: {}, |
<<<<<<<
select: async screenId => {
=======
select: screenId => {
>>>>>>>
select: screenId => {
<<<<<<<
return screen
},
=======
if (creatingNewScreen) {
store.actions.screens.select(screen._id)
}
return screen
},
>>>>>>>
if (creatingNewScreen) {
store.actions.screens.select(screen._id)
}
return screen
},
<<<<<<<
const layout = store.actions.layouts.find(layoutId)
=======
const layout =
store.actions.layouts.find(layoutId) || get(store).layouts[0]
if (!layout) return
>>>>>>>
const layout =
store.actions.layouts.find(layoutId) || get(store).layouts[0]
if (!layout) return
<<<<<<<
=======
const creatingNewLayout = layoutToSave._id === undefined
>>>>>>>
const creatingNewLayout = layoutToSave._id === undefined
<<<<<<<
state.currentAssetId = layout._id
=======
>>>>>>> |
<<<<<<<
const datasourceRoutes = require("./datasource")
const queryRoutes = require("./query")
=======
const hostingRoutes = require("./hosting")
>>>>>>>
const datasourceRoutes = require("./datasource")
const queryRoutes = require("./query")
const hostingRoutes = require("./hosting")
<<<<<<<
datasourceRoutes,
queryRoutes,
=======
hostingRoutes,
>>>>>>>
datasourceRoutes,
queryRoutes,
hostingRoutes, |
<<<<<<<
export { default as recorddetail } from "./RecordDetail.svelte"
export * from "./Chart"
=======
export { default as stackedlist } from "./StackedList.svelte"
export { default as recorddetail } from "./RecordDetail.svelte"
>>>>>>>
export { default as stackedlist } from "./StackedList.svelte"
export { default as recorddetail } from "./RecordDetail.svelte"
export * from "./Chart" |
<<<<<<<
const screens = get(allScreens)
let selectedScreen = screens.find(screen => screen._id === screenId)
if (!selectedScreen) {
selectedScreen = screens[0]
}
=======
const screen = get(allScreens).find(screen => screen._id === screenId)
if (!screen) return state
>>>>>>>
const screen = get(allScreens).find(screen => screen._id === screenId)
if (!screen) return state
<<<<<<<
state.selectedComponentId = selectedScreen.props._id
=======
promise = store.actions.screens.regenerateCss(screen)
state.selectedComponentId = screen.props?._id
>>>>>>>
state.selectedComponentId = screen.props?._id
<<<<<<<
state.selectedComponentId = layout.props._id
=======
state.selectedComponentId = layout.props?._id
>>>>>>>
state.selectedComponentId = layout.props?._id
<<<<<<<
=======
state.currentAssetId = json._id
>>>>>>> |
<<<<<<<
const { FieldTypes } = require("../../constants")
const { isEqual } = require("lodash")
=======
const { FieldTypes, RelationshipTypes } = require("../../constants")
>>>>>>>
const { FieldTypes, RelationshipTypes } = require("../../constants")
const { isEqual } = require("lodash") |
<<<<<<<
const deployRoutes = require("./deploy")
=======
const apiKeysRoutes = require("./apikeys")
>>>>>>>
const deployRoutes = require("./deploy")
const apiKeysRoutes = require("./apikeys") |
<<<<<<<
module.exports.run = async function({ inputs, appId, apiKey }) {
const { email, password, roleId } = inputs
=======
module.exports.run = async function({ inputs, appId, apiKey, emitter }) {
const { email, password, accessLevelId } = inputs
>>>>>>>
module.exports.run = async function({ inputs, appId, apiKey, emitter }) {
const { email, password, roleId } = inputs |
<<<<<<<
cy.contains("name").click()
cy.get("[data-cy='edit-column-header']").click()
cy.get(".actions input").first().type("updated")
=======
cy.contains("header", "name")
.trigger("mouseover")
.find(".ri-pencil-line")
.click({ force: true })
cy.get(".actions input")
.first()
.type("updated")
>>>>>>>
cy.contains("header", "name")
.trigger("mouseover")
.find(".ri-pencil-line")
.click({ force: true })
cy.get(".actions input").first().type("updated") |
<<<<<<<
export const UNEDITABLE_USER_FIELDS = ["username", "password", "roleId"]
=======
export const UNEDITABLE_USER_FIELDS = ["email", "password", "accessLevelId"]
>>>>>>>
export const UNEDITABLE_USER_FIELDS = ["email", "password", "roleId"] |
<<<<<<<
p._instanceName = getNewComponentName(p._component, state)
})
=======
})
export const getComponentDefinition = (state, name) =>
name.startsWith("##") ? getBuiltin(name) : state.components[name]
>>>>>>>
p._instanceName = getNewComponentName(p._component, state)
})
export const getComponentDefinition = (state, name) =>
name.startsWith("##") ? getBuiltin(name) : state.components[name] |
<<<<<<<
const { processObject } = require("@budibase/string-templates")
=======
const { recurseMustache } = require("../../utilities/mustache")
const { getAllApps } = require("../../utilities")
>>>>>>>
const { processObject } = require("@budibase/string-templates")
const { getAllApps } = require("../../utilities") |
<<<<<<<
const { recurseMustache } = require("../../utilities/mustache")
const { generateAssetCss } = require("../../utilities/builder/generateCss")
=======
const { USERS_TABLE_SCHEMA } = require("../../constants")
>>>>>>>
const { recurseMustache } = require("../../utilities/mustache")
const { generateAssetCss } = require("../../utilities/builder/generateCss")
const { USERS_TABLE_SCHEMA } = require("../../constants") |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.