conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
languageSelectLabel: {
id: 'profile.languageSelect.form.languageSelectLabel',
defaultMessage: '!!!Select your language',
},
languageSelectLabelInfo: {
id: 'settings.general.languageSelect.labelInfo',
defaultMessage: '!!!Language Label Info',
},
languageSelectInfo: {
id: 'settings.general.languageSelect.info',
defaultMessage: '!!!Language Info',
},
translationAcknowledgment: {
id: 'settings.general.translation.acknowledgment',
defaultMessage: '!!!Thanks to the following',
},
translationContributors: {
id: 'settings.general.translation.contributors',
defaultMessage: '!!!List of contributors',
},
=======
passwordInstructionsPaperWallet: {
id: 'global.passwordInstructionsPaperWallet',
defaultMessage: '!!!Note: Paper Wallet password needs to be at least 12 characters long.',
},
shortRecoveryPhrase: {
id: 'wallet.restore.dialog.form.errors.shortRecoveryPhrase',
defaultMessage: '!!!Short recovery phrase',
},
>>>>>>>
languageSelectLabel: {
id: 'profile.languageSelect.form.languageSelectLabel',
defaultMessage: '!!!Select your language',
},
languageSelectLabelInfo: {
id: 'settings.general.languageSelect.labelInfo',
defaultMessage: '!!!Language Label Info',
},
languageSelectInfo: {
id: 'settings.general.languageSelect.info',
defaultMessage: '!!!Language Info',
},
translationAcknowledgment: {
id: 'settings.general.translation.acknowledgment',
defaultMessage: '!!!Thanks to the following',
},
translationContributors: {
id: 'settings.general.translation.contributors',
defaultMessage: '!!!List of contributors',
passwordInstructionsPaperWallet: {
id: 'global.passwordInstructionsPaperWallet',
defaultMessage: '!!!Note: Paper Wallet password needs to be at least 12 characters long.',
},
shortRecoveryPhrase: {
id: 'wallet.restore.dialog.form.errors.shortRecoveryPhrase',
defaultMessage: '!!!Short recovery phrase',
}, |
<<<<<<<
it('should measure missing coverage on trailing function declarations correctly', (done) => {
const Test = require('./coverage/trailing-function-declarations');
let result = Test.method(3, 4);
const cov = Lab.coverage.analyze({ coveragePath: Path.join(__dirname, 'coverage/trailing-function-declarations') });
const source = cov.files[0].source;
const missedLines = Object.keys(source).filter((lineNumber) => source[lineNumber].miss);
expect(result).to.equal(7);
expect(missedLines).to.deep.equal(['19', '22']);
done();
});
=======
it('should measure missing coverage on single-line functions correctly', (done) => {
const Test = require('./coverage/single-line-functions');
let results = [];
for(let i = 1; i <= 10; ++i) {
results.push(Test[`method${i}`](3, 4));
}
results.push(Test.method11(5, 10));
results.push(Test.method11(0, 10));
results.push(Test.method11Partial(5, 10));
const cov = Lab.coverage.analyze({ coveragePath: Path.join(__dirname, 'coverage/single-line-functions') });
const source = cov.files[0].source;
const missedLines = Object.keys(source).filter((lineNumber) => source[lineNumber].miss);
expect(results).to.deep.equal([7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 5, 10, 5]);
expect(missedLines).to.deep.equal(['12', '15', '21', '27', '30', '33', '39', '46', '50', '53', '56']);
done();
});
>>>>>>>
it('should measure missing coverage on single-line functions correctly', (done) => {
const Test = require('./coverage/single-line-functions');
let results = [];
for(let i = 1; i <= 10; ++i) {
results.push(Test[`method${i}`](3, 4));
}
results.push(Test.method11(5, 10));
results.push(Test.method11(0, 10));
results.push(Test.method11Partial(5, 10));
const cov = Lab.coverage.analyze({ coveragePath: Path.join(__dirname, 'coverage/single-line-functions') });
const source = cov.files[0].source;
const missedLines = Object.keys(source).filter((lineNumber) => source[lineNumber].miss);
expect(results).to.deep.equal([7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 5, 10, 5]);
expect(missedLines).to.deep.equal(['12', '15', '21', '27', '30', '33', '39', '46', '50', '53', '56']);
done();
});
it('should measure missing coverage on trailing function declarations correctly', (done) => {
const Test = require('./coverage/trailing-function-declarations');
let result = Test.method(3, 4);
const cov = Lab.coverage.analyze({ coveragePath: Path.join(__dirname, 'coverage/trailing-function-declarations') });
const source = cov.files[0].source;
const missedLines = Object.keys(source).filter((lineNumber) => source[lineNumber].miss);
expect(result).to.equal(7);
expect(missedLines).to.deep.equal(['19', '22']);
done();
}); |
<<<<<<<
// @include *://*.imooc.com*
// @match http://www.imooc.com/*
=======
// @include http*://*.imooc.com*
// @match https://class.imooc.com/*
>>>>>>>
// @include http*://*.imooc.com*
// @match http://www.imooc.com/* |
<<<<<<<
import HelpLinkFooter from '../../components/footer/HelpLinkFooter';
=======
import AdaRedemptionSuccessOverlay from '../../components/wallet/ada-redemption/AdaRedemptionSuccessOverlay';
>>>>>>>
import AdaRedemptionSuccessOverlay from '../../components/wallet/ada-redemption/AdaRedemptionSuccessOverlay';
import AddWalletFooter from '../footer/AddWalletFooter';
<<<<<<<
const { theme } = stores;
=======
const { showAdaRedemptionSuccessMessage, amountRedeemed } = adaRedemption;
>>>>>>>
const { theme } = stores;
const { showAdaRedemptionSuccessMessage, amountRedeemed } = adaRedemption;
<<<<<<<
// const footer = undefined;
const footer = (
<HelpLinkFooter
showBuyTrezorHardwareWallet
showWhatIsHardwareWallet
/>
);
=======
>>>>>>>
const footer = theme.classic ? undefined : <AddWalletFooter />;
<<<<<<<
footer={footer}
oldTheme={theme.old}
withFooter={!theme.old}
=======
>>>>>>>
footer={footer}
classicTheme={theme.classic} |
<<<<<<<
this._hasStashed = false;
this.directiveActions = {
clone: async (dir, dest, action) => {
if (this._hasStashed === false) {
stashFiles(dir, dest);
this._hasStashed = true;
}
const opts = Object.assign(
{ force: true },
{ cache: action.cache, verbose: action.verbose }
);
const d = degit(action.src, opts);
d.on('info', event => {
console.error(
chalk.cyan(`> ${event.message.replace('options.', '--')}`)
);
});
d.on('warn', event => {
console.error(
chalk.magenta(`! ${event.message.replace('options.', '--')}`)
);
});
await d.clone(dest).catch(err => {
console.error(chalk.red(`! ${err.message}`));
process.exit(1);
});
},
remove: this.remove.bind(this),
};
}
_getDirectives(dest) {
const directivesPath = path.resolve(dest, degitConfigName);
const directives =
tryRequire(directivesPath, { clearCache: true }) || false;
if (directives) {
fs.unlinkSync(directivesPath);
}
return directives;
=======
this.mode = opts.mode || this.repo.mode;
>>>>>>>
this.mode = opts.mode || this.repo.mode;
if (!validModes.has(this.mode)) {
throw new Error(`Valid modes are ${Array.from(validModes).join(', ')}`);
}
this._hasStashed = false;
this.directiveActions = {
clone: async (dir, dest, action) => {
if (this._hasStashed === false) {
stashFiles(dir, dest);
this._hasStashed = true;
}
const opts = Object.assign(
{ force: true },
{ cache: action.cache, verbose: action.verbose }
);
const d = degit(action.src, opts);
d.on('info', event => {
console.error(
chalk.cyan(`> ${event.message.replace('options.', '--')}`)
);
});
d.on('warn', event => {
console.error(
chalk.magenta(`! ${event.message.replace('options.', '--')}`)
);
});
await d.clone(dest).catch(err => {
console.error(chalk.red(`! ${err.message}`));
process.exit(1);
});
},
remove: this.remove.bind(this)
};
}
_getDirectives(dest) {
const directivesPath = path.resolve(dest, degitConfigName);
const directives =
tryRequire(directivesPath, { clearCache: true }) || false;
if (directives) {
fs.unlinkSync(directivesPath);
}
return directives;
<<<<<<<
fs.statSync(file);
this._verbose({
code: 'FILE_EXISTS',
message: `${file} already exists locally`,
=======
await git.Clone(repo.src, dest, {
fetchOpts: {
callbacks: {
certificateCheck() {
// github will fail cert check on some OSX machines
// this overrides that check
return 1;
},
credentials(url, username) {
return git.Cred.sshKeyFromAgent(username);
}
}
}
>>>>>>>
fs.statSync(file);
this._verbose({
code: 'FILE_EXISTS',
message: `${file} already exists locally`
<<<<<<<
const site = (match[1] || match[2] || match[3] || 'github').replace(
/\.(com|org)$/,
''
);
if (!supported.has(site)) {
throw new DegitError(
`degit supports GitHub, GitLab, Sourcehut and BitBucket`,
{
code: 'UNSUPPORTED_HOST',
}
);
}
=======
const site = (match[1] || match[2] || match[3] || 'github').replace(/\.(com|org)$/, '');
const mode = supported.has(site) ? 'tar' : 'git';
>>>>>>>
const site = (match[1] || match[2] || match[3] || 'github').replace(
/\.(com|org)$/,
''
);
if (!supported.has(site)) {
throw new DegitError(
`degit supports GitHub, GitLab, Sourcehut and BitBucket`,
{
code: 'UNSUPPORTED_HOST'
}
);
} |
<<<<<<<
degitConfigName
=======
degitConfigName,
base,
>>>>>>>
degitConfigName,
base
<<<<<<<
const base = path.join(homeOrTmp, '.degit');
const validModes = new Set(['tar', 'git']);
=======
>>>>>>>
const validModes = new Set(['tar', 'git']); |
<<<<<<<
var Docker = require('dockerode')
, EventEmitter = require('events').EventEmitter
, util = require('util')
, through2 = require('through2')
, child_process = require('child_process')
, bunyan = require('bunyan')
, Promise = require('bluebird')
, TaskRunnerPlugins = require('./plugins/TaskRunner')
;
=======
'use strict';
var Docker = require('dockerode');
var through2 = require('through2');
var bunyan = require('bunyan');
var Promise = require('bluebird');
var TaskRunnerPlugins = require('./plugins/TaskRunner');
>>>>>>>
'use strict';
var Docker = require('dockerode');
var through2 = require('through2');
var bunyan = require('bunyan');
var Promise = require('bluebird');
var util = require('util');
var EventEmitter = require('events').EventEmitter;
var child_process = require('child_process');
var TaskRunnerPlugins = require('./plugins/TaskRunner');
<<<<<<<
* @class
=======
*
* @param {object} options - An options hash.
* @returns {object} options.
>>>>>>>
* @class
*
* @param {object} options - An options hash. |
<<<<<<<
var task = this.postStatusToGithub.bind(this, build.project, build.commit.ref, statusInfo);
status_update_queue.push(task, function(error) {
=======
var task = this.postStatusToGithub.bind(this, build.project, build.ref, statusInfo);
statusUpdateQueue.push(task, function(error) {
>>>>>>>
var task = this.postStatusToGithub.bind(this, build.project, build.commit.ref, statusInfo);
statusUpdateQueue.push(task, function(error) {
<<<<<<<
self.log.info(statusInfo, 'Posted status to Github for', build.project.slug, build.commit.ref);
cb(null, statusInfo);
=======
self.log.info(statusInfo, 'Posted status to Github for', build.project.slug, build.ref);
done(null, statusInfo);
>>>>>>>
self.log.info(statusInfo, 'Posted status to Github for', build.project.slug, build.commit.ref);
done(null, statusInfo);
<<<<<<<
var build = {
commit: {
ref: request.sha,
htmlUrl: request.commit_url
},
pullRequest: {
number: request.pull_request + '',
name: request.pull_request_name,
description: request.pull_request_description,
htmlUrl: request.pull_request_html_url
},
branch: {
name: request.branch,
htmlUrl: request.branch_html_url
},
=======
build = {
ref: request.sha,
pullRequest: request.pull_request + '',
branch: request.branch,
>>>>>>>
build = {
commit: {
ref: request.sha,
htmlUrl: request.commit_url,
},
pullRequest: {
number: request.pull_request + '',
name: request.pull_request_name,
description: request.pull_request_description,
htmlUrl: request.pull_request_html_url,
},
branch: {
name: request.branch,
htmlUrl: request.branch_html_url,
}, |
<<<<<<<
* @param {hash} [options.varnish] - A has of options to indicate whether to use varnish http cache or not.
* Options are {'enabled' (boolean, defaults to false) and 'pathToVcl' (string)}.
=======
* @param {boolean} [options.restartMysql] - Whether to restart MySQL. If mysqlCnfOptions is set, MySQL will be restarted automatically,
* so you probably won't need to use this.
>>>>>>>
* @param {hash} [options.varnish] - A has of options to indicate whether to use varnish http cache or not.
* Options are {'enabled' (boolean, defaults to false) and 'pathToVcl' (string)}.
* @param {boolean} [options.restartMysql] - Whether to restart MySQL. If mysqlCnfOptions is set, MySQL will be restarted automatically,
* so you probably won't need to use this.
<<<<<<<
this.options.varnish = options.varnish || {};
=======
this.options.restartMysql = options.restartMysql || false;
>>>>>>>
this.options.varnish = options.varnish || {};
this.options.restartMysql = options.restartMysql || false; |
<<<<<<<
import iconTickGreenSVG from '../../assets/images/widget/tick-green.inline.svg';
// import InputOwnSkin from '../../themes/skins/InputOwnSkin';
=======
import config from '../../config';
>>>>>>>
import iconTickGreenSVG from '../../assets/images/widget/tick-green.inline.svg';
import config from '../../config';
// import InputOwnSkin from '../../themes/skins/InputOwnSkin'; |
<<<<<<<
if (!hasAnyWalletLoaded) return this._unsetActiveWallet();
const matchWalletRoute = matchRoute(`${ROUTES.WALLETS.ROOT}/:id(*page)`, currentRoute);
if (matchWalletRoute) {
=======
if (!hasAnyWalletLoaded) {
this.actions.router.goToRoute.trigger({ route: ROUTES.NO_WALLETS });
return this._unsetActiveWallet();
}
const match = matchRoute(`${ROUTES.WALLETS.ROOT}/:id(*page)`, currentRoute);
if (match) {
>>>>>>>
if (!hasAnyWalletLoaded) {
this.actions.router.goToRoute.trigger({ route: ROUTES.NO_WALLETS });
return this._unsetActiveWallet();
}
const matchWalletRoute = matchRoute(`${ROUTES.WALLETS.ROOT}/:id(*page)`, currentRoute);
if (matchWalletRoute) { |
<<<<<<<
type: "POST",
contentType: signalR._.defaultContentType,
data: postData,
=======
timeout: connection._.pollTimeout,
>>>>>>>
type: "POST",
contentType: signalR._.defaultContentType,
data: postData,
timeout: connection._.pollTimeout, |
<<<<<<<
const countryList = useSelector((state) => state.countryList)
const countryListByName = useSelector((state) => state.countryListByName)
=======
const countryList = useSelector((state) => {
if ('' !== state.filterByRegion) {
return state.coutryFilteredByRegion;
}
return state.countryList;
})
>>>>>>>
const countryListByName = useSelector((state) => state.countryListByName)
const countryList = useSelector((state) => {
if ('' !== state.filterByRegion) {
return state.coutryFilteredByRegion;
}
return state.countryList;
}) |
<<<<<<<
scope.incidentVars = {read: ['incident', 'processData', 'filter']};
scope.incidentActions = Views.getProviders({component: 'cockpit.incident.action'});
function setRuntimeColumns(availableColObjs, runtimeColClasses) {
var runtimeCols = [];
runtimeColClasses.forEach(function(el) {
var classObj = $.grep(availableColObjs, function(obj) {
return obj.class === el;
})[0];
runtimeCols.push(classObj);
});
return runtimeCols;
}
function setHistoryColumns( availableColObjs, histColClasses) {
var historyCols = [];
histColClasses.forEach(function(el) {
var classObj = $.grep(availableColObjs, function(obj) {
return obj.class === el;
})[0];
historyCols.push(classObj);
});
return historyCols;
}
function saveLocal(sortObj) {
localConf.set(scope.localConfKey, sortObj);
}
function loadLocal(defaultValue) {
return localConf.get(scope.localConfKey, defaultValue);
}
=======
scope.incidentHasActions = function(incident) {
return scope.incidentsContext !== 'history' ||
scope.incidentsContext === 'history' &&
incident.incidentType === 'failedJob' &&
!incident.deleted &&
!incident.resolved;
};
scope.incidentVars = { read: ['incident', 'processData', 'filter']};
scope.incidentActions = Views.getProviders({ component: 'cockpit.incident.action' });
>>>>>>>
scope.incidentHasActions = function(incident) {
return scope.incidentsContext !== 'history' ||
scope.incidentsContext === 'history' &&
incident.incidentType === 'failedJob' &&
!incident.deleted &&
!incident.resolved;
};
scope.incidentVars = { read: ['incident', 'processData', 'filter']};
scope.incidentActions = Views.getProviders({ component: 'cockpit.incident.action' });
function setRuntimeColumns(availableColObjs, runtimeColClasses) {
var runtimeCols = [];
runtimeColClasses.forEach(function(el) {
var classObj = $.grep(availableColObjs, function(obj) {
return obj.class === el;
})[0];
runtimeCols.push(classObj);
});
return runtimeCols;
}
function setHistoryColumns( availableColObjs, histColClasses) {
var historyCols = [];
histColClasses.forEach(function(el) {
var classObj = $.grep(availableColObjs, function(obj) {
return obj.class === el;
})[0];
historyCols.push(classObj);
});
return historyCols;
}
function saveLocal(sortObj) {
localConf.set(scope.localConfKey, sortObj);
}
function loadLocal(defaultValue) {
return localConf.get(scope.localConfKey, defaultValue);
} |
<<<<<<<
$scope.roundtrip = RoundtripDetails.get({id: $routeParams.roundtripId }, function() {
$scope.$emit("navigation-changed", {name:$scope.roundtrip.name});
}
);
=======
$scope.roundtrip = Roundtrip.get({id: $routeParams.roundtripId });
>>>>>>>
$scope.roundtrip = RoundtripDetails.get({id: $routeParams.roundtripId }); |
<<<<<<<
'--rp-button-text-color': '#fff',
=======
'--rp-button-font-size': '14px',
'--rp-button-line-height': '20px',
'--rp-button-padding': '12px 20px',
'--rp-button-text-color': '#fafbfc',
>>>>>>>
'--rp-button-font-size': '14px',
'--rp-button-line-height': '20px',
'--rp-button-padding': '12px 20px',
'--rp-button-text-color': '#fff', |
<<<<<<<
function RoundtripDetailsController($scope, $routeParams, RoundtripDetails, app, $http) {
=======
function RoundtripDetailsController($scope, $routeParams, RoundtripDetails, $http) {
$scope.roundtrip = RoundtripDetails.get({id: $routeParams.roundtripId });
$scope.side = '';
>>>>>>>
function RoundtripDetailsController($scope, $routeParams, RoundtripDetails, app, $http) {
$scope.roundtrip = RoundtripDetails.get({id: $routeParams.roundtripId });
$scope.side = ''; |
<<<<<<<
verb_topo_Boolean.classifyVertexFaceEvents = function(a,op,isA) {
=======
verb.topo.Boolean.classifyAllVertexFaceEvents = function(a,op,isA) {
>>>>>>>
verb_topo_Boolean.classifyAllVertexFaceEvents = function(a,op,isA) {
<<<<<<<
verb_topo_Boolean.classifyVertexVertex = function(a,b) {
var res = [];
var svsa = verb_topo_Boolean.preprocessVertexSectors(a);
var svsb = verb_topo_Boolean.preprocessVertexSectors(b);
=======
verb.topo.Boolean.classifyVertexVertexCore = function(a,b) {
var res = new Array();
var svsa = verb.topo.Boolean.preprocessVertexSectors(a);
var svsb = verb.topo.Boolean.preprocessVertexSectors(b);
>>>>>>>
verb_topo_Boolean.classifyVertexVertexCore = function(a,b) {
var res = [];
var svsa = verb_topo_Boolean.preprocessVertexSectors(a);
var svsb = verb_topo_Boolean.preprocessVertexSectors(b);
<<<<<<<
verb_topo_Split.connectNullEdges(nulledges,afaces);
var a = new verb_topo_Solid();
var b = new verb_topo_Solid();
verb_topo_Split.close(afaces,a,b);
return new verb_core_types_Pair(b,a);
=======
verb.topo.Split.connect(nulledges,afaces);
var a = new verb.topo.Solid();
var b = new verb.topo.Solid();
verb.topo.Split.close(afaces,a,b);
return new verb.core.types.Pair(b,a);
>>>>>>>
verb_topo_Split.connect(nulledges,afaces);
var a = new verb_topo_Solid();
var b = new verb_topo_Solid();
verb_topo_Split.close(afaces,a,b);
return new verb_core_types_Pair(b,a);
<<<<<<<
verb_topo_Split.connectNullEdges = function(nulledges,afaces) {
verb_topo_Split.lexicographicalSort(nulledges);
=======
verb.topo.Split.connect = function(nulledges,afaces) {
verb.topo.Split.lexicographicalSort(nulledges);
>>>>>>>
verb_topo_Split.connect = function(nulledges,afaces) {
verb_topo_Split.lexicographicalSort(nulledges);
<<<<<<<
if(nf != null && of.l.nxt != of.l) haxe_Log.trace("PANIC!",{ fileName : "Split.hx", lineNumber : 279, className : "verb.topo.Split", methodName : "join"});
=======
if(nf != null && of.l.nxt != of.l) haxe.Log.trace("PANIC!",{ fileName : "Split.hx", lineNumber : 280, className : "verb.topo.Split", methodName : "join"});
>>>>>>>
if(nf != null && of.l.nxt != of.l) haxe_Log.trace("PANIC!",{ fileName : "Split.hx", lineNumber : 280, className : "verb.topo.Split", methodName : "join"}); |
<<<<<<<
expect(amadeus.media).toBeDefined();
expect(amadeus.media.files).toBeDefined();
expect(amadeus.media.files.generatedPhotos).toBeDefined();
=======
expect(amadeus.airport).toBeDefined();
expect(amadeus.airport.predictions).toBeDefined();
expect(amadeus.airport.predictions.onTime).toBeDefined();
>>>>>>>
expect(amadeus.media).toBeDefined();
expect(amadeus.media.files).toBeDefined();
expect(amadeus.media.files.generatedPhotos).toBeDefined();
expect(amadeus.airport).toBeDefined();
expect(amadeus.airport.predictions).toBeDefined();
expect(amadeus.airport.predictions.onTime).toBeDefined();
<<<<<<<
expect(amadeus.media.files.generatedPhotos.get).toBeDefined();
=======
expect(amadeus.airport.predictions.onTime.get).toBeDefined();
>>>>>>>
expect(amadeus.media.files.generatedPhotos.get).toBeDefined();
expect(amadeus.airport.predictions.onTime.get).toBeDefined();
<<<<<<<
it('.amadeus.media.files.generatedPhotos.get', () => {
amadeus.client.get = jest.fn();
amadeus.media.files.generatedPhotos.get();
expect(amadeus.client.get)
.toHaveBeenCalledWith('/v2/media/files/generated-photos', {});
});
=======
it('.amadeus.travel.predictions.flightDelay.get', () => {
amadeus.client.get = jest.fn();
amadeus.travel.predictions.flightDelay.get();
expect(amadeus.client.get)
.toHaveBeenCalledWith('/v1/travel/predictions/flight-delay', {});
});
it('.amadeus.airport.predictions.onTime.get', () => {
amadeus.client.get = jest.fn();
amadeus.airport.predictions.onTime.get();
expect(amadeus.client.get)
.toHaveBeenCalledWith('/v1/airport/predictions/on-time', {});
});
>>>>>>>
it('.amadeus.media.files.generatedPhotos.get', () => {
amadeus.client.get = jest.fn();
amadeus.media.files.generatedPhotos.get();
expect(amadeus.client.get)
.toHaveBeenCalledWith('/v2/media/files/generated-photos', {});
});
it('.amadeus.travel.predictions.flightDelay.get', () => {
amadeus.client.get = jest.fn();
amadeus.travel.predictions.flightDelay.get();
expect(amadeus.client.get)
.toHaveBeenCalledWith('/v1/travel/predictions/flight-delay', {});
});
it('.amadeus.airport.predictions.onTime.get', () => {
amadeus.client.get = jest.fn();
amadeus.airport.predictions.onTime.get();
expect(amadeus.client.get)
.toHaveBeenCalledWith('/v1/airport/predictions/on-time', {});
}); |
<<<<<<<
let content = null;
let isWalletAdd = false;
=======
>>>>>>> |
<<<<<<<
import { findFn } from './functions';
import { findHwb } from './hwb';
=======
import { findFn, sortStringsDesc } from './functions';
>>>>>>>
import { findFn, sortStringsDesc } from './functions';
import { findHwb } from './hwb'; |
<<<<<<<
import { getSingleCryptoAccount, getAdaWallet, getLastBlockNumber } from '../localStorage/localStorageUtils';
=======
import { WrongPassphraseError } from './lib/cardanoCrypto/cryptoErrors';
>>>>>>>
import { WrongPassphraseError } from './lib/cardanoCrypto/cryptoErrors';
import { getSingleCryptoAccount, getAdaWallet, getLastBlockNumber } from '../localStorage/localStorageUtils'; |
<<<<<<<
template += '<ul class="dropdown-menu dropdown-menu-form" ng-style="{display: open ? \'block\' : \'none\', height : settings.scrollable ? settings.scrollableHeight : \'auto\' }" style="overflow: auto" >';
=======
template += '<ul class="dropdown-menu dropdown-menu-form" ng-if="open" ng-style="{display: open ? \'block\' : \'none\', height : settings.scrollable ? settings.scrollableHeight : \'auto\' }" style="overflow: scroll" >';
>>>>>>>
template += '<ul class="dropdown-menu dropdown-menu-form" ng-if="open" ng-style="{display: open ? \'block\' : \'none\', height : settings.scrollable ? settings.scrollableHeight : \'auto\' }" style="overflow: auto" >'; |
<<<<<<<
template += '<ul class="dropdown-menu dropdown-menu-form" ng-if="open" ng-style="{display: open ? \'block\' : \'none\', height : settings.scrollable ? settings.scrollableHeight : \'auto\' }" style="overflow: auto" >';
template += '<li ng-if="settings.showCheckAll && settings.selectionLimit > 0"><a ng-keydown="keyDownLink($event)" data-ng-click="selectAll()" tabindex="-1" id="selectAll"><span class="glyphicon glyphicon-ok"></span> {{texts.checkAll}}</a>';
template += '<li ng-if="settings.showUncheckAll"><a ng-keydown="keyDownLink($event)" data-ng-click="deselectAll();" tabindex="-1" id="deselectAll"><span class="glyphicon glyphicon-remove"></span> {{texts.uncheckAll}}</a></li>';
template += '<li ng-if="settings.showEnableSearchButton && settings.enableSearch"><a ng-keydown="keyDownLink($event); keyDownToggleSearch();" ng-click="toggleSearch($event);" tabindex="-1">{{texts.disableSearch}}</a></li>';
template += '<li ng-if="settings.showEnableSearchButton && !settings.enableSearch"><a ng-keydown="keyDownLink($event); keyDownToggleSearch();" ng-click="toggleSearch($event);" tabindex="-1">{{texts.enableSearch}}</a></li>';
template += '<li ng-if="(settings.showCheckAll && settings.selectionLimit > 0) || settings.showUncheckAll || settings.showEnableSearchButton" class="divider"></li>';
template += '<li ng-if="settings.enableSearch"><div class="dropdown-header"><input type="text" class="form-control searchField" ng-keydown="keyDownSearchDefault($event); keyDownSearchSingle($event, input.searchFilter);" style="width: 100%;" ng-model="input.searchFilter" placeholder="{{texts.searchPlaceholder}}" /></li>';
template += '<li ng-if="settings.enableSearch" class="divider"></li>';
=======
template += '<ul class="dropdown-menu dropdown-menu-form" ng-if="open" ng-style="{display: open ? \'block\' : \'none\', height : settings.scrollable ? settings.scrollableHeight : \'auto\', overflow: \'auto\' }" >';
template += '<li ng-hide="!settings.showCheckAll || settings.selectionLimit > 0"><a ng-keydown="keyDownLink($event)" data-ng-click="selectAll()" tabindex="-1" id="selectAll"><span class="glyphicon glyphicon-ok"></span> {{texts.checkAll}}</a>';
template += '<li ng-show="settings.showUncheckAll"><a ng-keydown="keyDownLink($event)" data-ng-click="deselectAll();" tabindex="-1" id="deselectAll"><span class="glyphicon glyphicon-remove"></span> {{texts.uncheckAll}}</a></li>';
template += '<li ng-hide="(!settings.showCheckAll || settings.selectionLimit > 0) && !settings.showUncheckAll" class="divider"></li>';
template += '<li ng-show="settings.enableSearch"><div class="dropdown-header"><input type="text" class="form-control searchField" ng-keydown="keyDownSearchDefault($event); keyDownSearchSingle($event, searchFilter);" ng-style="{width: \'100%\'}" ng-model="searchFilter" placeholder="{{texts.searchPlaceholder}}" /></li>';
template += '<li ng-show="settings.enableSearch" class="divider"></li>';
>>>>>>>
template += '<ul class="dropdown-menu dropdown-menu-form" ng-if="open" ng-style="{display: open ? \'block\' : \'none\', height : settings.scrollable ? settings.scrollableHeight : \'auto\', overflow: \'auto\' }" >';
template += '<li ng-if="settings.showCheckAll && settings.selectionLimit > 0"><a ng-keydown="keyDownLink($event)" data-ng-click="selectAll()" tabindex="-1" id="selectAll"><span class="glyphicon glyphicon-ok"></span> {{texts.checkAll}}</a>';
template += '<li ng-if="settings.showUncheckAll"><a ng-keydown="keyDownLink($event)" data-ng-click="deselectAll();" tabindex="-1" id="deselectAll"><span class="glyphicon glyphicon-remove"></span> {{texts.uncheckAll}}</a></li>';
template += '<li ng-if="settings.showEnableSearchButton && settings.enableSearch"><a ng-keydown="keyDownLink($event); keyDownToggleSearch();" ng-click="toggleSearch($event);" tabindex="-1">{{texts.disableSearch}}</a></li>';
template += '<li ng-if="settings.showEnableSearchButton && !settings.enableSearch"><a ng-keydown="keyDownLink($event); keyDownToggleSearch();" ng-click="toggleSearch($event);" tabindex="-1">{{texts.enableSearch}}</a></li>';
template += '<li ng-if="(settings.showCheckAll && settings.selectionLimit > 0) || settings.showUncheckAll || settings.showEnableSearchButton" class="divider"></li>';
template += '<li ng-if="settings.enableSearch"><div class="dropdown-header"><input type="text" class="form-control searchField" ng-keydown="keyDownSearchDefault($event); keyDownSearchSingle($event, input.searchFilter);" ng-style="{width: \'100%\'}" ng-model="input.searchFilter" placeholder="{{texts.searchPlaceholder}}" /></li>';
template += '<li ng-if="settings.enableSearch" class="divider"></li>'; |
<<<<<<<
template += '<ul class="dropdown-menu dropdown-menu-form" ng-style="{display: open ? \'block\' : \'none\', height : settings.scrollable ? settings.scrollableHeight : \'auto\' }" style="overflow: auto" >';
template += '<li ng-hide="!settings.showCheckAll || settings.selectionLimit > 0"><a data-ng-click="selectAll()" tabindex="-1" id="selectAll"><span class="glyphicon glyphicon-ok"></span> {{texts.checkAll}}</a>';
template += '<li ng-show="settings.showUncheckAll"><a data-ng-click="deselectAll();" tabindex="-1" id="deselectAll"><span class="glyphicon glyphicon-remove"></span> {{texts.uncheckAll}}</a></li>';
=======
template += '<ul class="dropdown-menu dropdown-menu-form" ng-if="open" ng-style="{display: open ? \'block\' : \'none\', height : settings.scrollable ? settings.scrollableHeight : \'auto\' }" style="overflow: auto" >';
template += '<li ng-hide="!settings.showCheckAll || settings.selectionLimit > 0"><a data-ng-click="selectAll()"><span class="glyphicon glyphicon-ok"></span> {{texts.checkAll}}</a>';
template += '<li ng-show="settings.showUncheckAll"><a data-ng-click="deselectAll();"><span class="glyphicon glyphicon-remove"></span> {{texts.uncheckAll}}</a></li>';
>>>>>>>
template += '<ul class="dropdown-menu dropdown-menu-form" ng-if="open" ng-style="{display: open ? \'block\' : \'none\', height : settings.scrollable ? settings.scrollableHeight : \'auto\' }" style="overflow: auto" >';
template += '<li ng-hide="!settings.showCheckAll || settings.selectionLimit > 0"><a data-ng-click="selectAll()" tabindex="-1" id="selectAll"><span class="glyphicon glyphicon-ok"></span> {{texts.checkAll}}</a>';
template += '<li ng-show="settings.showUncheckAll"><a data-ng-click="deselectAll();" tabindex="-1" id="deselectAll"><span class="glyphicon glyphicon-remove"></span> {{texts.uncheckAll}}</a></li>'; |
<<<<<<<
template += '<ul class="dropdown-menu dropdown-menu-form" ng-if="open" ng-style="{display: open ? \'block\' : \'none\', height : settings.scrollable ? settings.scrollableHeight : \'auto\' }" style="overflow: auto" >';
template += '<li ng-hide="!settings.showCheckAll || settings.selectionLimit > 0"><a ng-keydown="keyDownLink($event)" data-ng-click="selectAll()" tabindex="-1" id="selectAll"><span class="glyphicon glyphicon-ok"></span> {{texts.checkAll}}</a>';
template += '<li ng-show="settings.showUncheckAll"><a ng-keydown="keyDownLink($event)" data-ng-click="deselectAll();" tabindex="-1" id="deselectAll"><span class="glyphicon glyphicon-remove"></span> {{texts.uncheckAll}}</a></li>';
=======
template += '<ul class="dropdown-menu dropdown-menu-form" ng-if="open" ng-style="{display: open ? \'block\' : \'none\', height : settings.scrollable ? settings.scrollableHeight : \'auto\', overflow: \'auto\' }" >';
template += '<li ng-hide="!settings.showCheckAll || settings.selectionLimit > 0"><a data-ng-click="selectAll()"><span class="glyphicon glyphicon-ok"></span> {{texts.checkAll}}</a>';
template += '<li ng-show="settings.showUncheckAll"><a data-ng-click="deselectAll();"><span class="glyphicon glyphicon-remove"></span> {{texts.uncheckAll}}</a></li>';
>>>>>>>
template += '<ul class="dropdown-menu dropdown-menu-form" ng-if="open" ng-style="{display: open ? \'block\' : \'none\', height : settings.scrollable ? settings.scrollableHeight : \'auto\', overflow: \'auto\' }" >';
template += '<li ng-hide="!settings.showCheckAll || settings.selectionLimit > 0"><a ng-keydown="keyDownLink($event)" data-ng-click="selectAll()" tabindex="-1" id="selectAll"><span class="glyphicon glyphicon-ok"></span> {{texts.checkAll}}</a>';
template += '<li ng-show="settings.showUncheckAll"><a ng-keydown="keyDownLink($event)" data-ng-click="deselectAll();" tabindex="-1" id="deselectAll"><span class="glyphicon glyphicon-remove"></span> {{texts.uncheckAll}}</a></li>';
<<<<<<<
template += '<li ng-show="settings.enableSearch"><div class="dropdown-header"><input type="text" class="form-control searchField" ng-keydown="keyDownSearchDefault($event); keyDownSearchSingle($event, searchFilter);" style="width: 100%;" ng-model="searchFilter" placeholder="{{texts.searchPlaceholder}}" /></li>';
=======
template += '<li ng-show="settings.enableSearch"><div class="dropdown-header"><input type="text" class="form-control" ng-style="{width: \'100%\'}" ng-model="searchFilter" placeholder="{{texts.searchPlaceholder}}" /></li>';
>>>>>>>
template += '<li ng-show="settings.enableSearch"><div class="dropdown-header"><input type="text" class="form-control searchField" ng-keydown="keyDownSearchDefault($event); keyDownSearchSingle($event, searchFilter);" ng-style="{width: \'100%\'}" ng-model="searchFilter" placeholder="{{texts.searchPlaceholder}}" /></li>'; |
<<<<<<<
const showSettingsUpdateNotification = (options) => {
const title = i18n.__("settings_import.message");
const subtitle = options.success ?
i18n.__("settings_import_success.message") :
i18n.__("settings_import_error.message");
=======
const showCustomFilterUpdateErrorNotification = (options) => {
const title = i18n.__('options_popup_update_error_title.message');
const subtitle = options.reason;
>>>>>>>
const showSettingsUpdateNotification = (options) => {
const title = i18n.__("settings_import.message");
const subtitle = options.success ?
i18n.__("settings_import_success.message") :
i18n.__("settings_import_error.message");
<<<<<<<
=======
>>>>>>>
<<<<<<<
}
else if (event === events.SETTINGS_UPDATED) {
showSettingsUpdateNotification(options);
=======
} else if (event === events.UPDATE_CUSTOM_FILTER_ERROR) {
showCustomFilterUpdateErrorNotification(options);
>>>>>>>
}
else if (event === events.SETTINGS_UPDATED) {
showSettingsUpdateNotification(options); |
<<<<<<<
const outputs = [{ address: receiver, value: parseInt(amount, 10) }];
return getAllUTXOsForAddresses(_getPlainAddresses(senders))
=======
const outputs = [{ address: receiver, value: amount }];
return _getAllUTXOsForAddresses(senders)
>>>>>>>
const outputs = [{ address: receiver, value: amount }];
return getAllUTXOsForAddresses(_getPlainAddresses(senders)) |
<<<<<<<
demoPaymentMethodDetailsWithToken,
demoTestCards } from './demodata/demodata'
=======
demoPaymentMethodDetailsWithToken,
} from './demodata/demodata'
>>>>>>>
demoPaymentMethodDetailsWithToken,
demoTestCards,
} from './demodata/demodata'
<<<<<<<
confirmPaymentResult: null,
showCardSelection: false
}
defaultState = {...this.state}
reset = ({ loading = false }) => {
this.setState({
loading,
...this.defaultState
})
=======
confirmPaymentResult: null,
>>>>>>>
confirmPaymentResult: null,
showCardSelection: false,
}
defaultState = {...this.state}
reset = ({ loading = false }) => {
this.setState({
loading,
...this.defaultState,
})
<<<<<<<
this.setState({...this.state, confirmPaymentResult})
} catch (e) {
console.log(e)
=======
this.setState({ ...this.state, confirmPaymentResult })
} catch (error) {
>>>>>>>
this.setState({ ...this.state, confirmPaymentResult })
} catch (e) {
<<<<<<<
const {
error, loading, paymentIntent, paymentMethod,
confirmPaymentResult, token, showCardSelection
} = this.state
const onShowCardSelection = () => {
this.setState({...this.state, showCardSelection: !showCardSelection})
}
=======
const NO_AUTHENTICATION_CHALLENGE_CARD = '4242424242424242'
const AUTHENTICATION_CHALLENGE_CARD = '4000002760003184'
>>>>>>>
const onShowCardSelection = () => {
this.setState({...this.state, showCardSelection: !showCardSelection})
} |
<<<<<<<
options.compileAlways = true;
require('./register').register(options);
=======
require('./register').register({compileAnyways:1});
if (!options.standalone) {
// install the runtime.
require('./compile').installRuntime();
}
>>>>>>>
options.compileAlways = true;
require('./register').register(options);
if (!options.standalone) {
// install the runtime.
require('./compile').installRuntime();
} |
<<<<<<<
/*** Generated by streamline 0.1.45 - DO NOT EDIT ***/ "use strict"; var __g=typeof global!=='undefined'?global:window;__g=(__g.__streamline||(__g.__streamline={}));__g.setEF=__g.setEF||function(e,f){e.__frame = e.__frame||f};var __srcName='streamline/lib/compiler/compile_.js'; function __func(_, __this, __arguments, fn, index, frame, body){ if (!_) { return __future.call(__this, fn, __arguments, index); } frame.file = __srcName; frame.prev = __g.frame; __g.frame = frame; try { body(); } catch (e) { __g.setEF(e, frame.prev); __propagate(_, e); } finally { __g.frame = frame.prev; } } function __cb(_, frame, offset, col, fn){ frame.offset = offset; frame.col = col; var ctx = __g.context; return function ___(err, result){ var oldFrame = __g.frame; __g.frame = frame; __g.context = ctx; try { if (err) { __g.setEF(err, frame); return _(err); } return fn(null, result); } catch (ex) { __g.setEF(ex, frame); return __propagate(_, ex); } finally { __g.frame = oldFrame; } } } function __future(fn, args, i){ var err, result, done, q = []; args = Array.prototype.slice.call(args); args[i] = function(e, r){ err = e, result = r, done = true; q && q.forEach(function(f){ try { f(e, r); } catch (ex) { __trap(ex); } }); q = null; }; fn.apply(this, args); return function ___(_){ if (done) _(err, result); else q.push(_); }.bind(this);} function __propagate(_, err){ try { _(err); } catch (ex) { __trap(ex); } } function __trap(err){ if (err) { if (__g.context && __g.context.errorHandler) __g.context.errorHandler(err); else console.error("UNCAUGHT EXCEPTION: " + err.message + "\n" + err.stack); } } function __tryCatch(_, fn){ try { fn(); } catch (e) { try { _(e); } catch (ex) { __trap(ex); } } } var fs = require("fs");
=======
/*** Generated by streamline 0.1.44rt2 - DO NOT EDIT ***/ "use strict"; var __rt=require('streamline-runtime')(__filename),__func=__rt.__func,__cb=__rt.__cb,__tryCatch=__rt.__tryCatch,__propagate=__rt.__propagate,__trap=__rt.__trap,__future=__rt.__future,__setEF=__rt.__setEF,__g=__rt.__g; var fs = require("fs");
>>>>>>>
/*** Generated by streamline 0.1.46 - DO NOT EDIT ***/ "use strict"; var __rt=require('streamline-runtime')(__filename),__func=__rt.__func,__cb=__rt.__cb,__tryCatch=__rt.__tryCatch,__propagate=__rt.__propagate,__trap=__rt.__trap,__future=__rt.__future,__setEF=__rt.__setEF,__g=__rt.__g; var fs = require("fs");
<<<<<<<
jsbase = (dontSave ? basename.substr(0, (basename.length - 1)) : basename);
js = (((dirname + "/") + jsbase) + ext);
js_ = ((((dirname + "/") + jsbase) + "_") + ext);
fiberjs = ((((dirname + "/") + jsbase) + "--fibers") + ext); return (function __$exports_loadFile__1(_) {
var __1 = options.fibers; if (!__1) { return _(null, __1); } ; return mtime(__cb(_, __frame, 14, 34, function ___(__0, __3) { var __2 = (mtimejs = __3); return _(null, __2); }), fiberjs); })(__cb(_, __frame, -92, 21, function ___(__0, __3) { return (function __$exports_loadFile__1(__then) { if (__3) {
js = fiberjs; __then(); } else {
=======
if (dontSave) {
path = path.substring(0, (path.length - 1));
js = (((dirname + "/") + basename.substr(0, (basename.length - 1))) + ext);
js_ = path;
options.lines = (options.lines || "preserve"); }
>>>>>>>
jsbase = (dontSave ? basename.substr(0, (basename.length - 1)) : basename);
js = (((dirname + "/") + jsbase) + ext);
js_ = ((((dirname + "/") + jsbase) + "_") + ext);
fiberjs = ((((dirname + "/") + jsbase) + "--fibers") + ext); return (function __$exports_loadFile__1(_) {
var __1 = options.fibers; if (!__1) { return _(null, __1); } ; return mtime(__cb(_, __frame, 14, 34, function ___(__0, __3) { var __2 = (mtimejs = __3); return _(null, __2); }), fiberjs); })(__cb(_, __frame, -92, 21, function ___(__0, __3) { return (function __$exports_loadFile__1(__then) { if (__3) {
js = fiberjs; __then(); } else {
<<<<<<<
var jsbase = (dontSave ? basename.substr(0, (basename.length - 1)) : basename);
var js = (((dirname + "/") + jsbase) + ext);
var js_ = ((((dirname + "/") + jsbase) + "_") + ext);
var fiberjs = ((((dirname + "/") + jsbase) + "--fibers") + ext);
if ((options.fibers && (mtimejs = mtimeSync(fiberjs)))) {
js = fiberjs; }
=======
if (dontSave) {
path = path.substring(0, (path.length - 1));
js = (((dirname + "/") + basename.substr(0, (basename.length - 1))) + ext);
js_ = path;
options.lines = (options.lines || "preserve"); }
>>>>>>>
var jsbase = (dontSave ? basename.substr(0, (basename.length - 1)) : basename);
var js = (((dirname + "/") + jsbase) + ext);
var js_ = ((((dirname + "/") + jsbase) + "_") + ext);
var fiberjs = ((((dirname + "/") + jsbase) + "--fibers") + ext);
if ((options.fibers && (mtimejs = mtimeSync(fiberjs)))) {
js = fiberjs; }
<<<<<<<
console.error(ex.message);
failed++; __then(); } else { _(null, __result); } ; }); }); })(function ___() { __tryCatch(_, __then); }); } else { __then(); } ; })(__then); } ; })(_); })); }); }; var __frame = { name: "exports_compile__2", line: 249 }; return __func(_, this, arguments, exports_compile__2, 0, __frame, function __$exports_compile__2() { flows = require("../util/flows");
=======
console.error(ex.stack);
failed++; __then(); } else { _(null, __result); } ; }); }); })(function ___() { __tryCatch(_, __then); }); } else { __then(); } ; })(__then); } ; })(_); })); }); }; var __frame = { name: "exports_compile__2", line: 215 }; return __func(_, this, arguments, exports_compile__2, 0, __frame, function __$exports_compile__2() { flows = require("../util/flows");
>>>>>>>
console.error(ex.stack);
failed++; __then(); } else { _(null, __result); } ; }); }); })(function ___() { __tryCatch(_, __then); }); } else { __then(); } ; })(__then); } ; })(_); })); }); }; var __frame = { name: "exports_compile__2", line: 249 }; return __func(_, this, arguments, exports_compile__2, 0, __frame, function __$exports_compile__2() { flows = require("../util/flows");
<<<<<<<
cwd = process.cwd;
return flows.each(__cb(_, __frame, 28, 1, function __$exports_compile__2() {
=======
cwd = process.cwd();
return flows.each(__cb(_, __frame, 27, 1, function __$exports_compile__2() {
>>>>>>>
cwd = process.cwd();
return flows.each(__cb(_, __frame, 28, 1, function __$exports_compile__2() {
<<<<<<<
return _(new Error((("errors found in " + failed) + " files"))); } ; _(); }), paths, function __1(_, path) { var __frame = { name: "__1", line: 277 }; return __func(_, this, arguments, __1, 0, __frame, function __$__1() { return _compile(__cb(_, __frame, 1, 2, _), fspath.resolve(cwd, path), options); }); }); });};
=======
return _(new Error((("errors found in " + failed) + " files"))); } ; _(); }), paths, function __1(_, path) { var __frame = { name: "__1", line: 242 }; return __func(_, this, arguments, __1, 0, __frame, function __$__1() { return _compile(__cb(_, __frame, 1, 2, _), fspath.resolve(cwd, path), options); }); }); });};
exports.installRuntime = function(dir) {
var cwd = (dir || process.cwd());
if (!fspath.existsSync((cwd + "/node_modules/"))) {
throw new Error((("Error: could not find node_modules in the current directory. please change " + "directories to where the runtime should be installed or create a node_modules folder.\n\n") + "This is required before using streamlined code without the standalone option!")); };
var rtpath = (cwd + "/node_modules/streamline-runtime");
if (!fspath.existsSync(rtpath)) {
fs.mkdirSync(rtpath, "0755"); };
var runtimeContent = fs.readFileSync((__dirname + "/runtime.js"));
fs.writeFileSync((rtpath + "/index.js"), runtimeContent);};
>>>>>>>
return _(new Error((("errors found in " + failed) + " files"))); } ; _(); }), paths, function __1(_, path) { var __frame = { name: "__1", line: 277 }; return __func(_, this, arguments, __1, 0, __frame, function __$__1() { return _compile(__cb(_, __frame, 1, 2, _), fspath.resolve(cwd, path), options); }); }); });};
exports.installRuntime = function(dir) {
return;
var cwd = (dir || process.cwd());
if (!fspath.existsSync((cwd + "/node_modules/"))) {
throw new Error((("Error: could not find node_modules in the current directory. please change " + "directories to where the runtime should be installed or create a node_modules folder.\n\n") + "This is required before using streamlined code without the standalone option!")); };
var rtpath = (cwd + "/node_modules/streamline-runtime");
if (!fspath.existsSync(rtpath)) {
fs.mkdirSync(rtpath, "0755"); };
var runtimeContent = fs.readFileSync((__dirname + "/runtime.js"));
fs.writeFileSync((rtpath + "/index.js"), runtimeContent);}; |
<<<<<<<
this.init_html_and_css();
this.load_annotation_buttons();
=======
>>>>>>>
this.load_annotation_buttons(); |
<<<<<<<
'add_layer',
'replace_layer',
'add_wms_layer',
=======
>>>>>>>
'add_layer',
'replace_layer', |
<<<<<<<
var DAYS_OF_WEEK_TR = ['Pz', 'Pzt', 'Sal', 'Çar', 'Per', 'Cu', 'Cts'];
=======
var DAYS_OF_WEEK_ES = ['dom', 'lun', 'mar', 'miér', 'jue', 'vié', 'sáb'];
>>>>>>>
var DAYS_OF_WEEK_TR = ['Pz', 'Pzt', 'Sal', 'Çar', 'Per', 'Cu', 'Cts'];
var DAYS_OF_WEEK_ES = ['dom', 'lun', 'mar', 'miér', 'jue', 'vié', 'sáb'];
<<<<<<<
var MONTHS_TR = [ "Ock", "Şub", "Mar", "Nis", "May", "Haz", "Tem", "Agu", "Eyl", "Ekm", "Kas", "Arlk" ];
=======
var MONTHS_ES = [ "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic" ];
>>>>>>>
var MONTHS_TR = [ "Ock", "Şub", "Mar", "Nis", "May", "Haz", "Tem", "Agu", "Eyl", "Ekm", "Kas", "Arlk" ];
var MONTHS_ES = [ "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic" ];
<<<<<<<
} else if (locale == "tr"){
daysOfWeek = DAYS_OF_WEEK_TR;
=======
} else if (locale === "es"){
daysOfWeek = DAYS_OF_WEEK_ES;
>>>>>>>
} else if (locale == "tr"){
daysOfWeek = DAYS_OF_WEEK_TR;
} else if (locale === "es"){
daysOfWeek = DAYS_OF_WEEK_ES;
<<<<<<<
} else if(locale == "tr"){
$now_month.text(date.getFullYear() + " - " + MONTHS_TR[date.getMonth()]);
=======
} else if(locale === "es"){
$now_month.text(date.getFullYear() + " - " + MONTHS_ES[date.getMonth()]);
>>>>>>>
} else if(locale == "tr"){
$now_month.text(date.getFullYear() + " - " + MONTHS_TR[date.getMonth()]);
} else if(locale == "es"){
$now_month.text(date.getFullYear() + " - " + MONTHS_ES[date.getMonth()]); |
<<<<<<<
function getVersion(): string {
const manifest = require('../chrome/manifest.' + CONFIG.network.name);
const content = manifest.default !== undefined
? manifest.default
: manifest;
return content.version;
}
export const environment = (Object.assign({
/** Network used to connect */
NETWORK: CONFIG.network.name,
version: getVersion(),
/** Environment used during webpack build */
env_type: process.env.NODE_ENV,
=======
export const environment = ((
{
...process.env,
/** Network used to connect */
NETWORK: CONFIG.network.name,
version: require('../chrome/manifest.' + CONFIG.network.name + '.json').version,
/** Environment used during webpack build */
env_type: process.env.NODE_ENV,
>>>>>>>
function getVersion(): string {
const manifest = require('../chrome/manifest.' + CONFIG.network.name);
const content = manifest.default !== undefined
? manifest.default
: manifest;
return content.version;
}
export const environment = ((
{
...process.env,
/** Network used to connect */
NETWORK: CONFIG.network.name,
version: getVersion(),
/** Environment used during webpack build */
env_type: process.env.NODE_ENV, |
<<<<<<<
var util = require('./util')
=======
var AsyncCrypto = require('./asynccrypto')
var asyncCrypto = new AsyncCrypto()
>>>>>>>
var util = require('./util')
var AsyncCrypto = require('./asynccrypto')
var asyncCrypto = new AsyncCrypto()
<<<<<<<
var hash = bitcore.crypto.Hash.sha256(new Buffer(username + '_' + password, 'utf8'))
var d = bitcore.crypto.BN.fromBuffer(hash)
this.privateKey = new bitcore.PrivateKey(d)
this.address = this.privateKey.toAddress()
this.publicKeyHex = this.privateKey.toPublicKey().toString('hex')
=======
User.prototype.init = function () {
var databuf = new Buffer(this.username + '_' + this.password, 'utf8')
return asyncCrypto.sha256(databuf).then(function (hash) {
var d = bitcore.crypto.BN.fromBuffer(hash)
this.privateKey = new bitcore.PrivateKey(d)
return asyncCrypto.PublicKeyFromPrivateKey(this.privateKey)
}.bind(this))
.then(function (publicKey) {
this.publicKey = publicKey
this.publicKeyHex = publicKey.toString('hex')
return asyncCrypto.AddressFromPublicKey(this.publicKey)
}.bind(this))
.then(function (address) {
this.address = address
}.bind(this))
>>>>>>>
User.prototype.init = function () {
var databuf = new Buffer(this.username + '_' + this.password, 'utf8')
return asyncCrypto.sha256(databuf).then(function (hash) {
var d = bitcore.crypto.BN.fromBuffer(hash)
this.privateKey = new bitcore.PrivateKey(d)
return asyncCrypto.PublicKeyFromPrivateKey(this.privateKey)
}.bind(this))
.then(function (publicKey) {
this.publicKey = publicKey
this.publicKeyHex = publicKey.toString('hex')
return asyncCrypto.AddressFromPublicKey(this.publicKey)
}.bind(this))
.then(function (address) {
this.address = address
}.bind(this)) |
<<<<<<<
initialize: function(nodes,image,id) {
this.id = id
=======
initialize: function(nodes,image) {
this.opacity_low = 0.2
this.opacity_high = 0.8
this.opacity = this.opacity_high
this.subdivisionLimit = 5
this.patchSize = 100
this.offset_x = 0
this.offset_y = 0
>>>>>>>
initialize: function(nodes,image,id) {
this.id = id
this.opacity_low = 0.2
this.opacity_high = 0.8
this.opacity = this.opacity_high
this.subdivisionLimit = 5
this.patchSize = 100
this.offset_x = 0
this.offset_y = 0
<<<<<<<
this.old_coordinates = []
this.diddit = false
this.draw_handler = this.draw.bindAsEventListener(this)
Glop.observe('glop:postdraw', this.draw_handler)
Glop.observe('dblclick', this.dblclick.bindAsEventListener(this))
=======
>>>>>>>
this.old_coordinates = []
this.diddit = false
<<<<<<<
$C.save()
// show image
$C.opacity(this.opacity)
=======
>>>>>>>
<<<<<<<
$C.move_to(this.points[0].x, this.points[0].y)
//$C.canvas.drawImage(this.image, this.points[0].x, this.points[0].y)
this.points.each(function(point) {
$C.line_to(point.x, point.y)
})
$C.line_to(this.points[0].x, this.points[0].y)
=======
$C.begin_path()
$C.move_to(this.points[0].x, this.points[0].y)
this.points.each(function(point) {
$C.line_to(point.x, point.y)
})
$C.line_to(this.points[0].x, this.points[0].y)
$C.opacity(0.4)
$C.stroke()
>>>>>>>
$C.move_to(this.points[0].x, this.points[0].y)
//$C.canvas.drawImage(this.image, this.points[0].x, this.points[0].y)
this.points.each(function(point) {
$C.line_to(point.x, point.y)
})
$C.line_to(this.points[0].x, this.points[0].y)
<<<<<<<
is_inside: function() {
var inside_points = false
this.points.each(function(point) {
if (point.is_inside()) inside_points = true
})
return (inside_points || Geometry.is_point_in_poly(this.points, Map.pointer_x(), Map.pointer_y()))
},
dblclick: function() {
if (this.is_inside()) {
if (this.opacity == this.opacity_low) this.opacity = this.opacity_high
else this.opacity = this.opacity_low
}
},
/**
* A function to generate an array of coordinate pairs as in [lat,lon] for the image corners
*/
coordinates: function() {
coordinates = []
this.points.each(function(point) {
var lon = Projection.x_to_lon(-point.x)
var lat = Projection.y_to_lat(point.y)
coordinates.push([lon,lat])
})
return coordinates
},
/**
* Asyncronously upload distorted point coordinates to server
*/
save: function() {
var coordinate_string = '',first = true
this.coordinates().each(function(coord){
if (first) first = false
else coordinate_string += ':'
coordinate_string += coord[0]+','+coord[1]
})
new Ajax.Request('/warper/update', {
method: 'post',
parameters: { 'warpable_id': this.id,'points': coordinate_string },
onSuccess: function(response) {
$l('updated warper points')
}
})
},
/**
*
*/
cleanup: function() {
this.points.each(function(point){
Glop.stopObserving('glop:postdraw',point.draw_handler)
})
Glop.stopObserving('glop:postdraw', this.draw_handler)
Glop.stopObserving('dblclick', this.dblclick.bindAsEventListener(this))
},
=======
>>>>>>>
is_inside: function() {
var inside_points = false
this.points.each(function(point) {
if (point.is_inside()) inside_points = true
})
return (inside_points || Geometry.is_point_in_poly(this.points, Map.pointer_x(), Map.pointer_y()))
},
drag: function() {
// do stuff
if (!Mouse.down) {
this.cancel_drag()
return
}
if (!this.dragging) {
this.dragging = true
this.drag_offset_x = Map.pointer_x()
this.drag_offset_y = Map.pointer_y()
}
this.offset_x = Map.pointer_x() - this.drag_offset_x
this.offset_y = Map.pointer_y() - this.drag_offset_y
},
cancel_drag: function() {
//this.base()
//this.parent_shape.active_point = false
},
mousedown: function() {
if (!this.active) {
if (Geometry.is_point_in_poly(this.points, Map.pointer_x(), Map.pointer_y())) {
this.active = true
}
} else {
this.points.each(function(point) {
point.mousedown()
})
if ((!this.active_point) && (!Geometry.is_point_in_poly(this.points, Map.pointer_x(), Map.pointer_y())) && !Tool.hover) {
this.active = false
this.active_point = false
}
}
},
mouseup: function() {
},
dblclick: function() {
if (this.is_inside()) {
if (this.opacity == this.opacity_low) this.opacity = this.opacity_high
else this.opacity = this.opacity_low
}
},
/**
* A function to generate an array of coordinate pairs as in [lat,lon] for the image corners
*/
coordinates: function() {
coordinates = []
this.points.each(function(point) {
var lon = Projection.x_to_lon(-point.x)
var lat = Projection.y_to_lat(point.y)
coordinates.push([lon,lat])
})
return coordinates
},
/**
* Asyncronously upload distorted point coordinates to server
*/
save: function() {
var coordinate_string = '',first = true
this.coordinates().each(function(coord){
if (first) first = false
else coordinate_string += ':'
coordinate_string += coord[0]+','+coord[1]
})
new Ajax.Request('/warper/update', {
method: 'post',
parameters: { 'warpable_id': this.id,'points': coordinate_string },
onSuccess: function(response) {
$l('updated warper points')
}
})
},
/**
*
*/
cleanup: function() {
this.points.each(function(point){
Glop.stopObserving('glop:postdraw',point.draw_handler)
})
Glop.stopObserving('glop:postdraw', this.draw_handler)
Glop.stopObserving('dblclick', this.dblclick_handler)
Glop.stopObserving('mousedown', this.mousedown_handler)
Glop.stopObserving('mouseup', this.mouseup_handler)
},
<<<<<<<
=======
},
mousedown: function() {
if (!this.active) {
if (Geometry.is_point_in_poly(this.points, Map.pointer_x(), Map.pointer_y())) {
this.active = true
}
} else {
this.points.each(function(point) {
point.click()
})
if ((!this.active_point) && (!Geometry.is_point_in_poly(this.points, Map.pointer_x(), Map.pointer_y()))) {
this.active = false
this.active_point = false
}
}
},
mouseup: function() {
//this.active = false
//this.active_point = false
},
drag: function() {
// do stuff
if (!Mouse.down) {
this.cancel_drag()
return
}
if (!this.dragging) {
this.dragging = true
this.drag_offset_x = Map.pointer_x()
this.drag_offset_y = Map.pointer_y()
}
this.offset_x = Map.pointer_x() - this.drag_offset_x
this.offset_y = Map.pointer_y() - this.drag_offset_y
},
cancel_drag: function() {
//this.base()
//this.parent_shape.active_point = false
},
dblclick: function() {
console.log('double clicked image')
if (this.opacity == this.opacity_low) this.opacity = this.opacity_high
else this.opacity = this.opacity_low
>>>>>>> |
<<<<<<<
'handlers/tunnel'
], function (appHandler, assetsHandler, cls, cluster, ctlNavHandler, fs, hapi, path, resolver, safeHandler, streamHandler, tunnelHandler) {
=======
'handlers/tunnel',
'lodash'
], function (appHandler, assetsHandler, cluster, fs, hapi, path, resolver, safeHandler, streamHandler, tunnelHandler, _) {
>>>>>>>
'handlers/tunnel',
'lodash'
], function (appHandler, assetsHandler, cls, cluster, fs, hapi, path, resolver, safeHandler, streamHandler, tunnelHandler, _) {
<<<<<<<
LAZO.logger.warn('[server.initialize] Initializing server...')
=======
LAZO.logger.warn(['server.initialize'], 'Initializing server...');
>>>>>>>
LAZO.logger.warn(['server.initialize'], 'Initializing server...');
<<<<<<<
LAZO._server = this.server = new hapi.Server('0.0.0.0', LAZO.options.server.port, {
debug: false,
maxSockets: LAZO.options.server.maxSockets,
payload: { maxBytes: 10485760 },
state: { cookies: { failAction: 'log', strictHeader: false } }
});
if (LAZO.options.sslServer) {
LAZO._sslServer = this.sslServer = new hapi.Server('0.0.0.0', LAZO.options.sslServer.port, {
debug: false,
maxSockets: LAZO.options.sslServer.maxSockets,
payload: { maxBytes: 10485760 },
state: { cookies: { failAction: 'log', strictHeader: false } },
tls: {
key: fs.readFileSync(path.resolve(path.normalize(LAZO.FILE_REPO_DIR + '/config/' + LAZO.options.sslServer.tls.key))),
cert: fs.readFileSync(path.resolve(path.normalize(LAZO.FILE_REPO_DIR + '/config/' + LAZO.options.sslServer.tls.cert)))
=======
var servers = LAZO.conf.server.instances;
var serverDefaults = LAZO.conf.server.defaults;
var options;
var port;
function getSslCerts(tls) {
for (var k in tls) {
try {
tls[key] = fs.readFileSync(tls[k]);
} catch (e) {
throw new Error('could not find ssl ' + k + ' at ' + tls[k]);
>>>>>>>
var servers = LAZO.conf.server.instances;
var serverDefaults = LAZO.conf.server.defaults;
var options;
var port;
function getSslCerts(tls) {
for (var k in tls) {
try {
tls[key] = fs.readFileSync(tls[k]);
} catch (e) {
throw new Error('could not find ssl ' + k + ' at ' + tls[k]);
<<<<<<<
return this;
},
=======
>>>>>>>
<<<<<<<
// if server render fails then send up HTML view, else return JSON error object
=======
>>>>>>>
<<<<<<<
LAZO.logger.error('[server._extensions] Internal server error', request.url.href, response.response.code, response.message, response.trace);
if (LAZO.CLUSTER && !LAZO.ROBUST && response.response.code >= 500 && response.response.code <= 599) {
=======
if (LAZO.CLUSTER && !LAZO.ROBUST && response.output.statusCode >= 500 && response.output.statusCode <= 599) {
LAZO.logger.error(['server._extensions'], 'Internal server error', request.url.href, response.response.code, response.message, response.trace);
>>>>>>>
if (LAZO.CLUSTER && !LAZO.ROBUST && response.output.statusCode >= 500 && response.output.statusCode <= 599) {
LAZO.logger.error(['server._extensions'], 'Internal server error', request.url.href, response.response.code, response.message, response.trace);
<<<<<<<
ev.on('internalError', function (request, error) {
LAZO.logger.debug('[server._error] Internal server error', request, error);
});
return this;
},
_tail: function () {
var ev = this.server.on ? this.server : this.server.events;
ev.on('tail', function (request) {
LAZO.logger.debug('[server._tail]', request._response._code, request.method, request.url.path, request.info);
});
=======
for (var k in this._servers) {
ev = this._servers[k].on ? this._servers[k] : this._servers[k].events;
ev.on('internalError', function (request, error) {
LAZO.logger.debug(['server._error'], 'Internal server error', request, error);
});
}
>>>>>>>
for (var k in this._servers) {
ev = this._servers[k].on ? this._servers[k] : this._servers[k].events;
ev.on('internalError', function (request, error) {
LAZO.logger.debug(['server._error'], 'Internal server error', request, error);
});
}
<<<<<<<
}
else {
LAZO.logger.error('[server._start] Error while starting SSL server...', err);
=======
} else {
LAZO.logger.error(['server._start'], 'Error while starting %s server...', k, err);
>>>>>>>
} else {
LAZO.logger.error(['server._start'], 'Error while starting %s server...', k, err);
<<<<<<<
LAZO.logger.warn('[server._cluster] Server started with single process, listening on port %d (SSL=%d)...',
LAZO.PORT, sslPort);
=======
for (k in this._servers) {
port = LAZO.conf.server.instances[k].port || LAZO.conf.server.defaults.port;
LAZO.logger.warn(['server._cluster'], 'Server %s started with single process, listening on port %d...', port, k);
}
>>>>>>>
for (k in this._servers) {
port = LAZO.conf.server.instances[k].port || LAZO.conf.server.defaults.port;
LAZO.logger.warn(['server._cluster'], 'Server %s started with single process, listening on port %d...', port, k);
}
<<<<<<<
LAZO.logger.warn('[server._cluster] Server started with %d workers, listening on port %d (SSL=%d)...', cpus, LAZO.PORT, sslPort);
=======
for (k in this._servers) {
port = LAZO.conf.server.instances[k].port || LAZO.conf.server.defaults.port;
LAZO.logger.warn(['server._cluster'], 'Server %s started with %d workers, listening on port %d...', k, cpus, port);
}
>>>>>>>
for (k in this._servers) {
port = LAZO.conf.server.instances[k].port || LAZO.conf.server.defaults.port;
LAZO.logger.warn(['server._cluster'], 'Server %s started with %d workers, listening on port %d...', k, cpus, port);
} |
<<<<<<<
' <input id="{{id}}_value" ng-model="searchStr" ng-disabled="disableInput" type="{{type}}" placeholder="{{placeholder}}" maxlength="{{maxlength}}" ng-focus="onFocusHandler()" class="{{inputClass}}" ng-focus="resetHideResults()" ng-blur="hideResults($event)" autocapitalize="off" autocorrect="off" autocomplete="off" ng-change="inputChangeHandler(searchStr)"/>' +
=======
' <input id="{{id}}_value" name={{inputName}} ng-class="{\'not-empty\': notEmpty}" ng-model="searchStr" ng-disabled="disableInput" type="{{type}}" placeholder="{{placeholder}}" ng-focus="onFocusHandler()" class="{{inputClass}}" ng-focus="resetHideResults()" ng-blur="hideResults($event)" autocapitalize="off" autocorrect="off" autocomplete="off" ng-change="inputChangeHandler(searchStr)"/>' +
>>>>>>>
' <input id="{{id}}_value" name={{inputName}} ng-class="{\'not-empty\': notEmpty}" ng-model="searchStr" ng-disabled="disableInput" type="{{type}}" placeholder="{{placeholder}}" maxlength="{{maxlength}}" ng-focus="onFocusHandler()" class="{{inputClass}}" ng-focus="resetHideResults()" ng-blur="hideResults($event)" autocapitalize="off" autocorrect="off" autocomplete="off" ng-change="inputChangeHandler(searchStr)"/>' + |
<<<<<<<
import { TECHNOLOGIES_RECEIVED, TECHNOLOGIES_STARTED } from '../../../store/technologies/technologies_actions_types';
import { DeveloperProfileContext } from '../../../utils/context/contexts';
=======
import { TECHNOLOGIES_RECEIVED } from '../../../store/technologies/technologies_actions_types';
import { DeveloperProfileContext, StoreContext } from '../../../utils/context/contexts';
>>>>>>>
import { TECHNOLOGIES_RECEIVED, TECHNOLOGIES_STARTED } from '../../../store/technologies/technologies_actions_types';
import { DeveloperProfileContext, StoreContext } from '../../../utils/context/contexts'; |
<<<<<<<
reset();
return true;
=======
await reset();
>>>>>>>
await reset();
return true; |
<<<<<<<
const user = message.mentions.users.first() || await this.client.users.fetch(args[0]).catch(() => {});
if(!user) return message.error("admin/blacklist:MISSING_MEMBER_ADD");
=======
const user = message.mentions.users.first() || await this.client.users.fetch(args[1]).catch(() => {});
if(!user) return message.channel.send(message.language.blacklist.mentions.add());
>>>>>>>
const user = message.mentions.users.first() || await this.client.users.fetch(args[0]).catch(() => {});
if(!user) return message.error("admin/blacklist:MISSING_MEMBER_ADD");
<<<<<<<
const user = message.mentions.users.first() || await this.client.users.fetch(args[0]).catch(() => {});
if(!user) return message.error("admin/blacklist:MISSING_MEMBER_REMOVE");
if(!data.guild.blacklistedUsers.includes(user.id)) return message.error("admin/blacklist:NOT_BLACKLISTED", {
username: user.tag
});
=======
const user = message.mentions.users.first() || await this.client.users.fetch(args[1]).catch(() => {});
if(!user) return message.channel.send(message.language.blacklist.mentions.remove());
if(!data.guild.blacklistedUsers.includes(user.id)) return message.channel.send(message.language.blacklist.notFound(user));
>>>>>>>
const user = message.mentions.users.first() || await this.client.users.fetch(args[1]).catch(() => {});
if(!user) return message.error("admin/blacklist:MISSING_MEMBER_REMOVE");
if(!data.guild.blacklistedUsers.includes(user.id)) return message.error("admin/blacklist:NOT_BLACKLISTED", {
username: user.tag
}); |
<<<<<<<
toc: toc,
=======
>>>>>>>
toc: toc, |
<<<<<<<
{ getProfile } = require('../../models/profile/utils'),
{secureGame} = require('./util');
=======
{secureGame} = require('./util'),
version = require('../../version');
>>>>>>>
{ getProfile } = require('../../models/profile/utils'),
{secureGame} = require('./util'),
version = require('../../version');
<<<<<<<
getProfile(username);
=======
socket.emit('version', {
current: version,
lastSeen: account.lastVersionSeen || 'none'
});
>>>>>>>
getProfile(username);
socket.emit('version', {
current: version,
lastSeen: account.lastVersionSeen || 'none'
}); |
<<<<<<<
=======
const aemSkip = /forceskip (\d{1,2})/i.exec(chat);
if (aemSkip) {
if (player) {
socket.emit('sendAlert', 'You cannot force skip a government whilst playing.');
return;
}
const affectedPlayerNumber = parseInt(aemSkip[1]) - 1;
const affectedPlayer = game.private.seatedPlayers[affectedPlayerNumber];
if (!affectedPlayer) {
socket.emit('sendAlert', `There is no seat ${affectedPlayerNumber + 1}.`);
return;
}
if (affectedPlayerNumber !== game.gameState.presidentIndex) {
socket.emit('sendAlert', `The player in seat ${affectedPlayerNumber + 1} is not president.`);
return;
}
let chancellor = -1;
let currentPlayers = [];
for (let i = 0; i < game.private.seatedPlayers.length; i++) {
currentPlayers[i] = !(
game.private.seatedPlayers[i].isDead ||
(i === game.gameState.previousElectedGovernment[0] && game.general.livingPlayerCount > 5) ||
i === game.gameState.previousElectedGovernment[1]
);
}
currentPlayers[affectedPlayerNumber] = false;
let counter = affectedPlayerNumber + 1;
while (chancellor === -1) {
if (counter >= currentPlayers.length) {
counter = 0;
}
if (currentPlayers[counter]) {
chancellor = counter;
}
counter++;
}
game.private.unSeatedGameChats = [
{
gameChat: true,
timestamp: new Date(),
chat: [
{
text: 'An AEM member has force skipped the government with '
},
{
text: `${affectedPlayer.userName} {${affectedPlayerNumber + 1}}`,
type: 'player'
},
{
text: ' as president.'
}
]
}
];
selectChancellor(null, { user: affectedPlayer.userName }, game, { chancellorIndex: chancellor });
setTimeout(() => {
for (let p of game.private.seatedPlayers.filter(player => !player.isDead)) {
selectVoting({ user: p.userName }, game, { vote: false });
}
}, 1000);
sendPlayerChatUpdate(game, data);
return;
}
}
<<<<<<< /mnt/batch/tasks/workitems/adfv2-General_1/job-1/275d90c6-ce01-48d0-88e2-3f9b7cf137c3/wd/.temp/athenacommon/174a8965-3c1b-4f0d-9bfc-f8ab137bcb11.js
>>>>>>> Stashed changes
=======
if (AEM) {
const aemSkip = /forceskip (\d{1,2})/i.exec(chat);
if (aemSkip) {
if (player) {
socket.emit('sendAlert', 'You cannot force skip a government whilst playing.');
return;
}
const affectedPlayerNumber = parseInt(aemSkip[1]) - 1;
const affectedPlayer = game.private.seatedPlayers[affectedPlayerNumber];
if (!affectedPlayer) {
socket.emit('sendAlert', `There is no seat ${affectedPlayerNumber + 1}.`);
return;
}
if (affectedPlayerNumber !== game.gameState.presidentIndex) {
socket.emit('sendAlert', `The player in seat ${affectedPlayerNumber + 1} is not president.`);
return;
}
let chancellor = -1;
let currentPlayers = [];
for (let i = 0; i < game.private.seatedPlayers.length; i++) {
if (game.private.seatedPlayers[i].isDead) {
currentPlayers[i] = false;
} else if (i === game.gameState.previousElectedGovernment[0] && game.general.livingPlayerCount > 5) {
currentPlayers[i] = false;
} else if (i === game.gameState.previousElectedGovernment[1]) {
currentPlayers[i] = false;
} else {
currentPlayers[i] = true;
}
}
currentPlayers[affectedPlayerNumber] = false;
let counter = affectedPlayerNumber + 1;
while (chancellor === -1) {
if (counter >= currentPlayers.length) {
counter = 0;
}
if (currentPlayers[counter]) {
chancellor = counter;
}
counter++;
}
game.private.unSeatedGameChats = [
{
gameChat: true,
timestamp: new Date(),
chat: [
{
text: 'An AEM member has force skipped the government with '
},
{
text: `${affectedPlayer.userName} {${affectedPlayerNumber + 1}}`,
type: 'player'
},
{
text: ' as president.'
}
]
}
];
selectChancellor(null, { user: affectedPlayer.userName }, game, { chancellorIndex: chancellor });
setTimeout(() => {
for (let p of game.private.seatedPlayers.filter(player => !player.isDead)) {
selectVoting({ user: p.userName }, game, { vote: false });
}
}, 1000);
sendPlayerChatUpdate(game, data);
return;
}
}
>>>>>>>
const aemSkip = /forceskip (\d{1,2})/i.exec(chat);
if (aemSkip) {
if (player) {
socket.emit('sendAlert', 'You cannot force skip a government whilst playing.');
return;
}
const affectedPlayerNumber = parseInt(aemSkip[1]) - 1;
const affectedPlayer = game.private.seatedPlayers[affectedPlayerNumber];
if (!affectedPlayer) {
socket.emit('sendAlert', `There is no seat ${affectedPlayerNumber + 1}.`);
return;
}
if (affectedPlayerNumber !== game.gameState.presidentIndex) {
socket.emit('sendAlert', `The player in seat ${affectedPlayerNumber + 1} is not president.`);
return;
}
let chancellor = -1;
let currentPlayers = [];
for (let i = 0; i < game.private.seatedPlayers.length; i++) {
currentPlayers[i] = !(
game.private.seatedPlayers[i].isDead ||
(i === game.gameState.previousElectedGovernment[0] && game.general.livingPlayerCount > 5) ||
i === game.gameState.previousElectedGovernment[1]
);
}
currentPlayers[affectedPlayerNumber] = false;
let counter = affectedPlayerNumber + 1;
while (chancellor === -1) {
if (counter >= currentPlayers.length) {
counter = 0;
}
if (currentPlayers[counter]) {
chancellor = counter;
}
counter++;
}
game.private.unSeatedGameChats = [
{
gameChat: true,
timestamp: new Date(),
chat: [
{
text: 'An AEM member has force skipped the government with '
},
{
text: `${affectedPlayer.userName} {${affectedPlayerNumber + 1}}`,
type: 'player'
},
{
text: ' as president.'
}
]
}
];
selectChancellor(null, { user: affectedPlayer.userName }, game, { chancellorIndex: chancellor });
setTimeout(() => {
for (let p of game.private.seatedPlayers.filter(player => !player.isDead)) {
selectVoting({ user: p.userName }, game, { vote: false });
}
}, 1000);
sendPlayerChatUpdate(game, data);
return;
}
}
if (AEM) {
const aemSkip = /forceskip (\d{1,2})/i.exec(chat);
if (aemSkip) {
if (player) {
socket.emit('sendAlert', 'You cannot force skip a government whilst playing.');
return;
}
const affectedPlayerNumber = parseInt(aemSkip[1]) - 1;
const affectedPlayer = game.private.seatedPlayers[affectedPlayerNumber];
if (!affectedPlayer) {
socket.emit('sendAlert', `There is no seat ${affectedPlayerNumber + 1}.`);
return;
}
if (affectedPlayerNumber !== game.gameState.presidentIndex) {
socket.emit('sendAlert', `The player in seat ${affectedPlayerNumber + 1} is not president.`);
return;
}
let chancellor = -1;
let currentPlayers = [];
for (let i = 0; i < game.private.seatedPlayers.length; i++) {
if (game.private.seatedPlayers[i].isDead) {
currentPlayers[i] = false;
} else if (i === game.gameState.previousElectedGovernment[0] && game.general.livingPlayerCount > 5) {
currentPlayers[i] = false;
} else if (i === game.gameState.previousElectedGovernment[1]) {
currentPlayers[i] = false;
} else {
currentPlayers[i] = true;
}
}
currentPlayers[affectedPlayerNumber] = false;
let counter = affectedPlayerNumber + 1;
while (chancellor === -1) {
if (counter >= currentPlayers.length) {
counter = 0;
}
if (currentPlayers[counter]) {
chancellor = counter;
}
counter++;
}
game.private.unSeatedGameChats = [
{
gameChat: true,
timestamp: new Date(),
chat: [
{
text: 'An AEM member has force skipped the government with '
},
{
text: `${affectedPlayer.userName} {${affectedPlayerNumber + 1}}`,
type: 'player'
},
{
text: ' as president.'
}
]
}
];
selectChancellor(null, { user: affectedPlayer.userName }, game, { chancellorIndex: chancellor });
setTimeout(() => {
for (let p of game.private.seatedPlayers.filter(player => !player.isDead)) {
selectVoting({ user: p.userName }, game, { vote: false });
}
}, 1000);
sendPlayerChatUpdate(game, data);
return;
}
} |
<<<<<<<
}
export const updateActiveStats = activeStat => ({
type: 'UPDATE_ACTIVE_STATS',
activeStat
});
export const fetchProfile = username => dispatch => {
dispatch(updateMidsection('profile'));
dispatch({ type: 'REQUEST_PROFILE' });
return fetch(`/profile?username=${username}`)
.then(response => response.json())
.then(profile => dispatch({
type: 'RECEIVE_PROFILE',
profile
}))
.catch(err => dispatch({
type: 'PROFILE_NOT_FOUND'
}));
}
=======
}
export function updateVersion(version) {
return {
type: 'UPDATE_VERSION',
version
};
};
export function viewPatchNotes() {
return { type: 'VIEW_PATCH_NOTES' }
};
>>>>>>>
}
export const updateActiveStats = activeStat => ({
type: 'UPDATE_ACTIVE_STATS',
activeStat
});
export const fetchProfile = username => dispatch => {
dispatch(updateMidsection('profile'));
dispatch({ type: 'REQUEST_PROFILE' });
return fetch(`/profile?username=${username}`)
.then(response => response.json())
.then(profile => dispatch({
type: 'RECEIVE_PROFILE',
profile
}))
.catch(err => dispatch({
type: 'PROFILE_NOT_FOUND'
}));
}
export function updateVersion(version) {
return {
type: 'UPDATE_VERSION',
version
};
};
export function viewPatchNotes() {
return { type: 'VIEW_PATCH_NOTES' }
}; |
<<<<<<<
{ getProfile } = require('../models/profile/utils'),
=======
Game = require('../models/game'),
moment = require('moment'),
_ = require('lodash'),
>>>>>>>
{ getProfile } = require('../models/profile/utils'),
Game = require('../models/game'),
moment = require('moment'),
_ = require('lodash'),
<<<<<<<
app.get('/profile', (req, res) => {
const username = req.query.username;
getProfile(username).then(profile => {
if (!profile) res.status(404).send('Profile not found');
else res.json(profile);
});
});
app.get('/googleccea3bf80b28ed88.html', (req, res) => {
res.send('google-site-verification: googleccea3bf80b28ed88.html');
});
app.get('*', (req, res) => {
res.render('404');
=======
app.get('/data', (req, res) => {
res.json(gamesData);
>>>>>>>
app.get('/profile', (req, res) => {
const username = req.query.username;
getProfile(username).then(profile => {
if (!profile) res.status(404).send('Profile not found');
else res.json(profile);
});
});
app.get('/data', (req, res) => {
res.json(gamesData); |
<<<<<<<
const topBarCondition = (
theme.old ||
uiDialogs.isOpen(WalletCreateDialog) ||
uiDialogs.isOpen(WalletRestoreDialog) ||
uiDialogs.isOpen(WalletBackupDialog) ||
uiDialogs.isOpen(WalletTrezorConnectDialogContainer)
) ? topBar : false;
const bannerCondition = (
theme.old ||
uiDialogs.isOpen(WalletCreateDialog) ||
uiDialogs.isOpen(WalletRestoreDialog) ||
uiDialogs.isOpen(WalletBackupDialog) ||
uiDialogs.isOpen(WalletTrezorConnectDialogContainer)
);
=======
const footer = (
<HelpLinkFooter
showBuyTrezorHardwareWallet
showHowToConnectTrezor
showHowToCreateWallet
showHowToRestoreWallet
/>);
>>>>>>>
const topBarCondition = (
theme.old ||
uiDialogs.isOpen(WalletCreateDialog) ||
uiDialogs.isOpen(WalletRestoreDialog) ||
uiDialogs.isOpen(WalletBackupDialog) ||
uiDialogs.isOpen(WalletTrezorConnectDialogContainer)
) ? topBar : false;
const bannerCondition = (
theme.old ||
uiDialogs.isOpen(WalletCreateDialog) ||
uiDialogs.isOpen(WalletRestoreDialog) ||
uiDialogs.isOpen(WalletBackupDialog) ||
uiDialogs.isOpen(WalletTrezorConnectDialogContainer)
);
const footer = (
<HelpLinkFooter
showBuyTrezorHardwareWallet
showHowToConnectTrezor
showHowToCreateWallet
showHowToRestoreWallet
/>
);
<<<<<<<
<MainLayout
topbar={topBar}
oldTheme={theme.old}
actions={actions}
stores={stores}
isTopBarVisible={topBarCondition}
isBannerVisible={bannerCondition}
>
=======
<MainLayout
topbar={topBar}
footer={footer}
>
>>>>>>>
<MainLayout
topbar={topBar}
oldTheme={theme.old}
actions={actions}
stores={stores}
isTopBarVisible={topBarCondition}
isBannerVisible={bannerCondition}
footer={footer}
> |
<<<<<<<
getFromStorage
=======
getFromStorage,
>>>>>>>
getFromStorage
<<<<<<<
getAdaAddressesList,
newAdaAddress,
updateUsedAddresses
=======
getAdaAddresses,
newAdaAddress
>>>>>>>
getAdaAddressesList,
newAdaAddress,
updateUsedAddresses
<<<<<<<
saveInStorage(WALLET_KEY, updatedWallet);
await updateAdaPendingTxs(addresses);
const confirmedTxs = await getAdaConfirmedTxs();
await updateAdaTxsHistory(confirmedTxs, addresses);
await updateUsedAddresses();
=======
_saveAdaWalletKeepingSeed(updatedWallet);
>>>>>>>
_saveAdaWalletKeepingSeed(updatedWallet);
await updateUsedAddresses(); |
<<<<<<<
return this.getAclUri(this.uri).then((aclUri) => {
=======
return Util.getAclUri(this.uri).then((aclUri) => {
>>>>>>>
return this.getAclUri(this.uri).then((aclUri) => {
<<<<<<<
user = rdf.sym(user)
=======
user = rdf.sym(user)
}
let payload = {
subject: user,
predicate: this.indexPredMap[mode],
object: rdf.sym(this.uri)
>>>>>>>
user = rdf.sym(user)
}
let payload = {
subject: user,
predicate: this.indexPredMap[mode],
object: rdf.sym(this.uri)
<<<<<<<
=======
>>>>>>>
<<<<<<<
user = rdf.sym(user)
=======
user = rdf.sym(user)
}
let payload = {
subject: user,
predicate: this.indexPredMap[mode],
object: rdf.sym(this.uri)
>>>>>>>
user = rdf.sym(user)
}
let payload = {
subject: user,
predicate: this.indexPredMap[mode],
object: rdf.sym(this.uri)
<<<<<<<
=======
>>>>>>>
<<<<<<<
this.Writer.g.remove({subject, predicate, object})
=======
this.Writer.g.remove({subject, predicate, object})
>>>>>>>
this.Writer.g.remove({subject, predicate, object})
<<<<<<<
if (typeof user === 'string') {
user = rdf.sym(user)
=======
if (typeof user === 'string') {
user = rdf.sym(user)
}
if (this.Writer.g.statements.length === 0) {
return []
>>>>>>>
if (typeof user === 'string') {
user = rdf.sym(user)
}
if (this.Writer.g.statements.length === 0) {
return []
<<<<<<<
=======
>>>>>>>
<<<<<<<
return this.put(this._proxify(this.aclUri), this.Writer.end(), {
'Content-Type': 'text/turtle'
}).catch((e) => {
=======
return fetch(Util.uriToProxied(this.aclUri), {
method: 'PUT',
credentials: 'include',
body: this.Writer.end(),
headers: {
'Content-Type': 'text/turtle'
}
}).then((res) => {
if (!res.ok) {
throw new Error('Error while putting the file', res)
}
}).catch((e) => {
>>>>>>>
return this.put(this._proxify(this.aclUri), this.Writer.end(), {
'Content-Type': 'text/turtle'
}).catch((e) => {
<<<<<<<
})
=======
})
}
commitIndex() {
let updates = []
let indexUri = Util.getIndexUri()
if (this.indexChanges.toInsert.length > 0) {
this.indexChanges.toInsert.forEach((el) => {
updates.push(
this.gAgent.writeTriples(indexUri, [el], false)
)
})
}
if (this.indexChanges.toDelete.length > 0) {
let payload = {
uri: indexUri,
triples: []
}
this.indexChanges.toDelete.forEach((el) => {
payload.triples.push(el)
})
updates.push(this.gAgent.deleteTriple(payload))
}
return Promise.all(updates)
>>>>>>>
})
}
commitIndex() {
let updates = []
let indexUri = Util.getIndexUri()
if (this.indexChanges.toInsert.length > 0) {
this.indexChanges.toInsert.forEach((el) => {
updates.push(
this.gAgent.writeTriples(indexUri, [el], false)
)
})
}
if (this.indexChanges.toDelete.length > 0) {
let payload = {
uri: indexUri,
triples: []
}
this.indexChanges.toDelete.forEach((el) => {
payload.triples.push(el)
})
updates.push(this.gAgent.deleteTriple(payload))
}
return Promise.all(updates) |
<<<<<<<
Promise.all(checkImages.map(trip => {
const img = trip.img
if (!img) {
return
}
return fetch(Util.uriToProxied(img), {
method: 'HEAD',
credentials: 'include'
}).then(res => {
if (!res.ok) {
trip.img = ''
}
}).catch(() => {
trip.img = ''
})
})).then(() => {
this.state.loading = false
=======
this.gAgent.checkImages(checkImages).then(() => {
// this.state.loading = false
>>>>>>>
this.gAgent.checkImages(checkImages).then(() => {
this.state.loading = false |
<<<<<<<
const services = createServices(backend)
window.services = services
=======
const services = createServices(backend)
if (window) {
window.dev = {backend, services}
}
>>>>>>>
const services = createServices(backend)
window.services = services
if (window) {
window.dev = {backend, services}
} |
<<<<<<<
import {listOfCountries as options} from '../../../lib/list-of-countries'
import {actions as idCardActions} from './id-card'
import * as contact from './contact'
=======
import {actions as idCardActions} from './id-card'
import {
listOfCountries as __LIST_OF_COUNTRIES__
} from '../../../lib/list-of-countries'
>>>>>>>
import {actions as idCardActions} from './id-card'
import * as contact from './contact'
import {
listOfCountries as __LIST_OF_COUNTRIES__
} from '../../../lib/list-of-countries'
<<<<<<<
age: '',
returnUrl: '',
index: '',
options
=======
options: __LIST_OF_COUNTRIES__
>>>>>>>
age: '',
returnUrl: '',
index: '',
options: __LIST_OF_COUNTRIES__ |
<<<<<<<
export { default as IconNumber } from './numbers-icon'
export { default as Bubbles } from './bubbles'
=======
export { default as IconNumber } from './numbers-icon'
export { default as ContactList } from './contact-list-items'
export { default as IdCardsList } from './id-cards-list'
export { default as PassportsList } from './passports-list'
export { default as InfoDetails } from './info-details'
export { default as SmsCodeInput } from './sms-code-input'
export { default as VerificationButtons } from './verification-buttons'
export { default as VerificationButtonMsg } from './verification-button-msg'
export { default as SmsInputMsg } from './sms-input-msg'
>>>>>>>
export { default as IconNumber } from './numbers-icon'
export { default as Bubbles } from './bubbles'
export { default as ContactList } from './contact-list-items'
export { default as IdCardsList } from './id-cards-list'
export { default as PassportsList } from './passports-list'
export { default as InfoDetails } from './info-details'
export { default as SmsCodeInput } from './sms-code-input'
export { default as VerificationButtons } from './verification-buttons'
export { default as VerificationButtonMsg } from './verification-button-msg'
export { default as SmsInputMsg } from './sms-input-msg' |
<<<<<<<
// TODO: Receive offset from params or use a constant config value
const externalAddressesToSave = await
discoverAllAddressesFrom(cryptoAccount, 'External', 0, 20);
const internalAddressesToSave = await
discoverAllAddressesFrom(cryptoAccount, 'Internal', 0, 20);
if (externalAddressesToSave.length !== 0 || internalAddressesToSave.length !== 0) {
=======
let addressesToSave = [];
let fromIndex = 0;
while (fromIndex >= 0) {
// TODO: Make offset configurable
const [newIndex, addressesRecovered] =
await discoverAddressesFrom(cryptoAccount, 'External', fromIndex, addressesLimit);
fromIndex = newIndex;
addressesToSave = addressesToSave.concat(addressesRecovered);
}
if (addressesToSave.length !== 0) {
>>>>>>>
newAdaAddress(cryptoAccount, [], 'External');
saveWallet(adaWallet, seed);
return Promise.resolve(adaWallet);
}
export async function restoreAdaWallet({
walletPassword,
walletInitData
}: AdaWalletParams): Promise<AdaWallet> {
const [adaWallet, seed] = createWallet({ walletPassword, walletInitData });
const cryptoAccount = getSingleCryptoAccount(seed, walletPassword);
const externalAddressesToSave = await
discoverAllAddressesFrom(cryptoAccount, 'External', 0, addressesLimit);
const internalAddressesToSave = await
discoverAllAddressesFrom(cryptoAccount, 'Internal', 0, addressesLimit);
if (externalAddressesToSave.length !== 0 || internalAddressesToSave.length !== 0) {
<<<<<<<
function saveAsAdaAddresses(
cryptoAccount,
addresses: Array<string>,
addressType: AddressType
): void {
addresses.forEach((hash, index) => {
const adaAddress: AdaAddress =
toAdaAddress(cryptoAccount.account, addressType, index, hash);
saveAdaAddress(adaAddress);
});
}
function getAdaTxsHistory() {
=======
function getAdaTransactions() {
>>>>>>>
function saveAsAdaAddresses(
cryptoAccount,
addresses: Array<string>,
addressType: AddressType
): void {
addresses.forEach((hash, index) => {
const adaAddress: AdaAddress =
toAdaAddress(cryptoAccount.account, addressType, index, hash);
saveAdaAddress(adaAddress);
});
}
function getAdaTransactions() {
<<<<<<<
async function discoverAddressesFrom(
cryptoAccount,
addressType: AddressType,
fromIndex: number,
offset: number
) {
const addressesIndex = range(fromIndex, fromIndex + offset);
=======
async function discoverAddressesFrom(cryptoAccount, addressType, fromIndex, offset) {
const addressesIndex = _.range(fromIndex, fromIndex + offset);
>>>>>>>
async function discoverAddressesFrom(
cryptoAccount,
addressType: AddressType,
fromIndex: number,
offset: number
) {
const addressesIndex = _.range(fromIndex, fromIndex + offset); |
<<<<<<<
=======
getAccountInformation() {
return new Promise((resolve, reject) => {
setTimeout(() => {
let information = {
emails: [{address: '[email protected]', verified: true},
{address: '[email protected]', verified: false}],
telNums: [{num: '+4917912345678', type: 'work', verified: true},
{num: '+4917923456789', type: 'personal', verified: false}]
}
resolve(information)
}, 2000)
})
}
>>>>>>>
<<<<<<<
getAccountInformation() {
return new Promise((resolve, reject) => {
setTimeout(() => {
const information = {
emails: [
{value: '[email protected]', verified: false},
{value: '[email protected]', verified: false}
],
phoneNumbers: [
{value: '+491000222678', type: 'work', verified: true},
{value: '+4917923456789', type: 'personal', verified: false}
]
}
resolve(information)
}, 2000)
})
}
deleteEmail(email) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
updateEmail(email) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
setEmail(email) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
deletePhone(phone) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
updatePhone(phone) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
setPhone(phone) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
=======
deleteEmail(email) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
updateEmail(email) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
setEmail(email) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
startConfirmEmail({email}) {
return this._verification.startVerifyingEmail({webID: this.webID, email})
}
finishConfirmEmail({email, code}) {
return this._verification.verifyEmail({webID: this.webID, email, code})
}
>>>>>>>
getAccountInformation() {
return new Promise((resolve, reject) => {
setTimeout(() => {
const information = {
emails: [
{value: '[email protected]', verified: false},
{value: '[email protected]', verified: false}
],
phoneNumbers: [
{value: '+491000222678', type: 'work', verified: true},
{value: '+4917923456789', type: 'personal', verified: false}
]
}
resolve(information)
}, 2000)
})
}
deleteEmail(email) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
updateEmail(email) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
setEmail(email) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
deletePhone(phone) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
updatePhone(phone) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
setPhone(phone) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
startConfirmEmail({email}) {
return this._verification.startVerifyingEmail({webID: this.webID, email})
}
finishConfirmEmail({email, code}) {
return this._verification.verifyEmail({webID: this.webID, email, code})
} |
<<<<<<<
verification: combineReducers({
result: require('./modules/verification/result').default,
face: require('./modules/verification/face').default,
data: require('./modules/verification/data').default,
transition: require('./modules/verification/transition').default,
country: require('./modules/verification/country').default,
document: require('./modules/verification/document').default
}),
emailConfirmation: require('./modules/email-confirmation').default
=======
singleSignOn: combineReducers({
accessRight: require('./modules/single-sign-on/access-right').default,
accessRequest: require('./modules/single-sign-on/access-request').default
}),
verification: require('./modules/verification').default
>>>>>>>
verification: combineReducers({
result: require('./modules/verification/result').default,
face: require('./modules/verification/face').default,
data: require('./modules/verification/data').default,
transition: require('./modules/verification/transition').default,
country: require('./modules/verification/country').default,
document: require('./modules/verification/document').default
}),
emailConfirmation: require('./modules/email-confirmation').default
singleSignOn: combineReducers({
accessRight: require('./modules/single-sign-on/access-right').default,
accessRequest: require('./modules/single-sign-on/access-request').default
}),
verification: require('./modules/verification').default |
<<<<<<<
init: function(){
=======
init: function () {
>>>>>>>
init: function(){
<<<<<<<
selected: null,
=======
selected: null,
rotationIndex: 0,
>>>>>>>
selected: null,
rotationIndex: 0,
<<<<<<<
onSetState: function(key, value, flag){
=======
onSetState: function (key, value, flag) {
>>>>>>>
onSetState: function(key, value, flag){
<<<<<<<
deleteNode: function(node){
let nodeId = node.index > 0 ? node.index : node.uri
for (let i = 0; i < this.state.neighbours.length; i++){
let sourceId = node.index > 0 ? this.state.neighbours[i].index
: this.state.neighbours[i].uri
if (sourceId == nodeId)
this.state.neighbours.splice(i, 1)
}
this.state.activeNode = node
this.trigger(this.state, 'nodeRemove')
},
dissconnectNode: function(){
// Animation / removing from the neighb array will go here.
},
=======
onChangeRotationIndex: function (rotationIndex, flag) {
this.state['rotationIndex'] = rotationIndex
if (flag) this.trigger(this.state, 'changeRotationIndex')
},
deleteNode: function (svgNode, node) {
for (let i = 0; i < this.state.neighbours.length; i++) {
if (this.state.neighbours[i].uri == node.uri)
this.state.neighbours.splice(i, 1)
}
this.trigger(this.state, 'nodeRemove')
},
>>>>>>>
onChangeRotationIndex: function (rotationIndex, flag) {
this.state['rotationIndex'] = rotationIndex
if (flag) this.trigger(this.state, 'changeRotationIndex')
},
deleteNode: function(node){
let nodeId = node.index > 0 ? node.index : node.uri
for (let i = 0; i < this.state.neighbours.length; i++){
let sourceId = node.index > 0 ? this.state.neighbours[i].index
: this.state.neighbours[i].uri
if (sourceId == nodeId)
this.state.neighbours.splice(i, 1)
}
this.state.activeNode = node
this.trigger(this.state, 'nodeRemove')
},
dissconnectNode: function(){
// Animation / removing from the neighb array will go here.
},
deleteNode: function (svgNode, node) {
for (let i = 0; i < this.state.neighbours.length; i++) {
if (this.state.neighbours[i].uri == node.uri)
this.state.neighbours.splice(i, 1)
}
this.trigger(this.state, 'nodeRemove')
},
<<<<<<<
drawNewNode: function(object, predicate){
=======
drawNewNode: function (object, predicate) {
>>>>>>>
drawNewNode: function(object, predicate){
<<<<<<<
this.gAgent.fetchTriplesAtUri(object).then((result)=>{
// Adding the extra value to the object, the URI, it's usefull later.
=======
this.gAgent.fetchTriplesAtUri(object).then((result) => {
>>>>>>>
this.gAgent.fetchTriplesAtUri(object).then((result) => {
// Adding the extra value to the object, the URI, it's usefull later.
<<<<<<<
// Now we tell d3 to draw a new adjacent node on the graph, with the info from
// the triiple file
result.triples.connection = predicate
=======
// Now we tell d3 to draw a new adjacent node on the graph, with the info from
// the triiple file
result.triples.connection = predicate
>>>>>>>
// Now we tell d3 to draw a new adjacent node on the graph, with the info from
// the triiple file
result.triples.connection = predicate
result.triples.connection = predicate
<<<<<<<
// Is called by both graph.jsx and preview.jsx, we differentiate the caller
// this way making sure that we update the right component.
onGetState: function(source){
this.trigger(this.state, source)
=======
onGetState: function (source) {
this.trigger(this.state, source)
>>>>>>>
// Is called by both graph.jsx and preview.jsx, we differentiate the caller
// this way making sure that we update the right component.
onGetState: function(source){
this.trigger(this.state, source)
<<<<<<<
drawAtUri: function(uri, number){
this.state.neighbours = []
this.gAgent.getGraphMapAtUri(uri).then((triples) => {
triples[0] = this.convertor.convertToD3('c', triples[0])
this.state.center = triples[0]
for (let i = 1; i < triples.length; i++) {
triples[i] = this.convertor.convertToD3('a', triples[i], i, triples.length - 1)
this.state.neighbours.push(triples[i])
}
for (let i = 0; i < number; i++)
this.state.navHistory.pop()
this.trigger(this.state)
})
},
=======
drawAtUri: function (uri, number) {
this.state.neighbours = []
this.gAgent.getGraphMapAtUri(uri).then((triples) => {
triples[0] = this.convertor.convertToD3('c', triples[0])
this.state.center = triples[0]
for (let i = 1; i < triples.length; i++) {
triples[i] = this.convertor.convertToD3('a', triples[i], i, triples.length - 1)
this.state.neighbours.push(triples[i])
}
for (let i = 0; i < number; i++)
this.state.navHistory.pop()
this.trigger(this.state)
})
},
>>>>>>>
drawAtUri: function (uri, number) {
this.state.neighbours = []
this.gAgent.getGraphMapAtUri(uri).then((triples) => {
triples[0] = this.convertor.convertToD3('c', triples[0])
this.state.center = triples[0]
for (let i = 1; i < triples.length; i++) {
triples[i] = this.convertor.convertToD3('a', triples[i], i, triples.length - 1)
this.state.neighbours.push(triples[i])
}
for (let i = 0; i < number; i++)
this.state.navHistory.pop()
this.trigger(this.state)
})
},
<<<<<<<
// Removed the brackets, one liners.
else if(this.state.navHistory.length > 1)
for (var j = 0; j < this.state.navHistory.length-1; j++)
if (this.state.center.uri == this.state.navHistory[this.state.navHistory.length - 2 - j].uri)
for (var k = 0; k < j+2; k++)
=======
// Removed the brackets, one liners.
else if (this.state.navHistory.length > 1)
for (var j = 0; j < this.state.navHistory.length - 1; j++)
if (this.state.center.uri == this.state.navHistory[this.state.navHistory.length - 2 - j].uri)
for (var k = 0; k < j + 2; k++)
>>>>>>>
// Removed the brackets, one liners.
else if (this.state.navHistory.length > 1)
for (var j = 0; j < this.state.navHistory.length - 1; j++)
if (this.state.center.uri == this.state.navHistory[this.state.navHistory.length - 2 - j].uri)
for (var k = 0; k < j + 2; k++) |
<<<<<<<
register({userName, seedPhrase, email, password, inviteCode}) {
=======
getDisplayName({userName}) {
return this._httpAgent.get(
`${this._gatewayUrl}/${userName}/identity/name/display`
)
}
register({userName, seedPhrase, email, password}) {
>>>>>>>
getDisplayName({userName}) {
return this._httpAgent.get(
`${this._gatewayUrl}/${userName}/identity/name/display`
)
}
register({userName, seedPhrase, email, password, inviteCode}) { |
<<<<<<<
getAccountInformation() {
return new Promise((resolve, reject) => {
setTimeout(() => {
let information = {
emails: [
{address: '[email protected]', verified: true},
{address: '[email protected]', verified: false}
],
phoneNumbers: [
{number: '+4917912345678', type: 'work', verified: true},
{number: '+4917923456789', type: 'personal', verified: false}
]
}
resolve(information)
}, 2000)
})
}
deleteEmail(email) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
updateEmail(email) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
setEmail(email) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
deletePhone(phone) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
updatePhone(phone) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
setPhone(phone) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve()
}, 2000)
})
}
=======
>>>>>>> |
<<<<<<<
let DC = rdf.Namespace('http://purl.org/dc/terms/')
let RDF = rdf.Namespace('http://www.w3.org/1999/02/22-rdf-syntax-ns#')
let SIOC = rdf.Namespace('http://rdfs.org/sioc/ns#')
export const PRED = {
givenName: FOAF('givenName'),
familyName: FOAF('familyName'),
=======
export const PRED = {
givenName: FOAF('givenName'),
familyName: FOAF('familyName'),
>>>>>>>
export const PRED = {
givenName: FOAF('givenName'),
familyName: FOAF('familyName'),
<<<<<<<
isRelatedTo: SCHEMA('isRelatedTo'),
title: DC('title'),
description: DC('description'),
type: RDF('type'),
maker: FOAF('maker'),
primaryTopic: FOAF('primaryTopic'),
hasOwner: SIOC('hasOwner'),
hasSubscriber: SIOC('hasSubscriber'),
spaceOf: SIOC('spaceOf'),
space: SIOC('space'),
post: SIOC('Post'),
hasCreator: SIOC('hasCreator'),
content: SIOC('content'),
created: DC('created'),
hasContainer: SIOC('hasContainer'),
containerOf: SIOC('containerOf'),
Document: FOAF('Document'),
Image: FOAF('Image'),
Agent: FOAF('Agent'),
Thread: SIOC('Thread')
=======
isRelatedTo: SCHEMA('isRelatedTo'),
title: DC('title'),
description: DC('description'),
type: RDF('type'),
maker: FOAF('maker'),
primaryTopic: FOAF('primaryTopic'),
hasOwner: SIOC('hasOwner'),
hasSubscriber: SIOC('hasSubscriber'),
spaceOf: SIOC('spaceOf'),
post: SIOC('Post'),
hasCreator: SIOC('hasCreator'),
content: SIOC('content'),
created: DC('created'),
hasContainer: SIOC('hasContainer'),
containerOf: SIOC('containerOf'),
isRelatedTo: SCHEMA('isRelatedTo'),
Document: FOAF('Document'),
Image: FOAF('Image'),
Agent: FOAF('Agent'),
Thread: SIOC('Thread'),
bitcoin: CC('bitcoin'),
passport: PURL('Passport')
>>>>>>>
isRelatedTo: SCHEMA('isRelatedTo'),
title: DC('title'),
description: DC('description'),
type: RDF('type'),
maker: FOAF('maker'),
primaryTopic: FOAF('primaryTopic'),
hasOwner: SIOC('hasOwner'),
hasSubscriber: SIOC('hasSubscriber'),
spaceOf: SIOC('spaceOf'),
space: SIOC('space'),
post: SIOC('Post'),
hasCreator: SIOC('hasCreator'),
content: SIOC('content'),
created: DC('created'),
hasContainer: SIOC('hasContainer'),
containerOf: SIOC('containerOf'),
isRelatedTo: SCHEMA('isRelatedTo'),
Document: FOAF('Document'),
Image: FOAF('Image'),
Agent: FOAF('Agent'),
Thread: SIOC('Thread'),
bitcoin: CC('bitcoin'),
passport: PURL('Passport') |
<<<<<<<
import {keystore} from 'eth-lightwallet'
import SmartWallet from 'lib/blockchain/smartwallet'
import VerificationAgent from './verification'
import SolidAgent from './solid-wallet'
=======
import VerificationAgent from './verification'
export default class WalletAgent {
>>>>>>>
import {keystore} from 'eth-lightwallet'
import SmartWallet from 'lib/blockchain/smartwallet'
import VerificationAgent from './verification'
import SolidAgent from './solid-wallet'
<<<<<<<
this.webId = 'https://recordeddemo.webid.jolocom.de/profile/card#me'
this.lightWallet = 'something'
this._verification = new VerificationAgent()
this.solid = new SolidAgent()
=======
this.webID = 'https://recordeddemo.webid.jolocom.de/profile/card#me'
this.lightWaller = 'something'
this._verification = new VerificationAgent()
>>>>>>>
this.webId = 'https://recordeddemo.webid.jolocom.de/profile/card#me'
this.lightWallet = 'something'
this._verification = new VerificationAgent()
this.solid = new SolidAgent()
<<<<<<<
=======
Reputation: 0,
>>>>>>>
Repuation: 0, |
<<<<<<<
this.emit('select', node, data)
=======
this.emit('select', data, node)
>>>>>>>
this.emit('select', data, node)
<<<<<<<
=======
>>>>>>>
<<<<<<<
let data = d3.select(node)[0][0].__data__.index
=======
let index = d3.select(node)[0][0].__data__.index
>>>>>>>
let index = d3.select(node)[0][0].__data__.index
<<<<<<<
this.force.stop()
this.dataNodes = state.neighbours
this.drawNodes()
this.force.start()
})
=======
for (i = 0; i < this.dataLinks.length; i++) {
if(this.dataLinks[i].source.index == index) lIndex = i
}
this.force.stop()
this.dataNodes.splice(nIndex, 1)
this.drawNodes()
this.force.start()
})
>>>>>>>
for (i = 0; i < this.dataLinks.length; i++) {
if(this.dataLinks[i].source.index == index) lIndex = i
}
this.force.stop()
this.dataNodes.splice(nIndex, 1)
this.drawNodes()
this.force.start()
}) |
<<<<<<<
name: null,
=======
name: null,
email: '',
>>>>>>>
name: null,
email: '',
<<<<<<<
confidential: node.confidential
=======
x: null,
y: null,
confidential: node.confidential,
socialMedia: '',
mobilePhone: '',
address: '',
profession: '',
company: '',
url: ''
>>>>>>>
confidential: node.confidential,
socialMedia: '',
mobilePhone: '',
address: '',
profession: '',
company: '',
url: ''
<<<<<<<
if (!props.blanks[triple.subject.value]) {
=======
if (!props.blanks[triple.subject.value]) {
>>>>>>>
if (!props.blanks[triple.subject.value]) {
<<<<<<<
if (props.title === 'Bitcoin Address') {
props.type = 'bitcoin'
} else if (props.title === 'Passport') {
=======
if (props.title === 'Passport') {
>>>>>>>
if (props.title === 'Bitcoin Address') {
props.type = 'bitcoin'
} else if (props.title === 'Passport') {
<<<<<<<
=======
}
// Calculating the coordinates of the nodes so we can put them in a circle
if (i && n) {
let angle = 0
if (this.n < 8) {
angle = (2 * Math.PI) / this.n
} else {
angle = (2 * Math.PI) / 8
}
let halfwidth = STYLES.width / 2
let halfheight = STYLES.height / 2
let largeNode = STYLES.largeNodeSize
props.x = Math.sin(angle * (this.i % 8)) * largeNode * 0.5 + halfwidth
props.y = Math.cos(angle * (this.i % 8)) * largeNode * 0.5 + halfheight
} else if (!i && !n && rank === 'a') {
// This takes care of nodes that are added dynamically, the mid + 30 is
// the optimal position for spawning new nodes dynamically
props.x = STYLES.width / 2 + 60
props.y = STYLES.height / 2 + 60
>>>>>>>
<<<<<<<
props.familyName = fName.substring(props.name.length, fName.length - 1)
=======
props.familyName = fName.substring(props.name.length, fName.length)
>>>>>>>
props.familyName = fName.substring(props.name.length, fName.length) |
<<<<<<<
profileDoc: FOAF('PersonalProfileDocument'),
=======
isRelatedTo_HTTP: SCHEMA_HTTP('isRelatedTo'),
>>>>>>>
profileDoc: FOAF('PersonalProfileDocument'),
isRelatedTo_HTTP: SCHEMA_HTTP('isRelatedTo'), |
<<<<<<<
TransferTx,
TxValidation
} from '../../types/daedalusTransferTypes';
=======
TransferTx
} from '../../types/TransferTypes';
>>>>>>>
TransferTx,
TxValidation
} from '../../types/TransferTypes'; |
<<<<<<<
import oauth from "./oauth";
=======
import note_texts from "./note_texts";
>>>>>>>
import note_texts from "./note_texts";
import oauth from "./oauth";
<<<<<<<
oauth,
=======
note_texts,
>>>>>>>
note_texts,
oauth, |
<<<<<<<
TransferTx,
TxValidation
} from '../../types/daedalusTransferTypes';
import {
derivePrivate,
unpackAddress,
walletSecretFromMnemonic,
xpubToHdPassphrase
} from 'cardano-crypto.js';
import {
createAddressRoot,
decodeAddress,
decodeRustTx
} from './lib/utils';
=======
TransferTx
} from '../../types/TransferTypes';
>>>>>>>
TransferTx,
TxValidation
} from '../../types/TransferTypes';
import {
derivePrivate,
unpackAddress,
walletSecretFromMnemonic,
xpubToHdPassphrase
} from 'cardano-crypto.js';
import {
createAddressRoot,
decodeAddress,
decodeRustTx
} from './lib/utils';
<<<<<<<
/**
* Unpack and decode provided transaction and validate all addresses and witnesses
* @return array of error descriptors, or string 'OK' is everything is ok
*/
async function _validateAddressesAndSignatures(
secretWords: string,
inputWrappers: Array<DaedalusInputWrapper>,
tx: MoveResponse
): Promise<TxValidation> {
// Validate address/witness crypto
const witnessPubKeys = decodeRustTx(tx.cbor_encoded_tx).tx.witnesses.map(w => w.PkWitness[0]);
try {
const derivationScheme = 1;
const secret = await walletSecretFromMnemonic(secretWords, derivationScheme);
const pass = await xpubToHdPassphrase(secret.slice(64, 128));
const errors = inputWrappers.map((inputWrapper, idx) => {
const address = inputWrapper.address;
const addressing = inputWrapper.input.addressing;
const pubKey = witnessPubKeys[idx];
try {
return _validateAddressAndSignature(secret, pass, address, addressing, pubKey);
} catch (e) {
return { address, reason: 'Failed to perform validation!', error: stringifyError(e) };
}
}).filter(x => x);
return { errors };
} catch (e) {
return {
errors: [{ reason: 'Failed to perform validation!', error: stringifyError(e) }]
};
}
}
/**
* Unpack and decode provided address and compare with the values calculated in Rust
* @return an error descriptor object, or nothing if everything is ok
*/
function _validateAddressAndSignature(
secret: Buffer,
pass: Buffer,
address: string,
rustDerivationPath: AddressingSchemeV1,
rustPubKey: string
): any {
let unpackedAddress;
try {
unpackedAddress = unpackAddress(address, pass);
} catch (e) {
return { address, reason: 'Failed to unpack address', error: stringifyError(e) };
}
const { derivationPath } = unpackedAddress;
if (!_.isEqual(derivationPath, rustDerivationPath)) {
return { address, reason: 'Derivation path did not match', derivationPath, rustDerivationPath };
}
let pubKeyBuf;
try {
pubKeyBuf = derivationPath
.reduce((pk, i) => derivePrivate(pk, i, 1), secret)
.slice(64, 128);
} catch (e) {
return { address, reason: 'Failed to derive pub key!', error: stringifyError(e), derivationPath };
}
const pubKeyStr = pubKeyBuf.toString('hex');
if (pubKeyStr !== rustPubKey) {
return { address, reason: 'Pub key did not match', derivationPath, pubKeyStr, rustPubKey };
}
let decodedAddress;
try {
decodedAddress = decodeAddress(address);
} catch (e) {
return { address, reason: 'Failed to decode address', error: stringifyError(e) };
}
const { root, attr, type } = decodedAddress;
let calculatedRoot: string;
try {
calculatedRoot = createAddressRoot(pubKeyBuf, type, attr).toString('hex');
} catch (e) {
const attrStr = attr.toString('hex');
const reason = 'Failed to calculate root!';
const error = stringifyError(e);
return { address, reason, error, derivationPath, pubKeyStr, root, type, attrStr };
}
if (root !== calculatedRoot) {
return { address, reason: 'Root does not match', derivationPath, pubKeyStr, root, calculatedRoot };
}
return undefined;
}
/** Follow heuristic to pick which address to send Daedalus migration to */
=======
/** Follow heuristic to pick which address to send Daedalus transfer to */
>>>>>>>
/**
* Unpack and decode provided transaction and validate all addresses and witnesses
* @return array of error descriptors, or string 'OK' is everything is ok
*/
async function _validateAddressesAndSignatures(
secretWords: string,
inputWrappers: Array<DaedalusInputWrapper>,
tx: MoveResponse
): Promise<TxValidation> {
// Validate address/witness crypto
const witnessPubKeys = decodeRustTx(tx.cbor_encoded_tx).tx.witnesses.map(w => w.PkWitness[0]);
try {
const derivationScheme = 1;
const secret = await walletSecretFromMnemonic(secretWords, derivationScheme);
const pass = await xpubToHdPassphrase(secret.slice(64, 128));
const errors = inputWrappers.map((inputWrapper, idx) => {
const address = inputWrapper.address;
const addressing = inputWrapper.input.addressing;
const pubKey = witnessPubKeys[idx];
try {
return _validateAddressAndSignature(secret, pass, address, addressing, pubKey);
} catch (e) {
return { address, reason: 'Failed to perform validation!', error: stringifyError(e) };
}
}).filter(x => x);
return { errors };
} catch (e) {
return {
errors: [{ reason: 'Failed to perform validation!', error: stringifyError(e) }]
};
}
}
/**
* Unpack and decode provided address and compare with the values calculated in Rust
* @return an error descriptor object, or nothing if everything is ok
*/
function _validateAddressAndSignature(
secret: Buffer,
pass: Buffer,
address: string,
rustDerivationPath: AddressingSchemeV1,
rustPubKey: string
): any {
let unpackedAddress;
try {
unpackedAddress = unpackAddress(address, pass);
} catch (e) {
return { address, reason: 'Failed to unpack address', error: stringifyError(e) };
}
const { derivationPath } = unpackedAddress;
if (!_.isEqual(derivationPath, rustDerivationPath)) {
return { address, reason: 'Derivation path did not match', derivationPath, rustDerivationPath };
}
let pubKeyBuf;
try {
pubKeyBuf = derivationPath
.reduce((pk, i) => derivePrivate(pk, i, 1), secret)
.slice(64, 128);
} catch (e) {
return { address, reason: 'Failed to derive pub key!', error: stringifyError(e), derivationPath };
}
const pubKeyStr = pubKeyBuf.toString('hex');
if (pubKeyStr !== rustPubKey) {
return { address, reason: 'Pub key did not match', derivationPath, pubKeyStr, rustPubKey };
}
let decodedAddress;
try {
decodedAddress = decodeAddress(address);
} catch (e) {
return { address, reason: 'Failed to decode address', error: stringifyError(e) };
}
const { root, attr, type } = decodedAddress;
let calculatedRoot: string;
try {
calculatedRoot = createAddressRoot(pubKeyBuf, type, attr).toString('hex');
} catch (e) {
const attrStr = attr.toString('hex');
const reason = 'Failed to calculate root!';
const error = stringifyError(e);
return { address, reason, error, derivationPath, pubKeyStr, root, type, attrStr };
}
if (root !== calculatedRoot) {
return { address, reason: 'Root does not match', derivationPath, pubKeyStr, root, calculatedRoot };
}
return undefined;
}
/** Follow heuristic to pick which address to send Daedalus transfer to */ |
<<<<<<<
mongoose.connect('mongodb://' + keys.database.username + ':' + keys.database.password + '@ds157298.mlab.com:57298/cat-facts', {
=======
mongoose.connect(keys.database.url(), {
>>>>>>>
mongoose.connect(keys.database.url(), {
<<<<<<<
const mongoStore = new MongoStore({ url: keys.database.url() });
=======
app.use(morgan('dev'));
app.use(cookieParser());
app.use(cors());
app.use(bodyParser.json());
app.use(bodyParser.json({ type: 'application/vnd.api+json' }));
app.use(bodyParser.urlencoded({ extended: true }));
app.use(methodOverride('X-HTTP-Method-Override'));
app.use(express.static(__dirname + '/public'));
app.use(requestIp.mw());
const mongoStore = new MongoStore({url: keys.database.url()});
>>>>>>>
const mongoStore = new MongoStore({url: keys.database.url()}); |
<<<<<<<
negativeSignAfter: true,
decimalSeparator: '.'
=======
decimalSeparator: '.',
cursor: 'end'
>>>>>>>
negativeSignAfter: true,
decimalSeparator: '.',
cursor: 'end'
<<<<<<<
args.allowNegative = true;
=======
>>>>>>>
args.allowNegative = true; |
<<<<<<<
, path = require('path')
, basename = path.basename
, dirname = path.dirname
, extname = path.extname
, join = path.join
, fs = require('fs')
, read = fs.readFileSync;
=======
, path = require('path')
, dirname = path.dirname
, extname = path.extname
, join = path.join
, fs = require('fs')
, read = fs.readFileSync;
>>>>>>>
, path = require('path')
, dirname = path.dirname
, extname = path.extname
, join = path.join
, fs = require('fs')
, read = fs.readFileSync;
<<<<<<<
=======
require.register("utils.js", function(module, exports, require){
/*!
* EJS
* Copyright(c) 2010 TJ Holowaychuk <[email protected]>
* MIT Licensed
*/
/**
* Escape the given string of `html`.
*
* @param {String} html
* @return {String}
* @api private
*/
exports.escape = function(html){
return String(html)
.replace(/&(?!#?[a-zA-Z0-9]+;)/g, '&')
.replace(/</g, '<')
.replace(/>/g, '>')
.replace(/'/g, ''')
.replace(/"/g, '"');
};
}); // module: utils.js
>>>>>>> |
<<<<<<<
const config = require( './configure' );
const fs = require( 'fs' );
const path = require( 'path' );
=======
const nc = require( 'netcat/client' );
>>>>>>>
const config = require( './configure' );
const fs = require( 'fs' );
const path = require( 'path' );
const nc = require( 'netcat/client' ); |
<<<<<<<
this['withAuthorization'] = data['withAuthorization'];
=======
this['status_info_in'] = data['status_info_in'];
this['attempt'] = data['attempt'];
>>>>>>>
this['status_info_in'] = data['status_info_in'];
this['attempt'] = data['attempt'];
this['withAuthorization'] = data['withAuthorization'];
<<<<<<<
this['withAuthorization'] = undefined;
=======
this['status_info_in'] = undefined;
this['attempt'] = undefined;
>>>>>>>
this['status_info_in'] = undefined;
this['attempt'] = undefined;
this['withAuthorization'] = undefined;
<<<<<<<
},
getWithAuthorization: function() {
return this['withAuthorization'];
},
setWithAuthorization: function(data) {
this['withAuthorization'] = data;
=======
},
getStatusInfoIn: function() {
return this['status_info_in'];
},
setStatusInfoIn: function(data) {
this['status_info_in'] = data;
},
getAttempt: function() {
return this['attempt'];
},
setAttempt: function(data) {
this['attempt'] = data;
>>>>>>>
},
getStatusInfoIn: function() {
return this['status_info_in'];
},
setStatusInfoIn: function(data) {
this['status_info_in'] = data;
},
getAttempt: function() {
return this['attempt'];
},
setAttempt: function(data) {
this['attempt'] = data;
},
getWithAuthorization: function() {
return this['withAuthorization'];
},
setWithAuthorization: function(data) {
this['withAuthorization'] = data; |
<<<<<<<
if (licenseInfo.usersCount) {
if (c_LR.Success === licenseType) {
const nowUTC = getLicenseNowUtc();
let execRes = yield editorData.getPresenceUniqueUser(nowUTC);
if (licenseInfo.usersCount > execRes.length) {
licenseType = c_LR.Success;
} else {
licenseType = -1 === execRes.indexOf(userId) ? c_LR.UsersCount : c_LR.Success;
=======
if (c_LR.Success === licenseType || c_LR.SuccessLimit === licenseType) {
if (licenseInfo.usersCount) {
const now = new Date();
const nowUTC = Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), now.getUTCHours(),
now.getUTCMinutes(), now.getUTCSeconds()) / 1000;
const arrUsers = yield editorData.getPresenceUniqueUser(nowUTC);
if (arrUsers.length >= licenseInfo.usersCount && (-1 === arrUsers.indexOf(userId))) {
licenseType = c_LR.UsersCount;
>>>>>>>
if (c_LR.Success === licenseType || c_LR.SuccessLimit === licenseType) {
if (licenseInfo.usersCount) {
const nowUTC = getLicenseNowUtc();
const arrUsers = yield editorData.getPresenceUniqueUser(nowUTC);
if (arrUsers.length >= licenseInfo.usersCount && (-1 === arrUsers.indexOf(userId))) {
licenseType = c_LR.UsersCount; |
<<<<<<<
step={option.step}
=======
valueLabelDisplay="auto"
>>>>>>>
step={option.step}
valueLabelDisplay="auto" |
<<<<<<<
var height = ${element}.offsetHeight || window.innerHeight;
var width = ${element}.offsetWidth || window.innerWidth;
=======
clearInterval(updateSizeInterval)
height = ${element}.offsetHeight || document.documentElement.offsetHeight;
width = ${element}.offsetWidth || document.documentElement.offsetWidth;
>>>>>>>
height = ${element}.offsetHeight || document.documentElement.offsetHeight;
width = ${element}.offsetWidth || document.documentElement.offsetWidth; |
<<<<<<<
issuesString = markdownIssues(issues)
=======
if (config.canPublishIssues) {
issuesString = markdownIssues(issues, headDate, tailDate)
}
if (config.canPublishContributors) {
contributorsString = markdownContributors(issues)
}
>>>>>>>
issuesString = markdownIssues(issues, headDate, tailDate)
<<<<<<<
if (config.canPublishCommits) {
commitsString = markdownCommits(commits, headDate, tailDate)
}
if (config.canPublishContributors) {
contributorsString = markdownContributors(commits, headDate, tailDate)
}
=======
commitsString = markdownCommits(commits, headDate, tailDate)
>>>>>>>
if (config.canPublishCommits) {
commitsString = markdownCommits(commits, headDate, tailDate)
}
if (config.canPublishContributors) {
contributorsString = markdownContributors(commits, headDate, tailDate)
} |
<<<<<<<
});
=======
test("Syn.schedule gets called when Syn.delay is used", function() {
stop();
var iframe = document.createElement("iframe");
iframe.src = st.rootJoin("test/qunit/syn.schedule.html");
window.synSchedule = function(fn, ms) {
// fn should be a function
equal(typeof fn, "function");
// ms is a Number
equal(typeof ms, "number");
start();
};
st.g("qunit-test-area").appendChild(iframe);
});
})
>>>>>>>
test("Syn.schedule gets called when Syn.delay is used", function() {
stop();
var iframe = document.createElement("iframe");
iframe.src = st.rootJoin("test/qunit/syn.schedule.html");
window.synSchedule = function(fn, ms) {
// fn should be a function
equal(typeof fn, "function");
// ms is a Number
equal(typeof ms, "number");
start();
};
st.g("qunit-test-area").appendChild(iframe);
});
}); |
<<<<<<<
contents: this.editor.generateEmptyEditor()
=======
editorState: this.editor.generateEmptyEditor(),
contents: convertToRaw(this.editor.generateEmptyEditor().getCurrentContent())
>>>>>>>
editorState: this.editor.generateEmptyEditor(),
contents: convertToRaw(this.editor.generateEmptyEditor().getCurrentContent())
<<<<<<<
contents: notes[nd].contents ? convertToRaw(notes[nd].contents.getCurrentContent()) : this.editor.generateEmptyEditor()
=======
contents: notes[nd].contents || convertToRaw(this.editor.generateEmptyEditor().getCurrentContent())
>>>>>>>
contents: notes[nd].contents || convertToRaw(this.editor.generateEmptyEditor().getCurrentContent())
<<<<<<<
[nd]: notes[nd].contents
=======
[nd]: editorStates[nd] || EditorState.createWithContent(
convertFromRaw(notes[nd].contents),
this.editor.mainEditor.createDecorator()
)
>>>>>>>
[nd]: editorStates[nd] || EditorState.createWithContent(
convertFromRaw(notes[nd].contents),
this.editor.mainEditor.createDecorator()
)
<<<<<<<
// this.editor.focus(targetedEditorId);
=======
>>>>>>>
<<<<<<<
// this.editor.focus(contentId);
=======
>>>>>>>
<<<<<<<
// this.editor.focus(focusedEditorId);
=======
>>>>>>>
<<<<<<<
this.sectionTitle = sectionTitle;
}}
=======
this.sectionTitle = sectionTitle;
}}
>>>>>>>
this.sectionTitle = sectionTitle;
}} |
<<<<<<<
saveInStorage,
getFromStorage
} from './lib/utils';
import {
generateWalletMasterKey,
=======
generateWalletSeed,
>>>>>>>
saveInStorage,
getFromStorage
} from './lib/utils';
import {
generateWalletMasterKey,
<<<<<<<
import type { WalletMasterKey } from './lib/cardanoCrypto/cryptoWallet';
=======
>>>>>>>
import type { WalletMasterKey } from './lib/cardanoCrypto/cryptoWallet';
<<<<<<<
export function saveAdaWallet(
adaWallet: AdaWallet,
masterKey: WalletMasterKey
): void {
saveInStorage(WALLET_KEY, { adaWallet, masterKey });
}
export function getAdaWallet(): ?AdaWallet {
const stored = getFromStorage(WALLET_KEY);
return stored ? stored.adaWallet : null;
}
export function getWalletMasterKey(): WalletMasterKey {
const stored = getFromStorage(WALLET_KEY);
return stored.masterKey;
}
=======
>>>>>>> |
<<<<<<<
nonHostChars = ['%', '/', '?', ';', '#'].concat(autoEscape),
nonAuthChars = ['/', '@', '?', '#'].concat(delims),
=======
nonHostChars = ['%', '/', '?', ';', '#']
.concat(unwise).concat(autoEscape),
hostEndingChars = ['/', '?', '#'],
>>>>>>>
nonHostChars = ['%', '/', '?', ';', '#'].concat(autoEscape),
hostEndingChars = ['/', '?', '#'], |
<<<<<<<
(util.isFunction(list.listener) && list.listener === listener)) {
this._events[type] = undefined;
=======
(typeof list.listener === 'function' && list.listener === listener)) {
delete this._events[type];
>>>>>>>
(util.isFunction(list.listener) && list.listener === listener)) {
delete this._events[type]; |
<<<<<<<
const createMessage = await i18n.formatMessage(this.driver, { id: 'wallet.create.dialog.title' });
await this.waitUntilText('.Dialog_titleClassic', createMessage.toUpperCase(), 2000);
=======
const createMessage = await i18n.formatMessage(this.driver, { id: 'wallet.add.dialog.create.description' });
await this.waitUntilText('.Dialog_title', createMessage.toUpperCase(), 2000);
>>>>>>>
const createMessage = await i18n.formatMessage(this.driver, { id: 'wallet.create.dialog.title' });
await this.waitUntilText('.Dialog_title', createMessage.toUpperCase(), 2000); |
<<<<<<<
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
connectionErrorType={checkAdaServerStatus}
>
=======
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
actions={actions}
stores={stores}
>
>>>>>>>
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
connectionErrorType={checkAdaServerStatus}
actions={actions}
stores={stores}
>
<<<<<<<
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
connectionErrorType={checkAdaServerStatus}
>
=======
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
actions={actions}
stores={stores}
>
>>>>>>>
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
connectionErrorType={checkAdaServerStatus}
actions={actions}
stores={stores}
>
<<<<<<<
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
connectionErrorType={checkAdaServerStatus}
>
=======
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
actions={actions}
stores={stores}
>
>>>>>>>
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
connectionErrorType={checkAdaServerStatus}
actions={actions}
stores={stores}
>
<<<<<<<
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
connectionErrorType={checkAdaServerStatus}
>
=======
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
actions={actions}
stores={stores}
>
>>>>>>>
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
connectionErrorType={checkAdaServerStatus}
actions={actions}
stores={stores}
>
<<<<<<<
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
connectionErrorType={checkAdaServerStatus}
>
=======
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
actions={actions}
stores={stores}
>
>>>>>>>
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
connectionErrorType={checkAdaServerStatus}
actions={actions}
stores={stores}
>
<<<<<<<
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
connectionErrorType={checkAdaServerStatus}
>
=======
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
actions={actions}
stores={stores}
>
>>>>>>>
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
connectionErrorType={checkAdaServerStatus}
actions={actions}
stores={stores}
>
<<<<<<<
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
connectionErrorType={checkAdaServerStatus}
>
=======
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
actions={actions}
stores={stores}
>
>>>>>>>
<MainLayout
topbar={topBar}
classicTheme={profile.isClassicTheme}
connectionErrorType={checkAdaServerStatus}
actions={actions}
stores={stores}
> |
<<<<<<<
assert.equal(0x6f, z[1]);
assert.equal(0, Buffer('hello').slice(0, 0).length)
b = new Buffer(50);
b.fill("h");
for (var i = 0; i < b.length; i++) {
assert.equal("h".charCodeAt(0), b[i]);
}
b.fill(0);
for (var i = 0; i < b.length; i++) {
assert.equal(0, b[i]);
}
b.fill(1, 16, 32);
for (var i = 0; i < 16; i++) assert.equal(0, b[i]);
for (; i < 32; i++) assert.equal(1, b[i]);
for (; i < b.length; i++) assert.equal(0, b[i]);
=======
assert.equal(0x6f, z[1]);
var b = new SlowBuffer(10);
b.write('あいうえお', 'ucs2');
assert.equal(b.toString('ucs2'), 'あいうえお');
>>>>>>>
assert.equal(0x6f, z[1]);
assert.equal(0, Buffer('hello').slice(0, 0).length)
b = new Buffer(50);
b.fill("h");
for (var i = 0; i < b.length; i++) {
assert.equal("h".charCodeAt(0), b[i]);
}
b.fill(0);
for (var i = 0; i < b.length; i++) {
assert.equal(0, b[i]);
}
b.fill(1, 16, 32);
for (var i = 0; i < 16; i++) assert.equal(0, b[i]);
for (; i < 32; i++) assert.equal(1, b[i]);
for (; i < b.length; i++) assert.equal(0, b[i]);
var b = new SlowBuffer(10);
b.write('あいうえお', 'ucs2');
assert.equal(b.toString('ucs2'), 'あいうえお'); |
<<<<<<<
import { Wallet } from 'cardano-crypto';
=======
import moment from 'moment';
>>>>>>>
import { Wallet } from 'cardano-crypto';
<<<<<<<
sendTx,
checkAddressesInUse
=======
getUTXOsSumsForAddresses,
sendTx
>>>>>>>
getUTXOsSumsForAddresses,
sendTx,
checkAddressesInUse
<<<<<<<
const transactions = getFromStorage(TX_KEY);
if (!transactions) return Promise.resolve([[], 0]);
=======
const transactions = getAdaTxsHistory();
>>>>>>>
const transactions = getAdaTxsHistory(); |
<<<<<<<
EventEmitter.prototype.setMaxListeners = function(n) {
if (!util.isNumber(n) || n < 0 || isNaN(n))
=======
var defaultMaxListeners = 10;
EventEmitter.prototype.setMaxListeners = function setMaxListeners(n) {
if (typeof n !== 'number' || n < 0 || isNaN(n))
>>>>>>>
EventEmitter.prototype.setMaxListeners = function setMaxListeners(n) {
if (!util.isNumber(n) || n < 0 || isNaN(n))
<<<<<<<
EventEmitter.prototype.once = function(type, listener) {
if (!util.isFunction(listener))
=======
EventEmitter.prototype.once = function once(type, listener) {
if (typeof listener !== 'function')
>>>>>>>
EventEmitter.prototype.once = function once(type, listener) {
if (!util.isFunction(listener)) |
<<<<<<<
Buffer(Buffer(0), 0, 0);
[ 'hex',
'utf8',
'utf-8',
'ascii',
'binary',
'base64',
'ucs2',
'ucs-2',
'utf16le',
'utf-16le' ].forEach(function(enc) {
assert.equal(Buffer.isEncoding(enc), true);
});
[ 'utf9',
'utf-7',
'Unicode-FTW',
'new gnu gun' ].forEach(function(enc) {
assert.equal(Buffer.isEncoding(enc), false);
});
// GH-3905
assert.equal(JSON.stringify(Buffer('test')), '[116,101,115,116]');
=======
Buffer(Buffer(0), 0, 0);
// issue GH-4331
assert.throws(function() {
new Buffer(0xFFFFFFFF);
}, RangeError);
assert.throws(function() {
new Buffer(0xFFFFFFFFF);
}, TypeError);
>>>>>>>
Buffer(Buffer(0), 0, 0);
[ 'hex',
'utf8',
'utf-8',
'ascii',
'binary',
'base64',
'ucs2',
'ucs-2',
'utf16le',
'utf-16le' ].forEach(function(enc) {
assert.equal(Buffer.isEncoding(enc), true);
});
[ 'utf9',
'utf-7',
'Unicode-FTW',
'new gnu gun' ].forEach(function(enc) {
assert.equal(Buffer.isEncoding(enc), false);
});
// GH-3905
assert.equal(JSON.stringify(Buffer('test')), '[116,101,115,116]');
// issue GH-4331
assert.throws(function() {
new Buffer(0xFFFFFFFF);
}, RangeError);
assert.throws(function() {
new Buffer(0xFFFFFFFFF);
}, TypeError); |
<<<<<<<
message: MessageDescriptor,
svgClass?: string,
textClassName: string
};
=======
message: any,
svgClassName: string,
textClassName: String
|};
>>>>>>>
message: MessageDescriptor,
svgClass?: string,
textClassName: string
|}; |
<<<<<<<
publishAndViewContent( { reloadPageTwice = false } = {} ) {
this.publishPost();
if ( httpsHost ) {
=======
publishAndViewContent( { reloadPageTwice = false, useConfirmStep = false } = {} ) {
this.clickPublishPost();
if ( useConfirmStep === true ) {
this.editorConfirmationSidebarComponent = new EditorConfirmationSidebarComponent( this.driver );
this.editorConfirmationSidebarComponent.confirmAndPublish();
}
if ( host === 'WPCOM' || host === 'PRESSABLE' ) {
>>>>>>>
publishAndViewContent( { reloadPageTwice = false, useConfirmStep = false } = {} ) {
this.clickPublishPost();
if ( useConfirmStep === true ) {
this.editorConfirmationSidebarComponent = new EditorConfirmationSidebarComponent( this.driver );
this.editorConfirmationSidebarComponent.confirmAndPublish();
}
if ( httpsHost ) { |
<<<<<<<
}
/**
* Gets the account configs from the local config file.
*
* If the local configuration doesn't exist, fall back to the environmental variable.
*
* @param {string} account The account entry to get
* @returns {object} account Username/Password pair
*/
export function getAccountConfig( account ) {
const host = this.getJetpackHost();
let localConfig;
if ( config.has( 'testAccounts' ) ) {
localConfig = config.get( 'testAccounts' );
} else {
localConfig = JSON.parse( process.env.ACCOUNT_INFO );
}
if ( host !== 'WPCOM' ) {
account = 'jetpackUser' + host;
}
return localConfig[ account ];
}
export function getJetpackSiteName() {
const host = this.getJetpackHost();
if ( host === 'CI' ) {
return `${process.env.JP_PREFIX}.wp-e2e-tests.pw`;
}
// Other Jetpack site
let siteName = this.getAccountConfig( 'jetpackUser' + host )[2];
return siteName.replace( /https:\/\//, '' ).replace( /\/wp-admin/, '' );
=======
}
export function getTestCreditCardDetails() {
return {
cardHolder: 'End To End Testing',
cardType: 'VISA',
cardNumber: '4242424242424242', // https://stripe.com/docs/testing#cards
cardExpiry: '02/19',
cardCVV: '300',
cardCountryCode: 'TR', // using Turkey to force Stripe as payment processor
cardPostCode: '4000'
};
>>>>>>>
}
/**
* Gets the account configs from the local config file.
*
* If the local configuration doesn't exist, fall back to the environmental variable.
*
* @param {string} account The account entry to get
* @returns {object} account Username/Password pair
*/
export function getAccountConfig( account ) {
const host = this.getJetpackHost();
let localConfig;
if ( config.has( 'testAccounts' ) ) {
localConfig = config.get( 'testAccounts' );
} else {
localConfig = JSON.parse( process.env.ACCOUNT_INFO );
}
if ( host !== 'WPCOM' ) {
account = 'jetpackUser' + host;
}
return localConfig[ account ];
}
export function getJetpackSiteName() {
const host = this.getJetpackHost();
if ( host === 'CI' ) {
return `${process.env.JP_PREFIX}.wp-e2e-tests.pw`;
}
// Other Jetpack site
let siteName = this.getAccountConfig( 'jetpackUser' + host )[2];
return siteName.replace( /https:\/\//, '' ).replace( /\/wp-admin/, '' );
}
export function getTestCreditCardDetails() {
return {
cardHolder: 'End To End Testing',
cardType: 'VISA',
cardNumber: '4242424242424242', // https://stripe.com/docs/testing#cards
cardExpiry: '02/19',
cardCVV: '300',
cardCountryCode: 'TR', // using Turkey to force Stripe as payment processor
cardPostCode: '4000'
}; |
<<<<<<<
if ( httpsHost ) {
postEditorToolbarComponent.publishPost();
=======
if ( host === 'WPCOM' || host === 'PRESSABLE' ) {
postEditorToolbarComponent.publishThePost( { useConfirmStep: usePublishConfirmation } );
>>>>>>>
if ( httpsHost ) {
postEditorToolbarComponent.publishThePost( { useConfirmStep: usePublishConfirmation } ); |
<<<<<<<
await eyesHelper.eyesScreenshot( this.driver, eyes, 'Create New Payment Button' );
return await driverHelper.clickWhenClickable(
=======
if ( eyes ) {
eyesHelper.eyesScreenshot( this.driver, eyes, 'Create New Payment Button' );
}
return driverHelper.clickWhenClickable(
>>>>>>>
if ( eyes ) {
await eyesHelper.eyesScreenshot( this.driver, eyes, 'Create New Payment Button' );
}
return driverHelper.clickWhenClickable( |
<<<<<<<
async viewPublishedPostOrPage() {
const viewPostSelector = By.css( '.components-notice__content a' );
await driverHelper.clickWhenClickable( this.driver, viewPostSelector );
}
=======
async schedulePost( publishDate ) {
await driverHelper.clickWhenClickable(
this.driver,
By.css( '.editor-post-publish-panel__toggle' )
);
await driverHelper.waitTillPresentAndDisplayed(
this.driver,
By.css( '.editor-post-publish-panel__header' )
);
await driverHelper.verifyTextPresent(
this.driver,
By.css( '.editor-post-publish-panel__link' ),
publishDate
);
await driverHelper.clickWhenClickable(
this.driver,
By.css( '.editor-post-publish-panel__header-publish-button button:not([disabled])' )
);
await driverHelper.waitTillNotPresent(
this.driver,
By.css( '.editor-post-publish-panel__content .components-spinner' )
);
await driverHelper.waitTillPresentAndDisplayed(
this.driver,
By.css( '.editor-post-publish-panel__header-published' )
);
return await driverHelper.verifyTextPresent(
this.driver,
By.css( '.editor-post-publish-panel__header-published' ),
'Scheduled'
);
}
async closeScheduledPanel() {
await driverHelper.clickWhenClickable( this.driver, By.css( '.dashicons-no-alt' ) );
}
>>>>>>>
async viewPublishedPostOrPage() {
const viewPostSelector = By.css( '.components-notice__content a' );
await driverHelper.clickWhenClickable( this.driver, viewPostSelector );
}
async schedulePost( publishDate ) {
await driverHelper.clickWhenClickable(
this.driver,
By.css( '.editor-post-publish-panel__toggle' )
);
await driverHelper.waitTillPresentAndDisplayed(
this.driver,
By.css( '.editor-post-publish-panel__header' )
);
await driverHelper.verifyTextPresent(
this.driver,
By.css( '.editor-post-publish-panel__link' ),
publishDate
);
await driverHelper.clickWhenClickable(
this.driver,
By.css( '.editor-post-publish-panel__header-publish-button button:not([disabled])' )
);
await driverHelper.waitTillNotPresent(
this.driver,
By.css( '.editor-post-publish-panel__content .components-spinner' )
);
await driverHelper.waitTillPresentAndDisplayed(
this.driver,
By.css( '.editor-post-publish-panel__header-published' )
);
return await driverHelper.verifyTextPresent(
this.driver,
By.css( '.editor-post-publish-panel__header-published' ),
'Scheduled'
);
}
async closeScheduledPanel() {
await driverHelper.clickWhenClickable( this.driver, By.css( '.dashicons-no-alt' ) );
} |
<<<<<<<
=======
import environment from '../../environment';
>>>>>>>
<<<<<<<
_getErrorMessageComponent = (): Node => {
const { intl } = this.context;
const {
onExternalLinkClick,
downloadLogs
} = this.props;
const downloadLogsLink = (
// eslint-disable-next-line jsx-a11y/anchor-is-valid
<a
href="#"
onClick={_event => downloadLogs()}
>
{intl.formatMessage(globalMessages.downloadLogsLink)}
</a>
);
const supportRequestLink = (
<a
href={intl.formatMessage(globalMessages.supportRequestLinkUrl)}
onClick={event => onExternalLinkClick(event)}
>
{intl.formatMessage(globalMessages.contactSupport)}
</a>
);
return (
<p>
<FormattedMessage {...globalMessages.logsContent} values={{ downloadLogsLink }} /><br />
<FormattedMessage {...messages.error} values={{ supportRequestLink }} />
</p>
);
};
=======
_getErrorMessageComponent = (): Node => {
const { intl } = this.context;
const {
onExternalLinkClick,
downloadLogs
} = this.props;
const downloadLogsLink = (
// eslint-disable-next-line jsx-a11y/anchor-is-valid
<a
className={styles.link}
href="#"
onClick={_event => downloadLogs()}
>
{intl.formatMessage(globalMessages.downloadLogsLink)}
</a>
);
const supportRequestLink = (
<a
className={styles.link}
href={intl.formatMessage(globalMessages.supportRequestLinkUrl)}
onClick={event => onExternalLinkClick(event)}
>
{intl.formatMessage(globalMessages.contactSupport)}
</a>
);
return (
<p>
<FormattedMessage {...globalMessages.logsContent} values={{ downloadLogsLink }} /><br />
<FormattedMessage {...messages.error} values={{ supportRequestLink }} />
</p>
);
};
>>>>>>>
_getErrorMessageComponent = (): Node => {
const { intl } = this.context;
const {
onExternalLinkClick,
downloadLogs
} = this.props;
const downloadLogsLink = (
// eslint-disable-next-line jsx-a11y/anchor-is-valid
<a
className={styles.link}
href="#"
onClick={_event => downloadLogs()}
>
{intl.formatMessage(globalMessages.downloadLogsLink)}
</a>
);
const supportRequestLink = (
<a
className={styles.link}
href={intl.formatMessage(globalMessages.supportRequestLinkUrl)}
onClick={event => onExternalLinkClick(event)}
>
{intl.formatMessage(globalMessages.contactSupport)}
</a>
);
return (
<p>
<FormattedMessage {...globalMessages.logsContent} values={{ downloadLogsLink }} /><br />
<FormattedMessage {...messages.error} values={{ supportRequestLink }} />
</p>
);
}; |
<<<<<<<
var outte = oNewElement[0] ? oNewElement[0].outerHTML : '';
$('body').append('<div class="' + sElementClass + '" style="position: absolute; top: ' + top + 'px; left : ' + left + 'px; width: ' + width + 'px; height: ' + height + 'px;"><svg>' + outte + '</svg></div>');
=======
$('body').append('<div class="' + sElementClass + ' div-over-svg" style="position: absolute; top: ' + top + 'px; left : ' + left + 'px; width: ' + width + 'px; height: ' + height + 'px;"><svg>' + oNewElement[0].outerHTML + '</svg></div>');
>>>>>>>
var outte = oNewElement[0] ? oNewElement[0].outerHTML : '';
$('body').append('<div class="' + sElementClass + ' div-over-svg" style="position: absolute; top: ' + top + 'px; left : ' + left + 'px; width: ' + width + 'px; height: ' + height + 'px;"><svg>' + outte + '</svg></div>'); |
<<<<<<<
extrainfo += '<h7>Amdts Déposés </h7>'
=======
>>>>>>>
extrainfo += '<h7>Amdts Déposés </h7>' |
<<<<<<<
const bcrypt = req.bcrypt;
=======
const saltRounds = 10;
let bcrypt = req.bcrypt;
>>>>>>>
const bcrypt = req.bcrypt;
const saltRounds = 10;
<<<<<<<
const update_doc = {};
=======
let update_doc = {};
const saltRounds = 10;
>>>>>>>
const update_doc = {};
const saltRounds = 10; |
<<<<<<<
jump_to: {
=======
// some instructions for controlling the flow of the program
'jump_to': {
>>>>>>>
// some instructions for controlling the flow of the program
jump_to: {
<<<<<<<
data: {
=======
// some additional miscellanous instructions
'data': {
>>>>>>>
// some additional miscellanous instructions
data: { |
<<<<<<<
var channelName = message.channel,
response;
message.__id = Faye.random();
Faye.each(this._channels.glob(channelName), function(channel) {
channel.push(message);
this.info('Publishing message ? from client ? to ?', message.data, message.clientId, channel.name);
}, this);
if (Faye.Channel.isMeta(channelName)) {
response = this[Faye.Channel.parse(channelName)[1]](message, local);
=======
this.pipeThroughExtensions('incoming', message, function(message) {
if (!message) return callback.call(scope, []);
>>>>>>>
this.pipeThroughExtensions('incoming', message, function(message) {
if (!message) return callback.call(scope, []);
<<<<<<<
return this._connection(response.clientId).connect(function(events) {
this.info('Sending event messages to ?', response.clientId);
this.debug('Events for ?: ?', response.clientId, events);
Faye.each(events, function(e) { delete e.__id });
callback.call(scope, [response].concat(events));
}, this);
}
if (!message.clientId || Faye.Channel.isService(channelName))
return callback([]);
response = this._makeResponse(message);
response.successful = true;
callback(response);
=======
if (!message.clientId || Faye.Channel.isService(channel))
return callback.call(scope, []);
response = this._makeResponse(message);
response.successful = true;
callback.call(scope, [response]);
}, this);
>>>>>>>
if (!message.clientId || Faye.Channel.isService(channelName))
return callback.call(scope, []);
response = this._makeResponse(message);
response.successful = true;
callback.call(scope, [response]);
}, this); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.