conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
// bibliography sorting
bib_sort = function (m, major, minor, asc_maj, asc_min) {
var result = [],
docs,
major_key,
minor_key,
cmp_maj,
cmp_min,
cur_major,
i,
last,
get_id = function (d) { return d.id; },
partition = [];
if (major === "decade") {
major_key = function (i) {
return Math.floor(m.meta(i).date.getUTCFullYear() / 10).toString() +
"0s";
};
} else if (major === "year") {
major_key = function (i) {
return m.meta(i).date.getUTCFullYear();
};
} else if (major === "journal") {
major_key = function (i) {
return m.meta(i).journaltitle;
};
} else if (major === "issue") {
major_key = function (i) {
var doc = m.meta(i),
k, iss;
k = doc.journaltitle;
k += "_" + d3.format("05d")(doc.volume);
// Signs-specific issue logic: issue := [1234]S?
if (String(doc.issue).search("S") !== -1) {
// encode nS as an integer, n * 10 + 5. 5 = S. Funny.
iss = +doc.issue.replace("S", "") * 10 + 5;
} else {
iss = +doc.issue * 10;
}
k += "_" + String(iss);
return k;
};
} else { // expected: major === "alpha"
// default to alphabetical by author
major_key = function (i) {
return doc_author_string(m.meta(i)).replace(/^\W*/, "")[0]
.toUpperCase();
};
}
if (minor === "date") {
minor_key = function (i) {
return +m.meta(i).date;
};
} else if (minor === "journal") {
minor_key = function (i) {
var doc = m.meta(i),
result_m = doc.journaltitle;
result_m += d3.format("05d")(doc.volume);
result_m += d3.format("05d")((doc.issue === "") ? 0
: doc.issue.replace(/\/.*$/, ""));
if (doc.pagerange.search(/^\d/) !== -1) {
result_m += d3.format("05d")(doc.pagerange.match(/^(\d+)/)[1]);
} else {
result_m += doc.pagerange;
}
return result_m;
};
} else { // expected: minor === "alpha"
// default to alphabetical by author then title
minor_key = function (i) {
return doc_author_string(m.meta(i)) + m.meta(i).title;
};
}
cmp_maj = asc_maj ? d3.ascending : d3.descending;
cmp_min = asc_min ? d3.ascending : d3.descending;
docs = d3.range(m.n_docs())
.map(function (d) {
return {
id: d,
major: major_key(d),
minor: minor_key(d)
};
})
.sort(function (a, b) {
return cmp_maj(a.major, b.major) ||
cmp_min(a.minor, b.minor) ||
d3.ascending(a.id, b.id); // stabilize sort
});
for (i = 0, cur_major = ""; i < docs.length; i += 1) {
if (docs[i].major !== cur_major) {
partition.push(i);
result.push({
heading: docs[i].major
});
cur_major = docs[i].major;
}
}
partition.shift(); // correct for "0" always getting added at the start
partition.push(docs.length); // make sure we get the tail
for (i = 0, last = 0; i < partition.length; i += 1) {
result[i].docs = docs.slice(last, partition[i]).map(get_id);
last = partition[i];
}
return result;
};
// validate major/minor sort terms. The output is the same as the input,
// except an invalid term is replaced with undefined.
bib_sort.validate = function (p) {
var result = p;
if (VIS.bib_keys.major.indexOf(p.major) === -1) {
result.major = undefined;
}
if (VIS.bib_keys.minor.indexOf(p.minor) === -1) {
result.minor = undefined;
}
if (p.dir !== "up" && p.dir !== "down") {
result.dir = undefined;
}
return result;
};
// Semantics of ascending/descending
// minor dir == major dir iff minor & major are semantically similar
// with ascending as the default otherwise
bib_sort.dir = function (p) {
var result = {
major: true,
minor: true
};
if (p.dir === "up") {
return result;
}
if (p.dir === "down") {
result.major = false;
if (p.major === "decade" || p.major === "year"
|| p.major === "issue") {
result.minor = p.minor !== "date" && p.minor !== "journal";
} else if (p.major === "alpha" || p.major === "journal") {
// journal title descending --> journal contents ascending
// Right, I think, but not wholly obvious
result.minor = p.minor !== "alpha";
} else {
// shouldn't ever get here, but...
result.minor = true;
}
}
return result;
};
=======
>>>>>>>
<<<<<<<
doc_author_string = function (doc) {
var lead,
lead_trail,
result;
if (doc.authors.length > 0) {
lead = doc.authors[0].replace(/,/g, "").split(" ");
// check for Jr., Sr., 2nd, etc.
// Can mess up if last name is actually the letter I, X, or V.
lead_trail = lead.pop();
if (lead.length >= 2
&& (lead_trail.search(/^(\d|Jr|Sr|[IXV]+$)/) !== -1)) {
result = lead.pop().replace(/_$/, "");
lead_trail = ", " + lead_trail.replace(/\W*$/, "");
} else {
result = lead_trail;
lead_trail = "";
}
result += ", " + lead.join(" ") + lead_trail;
if (doc.authors.length > 1) {
// "et al" is better for real bibliography, but it's
// actually worth being able to search all the multiple authors
/*if (doc.authors.length > 3) {
result += ", " + doc.authors.slice(1, 3).join(", ");
result += "et al.";
} else {*/
if (doc.authors.length > 2) {
result += ", ";
result += doc.authors
.slice(1, doc.authors.length - 1)
.join(", ");
}
result += ", and " + doc.authors[doc.authors.length - 1];
}
} else {
result = "[Anon]";
}
return result;
};
cite_docs = function (m, ds) {
var result;
if (ds && ds.length) {
result = ds.map(function (d) {
return cite_doc(m, d);
});
}
return result;
};
cite_doc = function (m, d) {
var doc, s, title, mo;
if (!VIS.citations) {
VIS.citations = [];
}
if (!VIS.citations[d]) {
doc = m.meta(d);
s = doc_author_string(doc);
// don't duplicate trailing period on middle initial etc.
s = s.replace(/\.?$/, ". ");
// double quotation marks in title to single
// based on https://gist.github.com/drdrang/705071
title = doc.title.replace(/“/g,'‘')
.replace(/”/g,'’')
.replace(/(^|[-\u2014/(\[{\u2018\s])"/g, "$1‘") // opening "
.replace(/"/g,'’') // which leaves closing "
.replace(/'/g,'’')
.replace(/ <br><\/br>/g,'. ');
s += '“' + title + '.”';
s = s.replace(/’\./g,".’"); // fix up ’.” situations
s += " <em>" + doc.journaltitle + "</em> ";
s += doc.volume;
if (doc.issue) {
s += ", no. " + doc.issue;
}
s += " (";
mo = doc.date.getUTCMonth(); // 0 to 11
if (mo === 0 || mo === 11) {
s += "Winter ";
} else if (mo === 2 || mo === 3) {
s += "Spring ";
} else if (mo === 5 || mo === 6) {
s += "Summer ";
} else if (mo === 8 || mo === 9) {
s += "Autumn ";
}
s += doc.date.getUTCFullYear() + "): ";
s += doc.pagerange + ".";
s = s.replace(/\.\./g, ".");
s = s.replace(/_/g, ",");
s = s.replace(/\t/g, "");
VIS.citations[d] = s;
}
return VIS.citations[d];
};
=======
>>>>>>>
<<<<<<<
citations: cite_docs(m, ds),
specials: m.special_issue(ds),
=======
citations: docs.map(function (d) {
return bib.citation(m.meta(d.doc));
}),
>>>>>>>
specials: m.special_issue(ds),
citations: docs.map(function (d) {
return bib.citation(m.meta(d.doc));
}),
<<<<<<<
=======
if (!VIS.ready.bib) {
// Cache the list of citations
// TODO better to do this on the model (in a thread?)
VIS.bib_citations = m.meta().map(bib.citation);
VIS.ready.bib = true;
}
>>>>>>>
if (!VIS.ready.bib) {
// Cache the list of citations
// TODO better to do this on the model (in a thread?)
VIS.bib_citations = m.meta().map(bib.citation);
VIS.ready.bib = true;
} |
<<<<<<<
import {load} from '../actions/infoActions';
import {requireServerCss} from '../util';
const styles = __CLIENT__ ? require('./InfoBar.scss') : requireServerCss(require.resolve('./InfoBar.scss'));
=======
import * as infoActions from '../actions/infoActions';
>>>>>>>
import {load} from '../actions/infoActions';
<<<<<<<
const {info, load} = this.props; // eslint-disable-line no-shadow
=======
const {info, load} = this.props;
const styles = require('./InfoBar.scss');
>>>>>>>
const {info, load} = this.props; // eslint-disable-line no-shadow
const styles = require('./InfoBar.scss'); |
<<<<<<<
var escapeRegExp = require('../utilities/escape-regexp');
var debug = require('debug')('ember-cli:addon');
=======
>>>>>>>
var debug = require('debug')('ember-cli:addon'); |
<<<<<<<
{ name: 'dry-run', type: Boolean, default: false, aliases: ['d'] },
{ name: 'verbose', type: Boolean, default: false, aliases: ['v'] },
{ name: 'blueprint', type: String, aliases: ['b'] },
{ name: 'skip-npm', type: Boolean, default: false, aliases: ['sn'] },
{ name: 'skip-bower', type: Boolean, default: false, aliases: ['sb'] },
{ name: 'welcome', type: Boolean, default: true, description: 'Installs and uses {{ember-welcome-page}}. Use --no-welcome to skip it.' },
{ name: 'yarn', type: Boolean },
{ name: 'name', type: String, default: '', aliases: ['n'] },
=======
{ name: 'dry-run', type: Boolean, default: false, aliases: ['d'] },
{ name: 'verbose', type: Boolean, default: false, aliases: ['v'] },
{ name: 'blueprint', type: String, aliases: ['b'] },
{ name: 'skip-npm', type: Boolean, default: false, aliases: ['sn'] },
{ name: 'skip-bower', type: Boolean, default: false, aliases: ['sb'] },
{ name: 'yarn', type: Boolean }, // no default means use yarn if the blueprint has a yarn.lock
{ name: 'name', type: String, default: '', aliases: ['n'] },
>>>>>>>
{ name: 'dry-run', type: Boolean, default: false, aliases: ['d'] },
{ name: 'verbose', type: Boolean, default: false, aliases: ['v'] },
{ name: 'blueprint', type: String, aliases: ['b'] },
{ name: 'skip-npm', type: Boolean, default: false, aliases: ['sn'] },
{ name: 'skip-bower', type: Boolean, default: false, aliases: ['sb'] },
{ name: 'welcome', type: Boolean, default: true, description: 'Installs and uses {{ember-welcome-page}}. Use --no-welcome to skip it.' },
{ name: 'yarn', type: Boolean }, // no default means use yarn if the blueprint has a yarn.lock
{ name: 'name', type: String, default: '', aliases: ['n'] }, |
<<<<<<<
const connect = require('../../metamask-connect')
const { compose } = require('recompose')
const { withRouter } = require('react-router-dom')
=======
const PropTypes = require('prop-types')
const connect = require('react-redux').connect
>>>>>>>
const connect = require('react-redux').connect
const { compose } = require('recompose')
const { withRouter } = require('react-router-dom')
const PropTypes = require('prop-types')
<<<<<<<
const {
SETTINGS_ROUTE,
INFO_ROUTE,
NEW_ACCOUNT_ROUTE,
IMPORT_ACCOUNT_ROUTE,
DEFAULT_ROUTE,
} = require('../../routes')
module.exports = compose(
withRouter,
connect(mapStateToProps, mapDispatchToProps)
)(AccountMenu)
=======
AccountMenu.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountMenu)
>>>>>>>
const {
SETTINGS_ROUTE,
INFO_ROUTE,
NEW_ACCOUNT_ROUTE,
IMPORT_ACCOUNT_ROUTE,
DEFAULT_ROUTE,
} = require('../../routes')
module.exports = compose(
withRouter,
connect(mapStateToProps, mapDispatchToProps)
)(AccountMenu)
AccountMenu.contextTypes = {
t: PropTypes.func,
}
<<<<<<<
onClick: () => {
lockMetamask()
history.push(DEFAULT_ROUTE)
},
}, this.props.t('logout')),
=======
onClick: lockMetamask,
}, this.context.t('logout')),
>>>>>>>
onClick: () => {
lockMetamask()
history.push(DEFAULT_ROUTE)
},
}, this.context.t('logout')), |
<<<<<<<
let ember = this.project.findAddonByName('ember-source');
let developmentEmber;
let productionEmber;
let emberShims;
let jquery;
=======
var bowerDeps = this.project.bowerDependencies();
var ember = this.project.findAddonByName('ember-source');
var addonEmberCliShims = this.project.findAddonByName('ember-cli-shims');
var bowerEmberCliShims = bowerDeps['ember-cli-shims'];
var developmentEmber;
var productionEmber;
var emberShims = null;
var jquery;
>>>>>>>
let bowerDeps = this.project.bowerDependencies();
let ember = this.project.findAddonByName('ember-source');
let addonEmberCliShims = this.project.findAddonByName('ember-cli-shims');
let bowerEmberCliShims = bowerDeps['ember-cli-shims'];
let developmentEmber;
let productionEmber;
let emberShims = null;
let jquery;
<<<<<<<
jquery = `${this.bowerDirectory}/jquery/dist/jquery.js`;
emberShims = `${this.bowerDirectory}/ember-cli-shims/app-shims.js`;
=======
jquery = this.bowerDirectory + '/jquery/dist/jquery.js';
if (bowerEmberCliShims) {
emberShims = this.bowerDirectory + '/ember-cli-shims/app-shims.js';
}
>>>>>>>
jquery = `${this.bowerDirectory}/jquery/dist/jquery.js`;
if (bowerEmberCliShims) {
emberShims = `${this.bowerDirectory}/ember-cli-shims/app-shims.js`;
}
<<<<<<<
let handlebarsVendorFiles;
let bowerDeps = this.project.bowerDependencies();
=======
var handlebarsVendorFiles;
>>>>>>>
let handlebarsVendorFiles; |
<<<<<<<
let publicPath = this._resolveLocal('public');
let publicTree = existsSync(publicPath) ? new WatchedDir(publicPath) : null;
let detectedDefaultOptions = {
babel: {
modules: 'amd',
moduleIds: true,
resolveModuleSource: require('amd-name-resolver').moduleResolve,
},
jshintrc: {
app: this.project.root,
tests: testsPath,
},
minifyCSS: {
enabled: this.isProduction,
options: { processImport: false },
},
minifyJS: {
enabled: this.isProduction,
},
outputPaths: {
app: {
css: {
'app': `/assets/${this.name}.css`,
},
js: `/assets/${this.name}.js`,
=======
let detectedDefaultOptions = {
babel: {
modules: 'amdStrict',
moduleIds: true,
resolveModuleSource: require('amd-name-resolver').moduleResolve,
},
jshintrc: {
app: this.project.root,
tests: this._resolveLocal('tests'),
},
minifyCSS: {
enabled: this.isProduction,
options: { processImport: false },
},
minifyJS: {
enabled: this.isProduction,
},
outputPaths: {
app: {
css: {
'app': `/assets/${this.name}.css`,
>>>>>>>
let publicPath = this._resolveLocal('public');
let publicTree = existsSync(publicPath) ? new WatchedDir(publicPath) : null;
let detectedDefaultOptions = {
babel: {
modules: 'amdStrict',
moduleIds: true,
resolveModuleSource: require('amd-name-resolver').moduleResolve,
},
jshintrc: {
app: this.project.root,
tests: testsPath,
},
minifyCSS: {
enabled: this.isProduction,
options: { processImport: false },
},
minifyJS: {
enabled: this.isProduction,
},
outputPaths: {
app: {
css: {
'app': `/assets/${this.name}.css`,
},
js: `/assets/${this.name}.js`, |
<<<<<<<
package: tree => mergeTrees([tree, input.path()]),
=======
trees: {
styles: appStyles.path(),
},
>>>>>>>
package: tree => mergeTrees([tree, input.path()]),
trees: {
styles: appStyles.path(),
}, |
<<<<<<<
=======
// process.on('unhandledRejection', e => {
// throw e;
// });
>>>>>>> |
<<<<<<<
{
description: 'should return header object when request failed due to non-success response from server #221',
expected: 'rejected:',
func: function (resolve, reject) { cordova.plugin.http.get('https://httpbin.org/status/418', {}, {}, resolve, reject); },
validationFunc: function (driver, result) {
result.type.should.be.equal('rejected');
result.data.headers.should.be.an('object');
}
},
{
description: 'should return status code when request failed due to non-success response from server',
expected: 'rejected:',
func: function (resolve, reject) { cordova.plugin.http.get('https://httpbin.org/status/418', {}, {}, resolve, reject); },
validationFunc: function (driver, result) {
result.type.should.be.equal('rejected');
result.data.status.should.be.equal(418);
}
},
{
description: 'should return url string when request failed due to non-success response from server',
expected: 'rejected:',
func: function (resolve, reject) { cordova.plugin.http.get('https://httpbin.org/status/418', {}, {}, resolve, reject); },
validationFunc: function (driver, result) {
result.type.should.be.equal('rejected');
result.data.url.should.be.equal('https://httpbin.org/status/418');
}
},
{
description: 'shouldn\'t return header object when request failed before receiving response from server',
expected: 'rejected:',
func: function (resolve, reject) { cordova.plugin.http.get('https://not_existing_url', {}, {}, resolve, reject); },
validationFunc: function (driver, result) {
result.type.should.be.equal('rejected');
should.equal(result.data.headers, undefined);
}
},
{
description: 'should return status code when request failed before receiving response from server',
expected: 'rejected:',
func: function (resolve, reject) { cordova.plugin.http.get('https://not_existing_url', {}, {}, resolve, reject); },
validationFunc: function (driver, result) {
result.type.should.be.equal('rejected');
result.data.status.should.be.a('number');
}
},
{
description: 'shouldn\'t return url string when request failed before receiving response from server',
expected: 'rejected:',
func: function (resolve, reject) { cordova.plugin.http.get('https://not_existing_url', {}, {}, resolve, reject); },
validationFunc: function (driver, result) {
result.type.should.be.equal('rejected');
should.equal(result.data.url, undefined);
}
}
=======
{
description: 'should fetch binary correctly when response type is "arraybuffer"',
expected: 'resolved: {"hash":-1032603775,"byteLength":35588}',
func: function (resolve, reject) {
var url = 'https://httpbin.org/image/jpeg';
var options = { method: 'get', responseType: 'arraybuffer' };
var success = function (response) {
resolve({
hash: helpers.hashArrayBuffer(response.data),
byteLength: response.data.byteLength
});
};
cordova.plugin.http.sendRequest(url, options, success, reject);
},
validationFunc: function (driver, result) {
result.type.should.be.equal('resolved');
result.data.hash.should.be.equal(-1032603775);
result.data.byteLength.should.be.equal(35588);
}
},
{
description: 'should decode error body even if response type is "arraybuffer"',
expected: 'rejected: {"status": 418, ...',
func: function (resolve, reject) {
var url = 'https://httpbin.org/status/418';
var options = { method: 'get', responseType: 'arraybuffer' };
cordova.plugin.http.sendRequest(url, options, resolve, reject);
},
validationFunc: function (driver, result) {
result.type.should.be.equal('rejected');
result.data.status.should.be.equal(418);
result.data.error.should.be.equal("\n -=[ teapot ]=-\n\n _...._\n .' _ _ `.\n | .\"` ^ `\". _,\n \\_;`\"---\"`|//\n | ;/\n \\_ _/\n `\"\"\"`\n");
}
}
>>>>>>>
{
description: 'should return header object when request failed due to non-success response from server #221',
expected: 'rejected:',
func: function (resolve, reject) { cordova.plugin.http.get('https://httpbin.org/status/418', {}, {}, resolve, reject); },
validationFunc: function (driver, result) {
result.type.should.be.equal('rejected');
result.data.headers.should.be.an('object');
}
},
{
description: 'should return status code when request failed due to non-success response from server',
expected: 'rejected:',
func: function (resolve, reject) { cordova.plugin.http.get('https://httpbin.org/status/418', {}, {}, resolve, reject); },
validationFunc: function (driver, result) {
result.type.should.be.equal('rejected');
result.data.status.should.be.equal(418);
}
},
{
description: 'should return url string when request failed due to non-success response from server',
expected: 'rejected:',
func: function (resolve, reject) { cordova.plugin.http.get('https://httpbin.org/status/418', {}, {}, resolve, reject); },
validationFunc: function (driver, result) {
result.type.should.be.equal('rejected');
result.data.url.should.be.equal('https://httpbin.org/status/418');
}
},
{
description: 'shouldn\'t return header object when request failed before receiving response from server',
expected: 'rejected:',
func: function (resolve, reject) { cordova.plugin.http.get('https://not_existing_url', {}, {}, resolve, reject); },
validationFunc: function (driver, result) {
result.type.should.be.equal('rejected');
should.equal(result.data.headers, undefined);
}
},
{
description: 'should return status code when request failed before receiving response from server',
expected: 'rejected:',
func: function (resolve, reject) { cordova.plugin.http.get('https://not_existing_url', {}, {}, resolve, reject); },
validationFunc: function (driver, result) {
result.type.should.be.equal('rejected');
result.data.status.should.be.a('number');
}
},
{
description: 'shouldn\'t return url string when request failed before receiving response from server',
expected: 'rejected:',
func: function (resolve, reject) { cordova.plugin.http.get('https://not_existing_url', {}, {}, resolve, reject); },
validationFunc: function (driver, result) {
result.type.should.be.equal('rejected');
should.equal(result.data.url, undefined);
}
},
{
description: 'should fetch binary correctly when response type is "arraybuffer"',
expected: 'resolved: {"hash":-1032603775,"byteLength":35588}',
func: function (resolve, reject) {
var url = 'https://httpbin.org/image/jpeg';
var options = { method: 'get', responseType: 'arraybuffer' };
var success = function (response) {
resolve({
hash: helpers.hashArrayBuffer(response.data),
byteLength: response.data.byteLength
});
};
cordova.plugin.http.sendRequest(url, options, success, reject);
},
validationFunc: function (driver, result) {
result.type.should.be.equal('resolved');
result.data.hash.should.be.equal(-1032603775);
result.data.byteLength.should.be.equal(35588);
}
},
{
description: 'should decode error body even if response type is "arraybuffer"',
expected: 'rejected: {"status": 418, ...',
func: function (resolve, reject) {
var url = 'https://httpbin.org/status/418';
var options = { method: 'get', responseType: 'arraybuffer' };
cordova.plugin.http.sendRequest(url, options, resolve, reject);
},
validationFunc: function (driver, result) {
result.type.should.be.equal('rejected');
result.data.status.should.be.equal(418);
result.data.error.should.be.equal("\n -=[ teapot ]=-\n\n _...._\n .' _ _ `.\n | .\"` ^ `\". _,\n \\_;`\"---\"`|//\n | ;/\n \\_ _/\n `\"\"\"`\n");
}
} |
<<<<<<<
const connect = require('../../metamask-connect')
const { withRouter } = require('react-router-dom')
const { compose } = require('recompose')
=======
const PropTypes = require('prop-types')
const connect = require('react-redux').connect
>>>>>>>
const { withRouter } = require('react-router-dom')
const { compose } = require('recompose')
const PropTypes = require('prop-types')
const connect = require('react-redux').connect
<<<<<<<
module.exports = compose(
withRouter,
connect(mapStateToProps, mapDispatchToProps)
)(ConfirmSendToken)
=======
ConfirmSendToken.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(ConfirmSendToken)
>>>>>>>
ConfirmSendToken.contextTypes = {
t: PropTypes.func,
}
module.exports = compose(
withRouter,
connect(mapStateToProps, mapDispatchToProps)
)(ConfirmSendToken) |
<<<<<<<
module.exports = compose(
withRouter,
connect(mapStateToProps, mapDispatchToProps)
)(SignatureRequest)
=======
SignatureRequest.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(SignatureRequest)
>>>>>>>
SignatureRequest.contextTypes = {
t: PropTypes.func,
}
module.exports = compose(
withRouter,
connect(mapStateToProps, mapDispatchToProps)
)(SignatureRequest)
<<<<<<<
onClick: event => {
cancel(event).then(() => this.props.history.push(DEFAULT_ROUTE))
},
}, this.props.t('cancel')),
=======
onClick: cancel,
}, this.context.t('cancel')),
>>>>>>>
onClick: event => {
cancel(event).then(() => this.props.history.push(DEFAULT_ROUTE))
},
}, this.context.t('cancel')),
<<<<<<<
onClick: event => {
sign(event).then(() => this.props.history.push(DEFAULT_ROUTE))
},
}, this.props.t('sign')),
=======
onClick: sign,
}, this.context.t('sign')),
>>>>>>>
onClick: event => {
sign(event).then(() => this.props.history.push(DEFAULT_ROUTE))
},
}, this.context.t('sign')), |
<<<<<<<
=======
var flattenHit = Private(require('components/index_patterns/_flatten_hit'));
var getComputedFields = require('components/index_patterns/_get_computed_fields');
>>>>>>> |
<<<<<<<
selection.each(function (chart) {
=======
self._attr.mapZoom = self._attr.mapZoom || defaultMapZoom;
self._attr.mapCenter = self._attr.mapCenter || defaultMapCenter;
selection.each(function (data) {
>>>>>>>
self._attr.mapZoom = self._attr.mapZoom || defaultMapZoom;
self._attr.mapCenter = self._attr.mapCenter || defaultMapCenter;
selection.each(function () {
<<<<<<<
featureLayer = self.markerType(map, chart).addTo(map);
=======
tileLayer.on('tileload', saturateTiles);
>>>>>>>
tileLayer.on('tileload', saturateTiles);
<<<<<<<
mapZoom = self._attr.mapZoom = map.getZoom();
mapCenter = self._attr.mapCenter = map.getCenter();
featureLayer.clearLayers();
featureLayer = self.markerType(map, chart).addTo(map);
=======
self._attr.mapZoom = map.getZoom();
self._attr.mapCenter = map.getCenter();
map.removeLayer(featureLayer);
featureLayer = self.markerType(map, mapData).addTo(map);
>>>>>>>
self._attr.mapZoom = map.getZoom();
self._attr.mapCenter = map.getCenter();
featureLayer.clearLayers();
featureLayer = self.markerType(map).addTo(map);
self._attr.mapZoom = map.getZoom();
self._attr.mapCenter = map.getCenter();
map.removeLayer(featureLayer);
featureLayer = self.markerType(map).addTo(map);
<<<<<<<
// add title for splits
if (chart.title) {
self.addTitle(chart.title, map);
=======
map.on('zoomend', function () {
self.events.emit('mapZoomEnd', {
data: mapData,
zoom: map.getZoom()
});
});
// add label for splits
if (mapData.properties.label) {
self.addLabel(mapData.properties.label, map);
>>>>>>>
map.on('zoomend', function () {
self.events.emit('mapZoomEnd', {
chart: self.originalConfig,
zoom: map.getZoom()
});
});
// add title for splits
if (self.title) {
self.addTitle(self.title, map);
<<<<<<<
TileMap.prototype.markerType = function (map, chart) {
if (!chart) return;
if (this._attr.mapType === 'Scaled Circle Markers') {
return this.scaledCircleMarkers(map, chart);
=======
TileMap.prototype.markerType = function (map, mapData) {
var featureLayer;
if (mapData) {
if (this._attr.mapType === 'Scaled Circle Markers') {
featureLayer = this.scaledCircleMarkers(map, mapData);
} else if (this._attr.mapType === 'Shaded Circle Markers') {
featureLayer = this.shadedCircleMarkers(map, mapData);
} else if (this._attr.mapType === 'Shaded Geohash Grid') {
featureLayer = this.shadedGeohashGrid(map, mapData);
} else if (this._attr.mapType === 'Heatmap') {
featureLayer = this.heatMap(map, mapData);
} else {
featureLayer = this.scaledCircleMarkers(map, mapData);
}
>>>>>>>
TileMap.prototype.markerType = function (map) {
if (this._attr.mapType === 'Scaled Circle Markers') {
return this.scaledCircleMarkers(map);
}
if (this._attr.mapType === 'Heatmap') {
return this.heatMap(map);
<<<<<<<
var value = feature.properties.value;
var radius = self.geohashMinDistance(feature);
=======
var count = feature.properties.count;
var radius = self.geohashMinDistance(feature) * scaleFactor;
>>>>>>>
var radius = self.geohashMinDistance(feature) * scaleFactor;
<<<<<<<
* @param mapData {geoJson Object}
* @param map {Leaflet Object}
=======
* @param data {Object}
* @param map {Leaflet Object}
>>>>>>>
* @param map {Leaflet Object}
<<<<<<<
TileMap.prototype.bindPopup = function (feature, layer) {
var self = this;
var lat = feature.geometry.coordinates[1];
var lng = feature.geometry.coordinates[0];
var latLng = L.latLng(lat, lng);
var popup = L.popup({autoPan: false})
.setLatLng(latLng);
layer.bindPopup(popup)
.on('mouseover', function (e) {
var content = self.tooltipFormatter(feature);
if (!content) {
return;
}
popup.setContent(content);
layer.openPopup();
})
.on('mouseout', function (e) {
layer.closePopup();
=======
TileMap.prototype.bindPopup = function (feature, layer, map) {
var self = this;
var popup = layer.on({
mouseover: function (e) {
var layer = e.target;
// bring layer to front if not older browser
if (!L.Browser.ie && !L.Browser.opera) {
layer.bringToFront();
}
var latlng = L.latLng(feature.geometry.coordinates[0], feature.geometry.coordinates[1]);
self.showTooltip(map, feature, latlng);
},
mouseout: function (e) {
map.closePopup();
}
>>>>>>>
TileMap.prototype.bindPopup = function (feature, layer, map) {
var self = this;
var popup = layer.on({
mouseover: function (e) {
var layer = e.target;
// bring layer to front if not older browser
if (!L.Browser.ie && !L.Browser.opera) {
layer.bringToFront();
}
var latlng = L.latLng(feature.geometry.coordinates[0], feature.geometry.coordinates[1]);
self.showTooltip(map, feature, latlng);
},
mouseout: function (e) {
map.closePopup();
}
<<<<<<<
* approx. square root of value
* which is multiplied by a factor based on the geohash precision
=======
* square root of count / max
* multiplied by a value based on map zoom
* multiplied by a value based on data precision
>>>>>>>
* square root of value / max
* multiplied by a value based on map zoom
* multiplied by a value based on data precision
<<<<<<<
* @param feature {Object}
=======
* @param zoom {Number}
* @param precision {Number}
>>>>>>> f0414d554915d151e2cdc3501bd3c7fd1889a0a8
* @return {Number}
*/
<<<<<<< /mnt/batch/tasks/workitems/adfv2-General_1/job-1/4a726c56-030f-48b3-a987-c8f7ec39f944/wd/.temp/athenacommon/cf2156b9-a78d-4d34-b129-c2b6f54acc2f.js
TileMap.prototype.radiusScale = function (value, max, feature) {
=======
TileMap.prototype.radiusScale = function (count, max, zoom, precision) {
>>>>>>>
* @param zoom {Number}
* @param precision {Number}
* @return {Number}
*/
TileMap.prototype.radiusScale = function (value, max, zoom, precision) {
<<<<<<<
var exp = 0.6;
var maxr = this.geohashMinDistance(feature);
return Math.pow(value, exp) / Math.pow(max, exp) * maxr;
=======
var exp = 0.5;
var precisionBiasNumerator = 200;
var precisionBiasBase = 5;
var pct = count / max;
var constantZoomRadius = 0.5 * Math.pow(2, zoom);
var precisionScale = precisionBiasNumerator / Math.pow(precisionBiasBase, precision);
return Math.pow(pct, exp) * constantZoomRadius * precisionScale;
>>>>>>>
var exp = 0.5;
var precisionBiasNumerator = 200;
var precisionBiasBase = 5;
var pct = value / max;
var constantZoomRadius = 0.5 * Math.pow(2, zoom);
var precisionScale = precisionBiasNumerator / Math.pow(precisionBiasBase, precision);
return Math.pow(pct, exp) * constantZoomRadius * precisionScale; |
<<<<<<<
// fallback to just a number of milliseconds, ensure ms is >= 1
var ms = Math.max(Math.floor(target), 1);
return moment.duration(ms, 'ms');
=======
return moment.duration(Math.floor(target), 'ms');
}
return function (buckets, duration) {
var interval = pick(buckets, duration);
if (interval) return moment.duration(interval._data);
>>>>>>>
// fallback to just a number of milliseconds, ensure ms is >= 1
var ms = Math.max(Math.floor(target), 1);
return moment.duration(ms, 'ms');
}
return function (buckets, duration) {
var interval = pick(buckets, duration);
if (interval) return moment.duration(interval._data); |
<<<<<<<
// These commented out tests are only for within the secops branch and should not be merged into master
// loadTestFile(require.resolve('./es'));
// loadTestFile(require.resolve('./security'));
// loadTestFile(require.resolve('./monitoring'));
// loadTestFile(require.resolve('./xpack_main'));
// loadTestFile(require.resolve('./logstash'));
// loadTestFile(require.resolve('./kibana'));
// loadTestFile(require.resolve('./infra'));
//Only running our secops test for now since we are working in our own branch
loadTestFile(require.resolve('./secops'));
// loadTestFile(require.resolve('./management'));
// loadTestFile(require.resolve('./beats'));
=======
loadTestFile(require.resolve('./es'));
loadTestFile(require.resolve('./security'));
loadTestFile(require.resolve('./monitoring'));
loadTestFile(require.resolve('./xpack_main'));
loadTestFile(require.resolve('./logstash'));
loadTestFile(require.resolve('./kibana'));
loadTestFile(require.resolve('./infra'));
loadTestFile(require.resolve('./beats'));
loadTestFile(require.resolve('./management'));
loadTestFile(require.resolve('./uptime'));
>>>>>>>
// These commented out tests are only for within the secops branch and should not be merged into master
// loadTestFile(require.resolve('./es'));
// loadTestFile(require.resolve('./security'));
// loadTestFile(require.resolve('./monitoring'));
// loadTestFile(require.resolve('./xpack_main'));
// loadTestFile(require.resolve('./logstash'));
// loadTestFile(require.resolve('./kibana'));
// loadTestFile(require.resolve('./infra'));
//Only running our secops test for now since we are working in our own branch
loadTestFile(require.resolve('./secops'));
// loadTestFile(require.resolve('./beats'));
// loadTestFile(require.resolve('./management'));
// loadTestFile(require.resolve('./uptime')); |
<<<<<<<
=======
InfraSourceConfigurationFlyoutProvider,
>>>>>>>
InfraSourceConfigurationFlyoutProvider,
<<<<<<<
resolve(__dirname, './apps/code'),
resolve(__dirname, './apps/uptime')
=======
resolve(__dirname, './apps/uptime'),
>>>>>>>
resolve(__dirname, './apps/code'),
resolve(__dirname, './apps/uptime'), |
<<<<<<<
import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
=======
import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
>>>>>>>
import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/field_format'; |
<<<<<<<
export { InfraOpsGraphQLClientProvider, InfraOpsGraphQLClientFactoryProvider } from './infraops_graphql_client';
export { SiemGraphQLProvider } from './siem_graphql_client';
=======
export { InfraOpsGraphQLClientProvider, InfraOpsGraphQLClientFactoryProvider } from './infraops_graphql_client';
export { InfraOpsSourceConfigurationProvider } from './infraops_source_configuration';
>>>>>>>
export { InfraOpsGraphQLClientProvider, InfraOpsGraphQLClientFactoryProvider } from './infraops_graphql_client';
export { SiemGraphQLProvider } from './siem_graphql_client';
export { InfraOpsSourceConfigurationProvider } from './infraops_source_configuration'; |
<<<<<<<
test: [
/x-pack[\/\\]plugins[\/\\]infra[\/\\].*[\/\\]graphql/,
/x-pack[\/\\]plugins[\/\\]siem[\/\\].*[\/\\]graphql/,
],
plugins: [
[
require.resolve('babel-plugin-typescript-strip-namespaces'),
],
]
}
]
=======
test: /x-pack[\/\\]plugins[\/\\]infra[\/\\].*[\/\\]graphql/,
plugins: [[require.resolve('babel-plugin-typescript-strip-namespaces')]],
},
],
>>>>>>>
test: [
/x-pack[\/\\]plugins[\/\\]infra[\/\\].*[\/\\]graphql/,
/x-pack[\/\\]plugins[\/\\]siem[\/\\].*[\/\\]graphql/,
],
plugins: [[require.resolve('babel-plugin-typescript-strip-namespaces')]],
},
], |
<<<<<<<
const { startsWith, isString, find } = require('lodash');
=======
>>>>>>> |
<<<<<<<
export default function StateProvider(Private, $rootScope, $location, config) {
var notify = new Notifier();
var Events = Private(EventsProvider);
var overflowedUrlStore = Private(OverflowedUrlStoreProvider);
=======
export default function StateProvider(Private, $rootScope, $location) {
let Events = Private(EventsProvider);
>>>>>>>
export default function StateProvider(Private, $rootScope, $location, config) {
const notify = new Notifier();
const Events = Private(EventsProvider);
const overflowedUrlStore = Private(OverflowedUrlStoreProvider);
<<<<<<<
=======
let notify = new Notifier();
>>>>>>> |
<<<<<<<
.attr('fill', colorCircle)
.attr('class', 'circle-decoration');
=======
.attr('fill', cColor)
//.attr('class', 'circle-decoration');
.attr('class', function circleClass(d) {
return 'circle-decoration ' + self.colorToClass(color(d.label));
});
>>>>>>>
.attr('fill', colorCircle)
.attr('class', function circleClass(d) {
return 'circle-decoration ' + self.colorToClass(color(d.label));
}); |
<<<<<<<
CodeHomePageProvider,
=======
RollupPageProvider,
UptimePageProvider,
>>>>>>>
CodeHomePageProvider,
RollupPageProvider,
UptimePageProvider,
<<<<<<<
resolve(__dirname, './apps/code'),
=======
resolve(__dirname, './apps/uptime')
>>>>>>>
resolve(__dirname, './apps/code'),
resolve(__dirname, './apps/uptime')
<<<<<<<
code: CodeHomePageProvider,
=======
uptime: UptimePageProvider,
rollup: RollupPageProvider
>>>>>>>
code: CodeHomePageProvider,
uptime: UptimePageProvider,
rollup: RollupPageProvider
<<<<<<<
code: {
pathname: '/app/code',
hash: '/admin',
},
codeSearch: {
pathname: '/app/code',
hash: '/search',
}
=======
uptime: {
pathname: '/app/uptime',
},
rollupJob: {
pathname: '/app/kibana',
hash: '/management/elasticsearch/rollup_jobs/'
}
>>>>>>>
code: {
pathname: '/app/code',
hash: '/admin',
},
codeSearch: {
pathname: '/app/code',
hash: '/search',
},
uptime: {
pathname: '/app/uptime',
},
rollupJob: {
pathname: '/app/kibana',
hash: '/management/elasticsearch/rollup_jobs/'
} |
<<<<<<<
$scope.$emit('application.load');
}
};
});
export default {
name: 'indices',
display: 'Indices',
url: '#/settings/indices',
};
=======
$scope.$emit('application.load');
}
};
});
registry.register(_.constant({
order: 1,
name: 'indices',
display: 'Indices',
url: '#/settings/indices'
}));
});
>>>>>>>
$scope.$emit('application.load');
}
};
});
registry.register(_.constant({
order: 1,
name: 'indices',
display: 'Indices',
url: '#/settings/indices'
})); |
<<<<<<<
value: {
content: render(ctx),
font: args.font,
},
=======
value: compileFunctions.map(fn => fn(ctx)).join(''),
>>>>>>>
value: {
content: compileFunctions.map(fn => fn(ctx)).join(''),
font: args.font,
}, |
<<<<<<<
var d3 = require('d3');
=======
// Dynamically adds css file
require('css!../css/k4.d3');
// adds an array to another array
function addTo(to, array) {
[].push.apply(to, array);
}
>>>>>>>
// adds an array to another array
function addTo(to, array) {
[].push.apply(to, array);
} |
<<<<<<<
(function () {
bdd.describe('index result popularity', function describeIndexTests() {
bdd.before(function () {
// delete .kibana index and then wait for Kibana to re-create it
return esClient.deleteAndUpdateConfigDoc()
.then(function () {
return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
});
});
=======
bdd.describe('index result popularity', function describeIndexTests() {
bdd.before(function () {
// delete .kibana index and then wait for Kibana to re-create it
return esClient.deleteAndUpdateConfigDoc()
.then(function () {
return settingsPage.navigateTo();
});
});
>>>>>>>
bdd.describe('index result popularity', function describeIndexTests() {
bdd.before(function () {
// delete .kibana index and then wait for Kibana to re-create it
return esClient.deleteAndUpdateConfigDoc()
.then(function () {
return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
});
});
<<<<<<<
bdd.afterEach(function ae() {
return settingsPage.removeIndexPattern().then(settingsPage.clickExistingIndicesAddDataLink);
});
=======
bdd.afterEach(function ae() {
return settingsPage.removeIndexPattern();
});
>>>>>>>
bdd.afterEach(function ae() {
return settingsPage.removeIndexPattern().then(settingsPage.clickExistingIndicesAddDataLink);
}); |
<<<<<<<
// spy watchers
=======
var loadingDelay = config.get('visualization:loadingDelay');
$scope.loadingStyle = {
'-webkit-transition-delay': loadingDelay,
'transition-delay': loadingDelay
};
>>>>>>>
var loadingDelay = config.get('visualization:loadingDelay');
$scope.loadingStyle = {
'-webkit-transition-delay': loadingDelay,
'transition-delay': loadingDelay
};
// spy watchers |
<<<<<<<
require('./field_chooser');
require('./saved_searches/service');
require('./timechart');
=======
require('./services/saved_searches');
require('./directives/timechart');
require('./directives/field_chooser');
>>>>>>>
require('./saved_searches/service');
require('./directives/timechart');
require('./directives/field_chooser'); |
<<<<<<<
export class Convert extends Processor {
constructor(processorId) {
super(processorId, 'convert', 'Convert');
this.sourceField = '';
this.type = 'string';
}
get description() {
const source = this.sourceField || '?';
const type = this.type || '?';
return `[${source}] to ${type}`;
}
get model() {
return {
processorId: this.processorId,
typeId: this.typeId,
sourceField: this.sourceField || '',
type: this.type || 'string'
};
}
};
=======
export class Append extends Processor {
constructor(processorId) {
super(processorId, 'append', 'Append');
this.targetField = '';
this.values = [];
}
get description() {
const target = this.targetField || '?';
return `[${target}]`;
}
get model() {
return {
processorId: this.processorId,
typeId: this.typeId,
targetField: this.targetField || '',
values: this.values || []
};
}
};
>>>>>>>
export class Append extends Processor {
constructor(processorId) {
super(processorId, 'append', 'Append');
this.targetField = '';
this.values = [];
}
get description() {
const target = this.targetField || '?';
return `[${target}]`;
}
get model() {
return {
processorId: this.processorId,
typeId: this.typeId,
targetField: this.targetField || '',
values: this.values || []
};
}
};
export class Convert extends Processor {
constructor(processorId) {
super(processorId, 'convert', 'Convert');
this.sourceField = '';
this.type = 'string';
}
get description() {
const source = this.sourceField || '?';
const type = this.type || '?';
return `[${source}] to ${type}`;
}
get model() {
return {
processorId: this.processorId,
typeId: this.typeId,
sourceField: this.sourceField || '',
type: this.type || 'string'
};
}
}; |
<<<<<<<
onBlur: () => {
this.setErrorsFor('to')
this.estimateGasAndPrice()
},
onFocus: () => this.clearErrorsFor('to'),
=======
onBlur: () => this.setErrorsFor('to'),
onFocus: event => {
this.clearErrorsFor('to')
this.state.newTx.to && event.target.select()
},
>>>>>>>
onBlur: () => {
this.setErrorsFor('to')
this.estimateGasAndPrice()
},
onFocus: event => {
this.clearErrorsFor('to')
this.state.newTx.to && event.target.select()
}, |
<<<<<<<
export * from './write_sha_sums_task';
export * from './patch_native_modules_task';
=======
export * from './write_sha_sums_task';
export * from './path_length_task';
>>>>>>>
export * from './write_sha_sums_task';
export * from './patch_native_modules_task';
export * from './path_length_task'; |
<<<<<<<
var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
var bucketCountBetween = Private(require('components/agg_types/buckets/_bucket_count_between'));
=======
var AggType = Private(require('components/agg_types/_agg_type'));
var AggConfig = Private(require('components/vis/_agg_config'));
>>>>>>>
var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
var bucketCountBetween = Private(require('components/agg_types/buckets/_bucket_count_between'));
var AggConfig = Private(require('components/vis/_agg_config')); |
<<<<<<<
IndexPattern.prototype.routes = {
edit: '/settings/indices/edit/{{id}}',
addField: '/settings/indices/edit/{{id}}/create-field',
indexedFields: '/settings/indices/edit/{{id}}?_a=(tab:indexedFields)',
scriptedFields: '/settings/indices/edit/{{id}}?_a=(tab:scriptedFields)'
};
=======
>>>>>>> |
<<<<<<<
/*
// FIX THIS FOR TILE MAPS
// Bind events to the chart
=======
>>>>>>>
/*
// FIX THIS FOR TILE MAPS
// Bind events to the chart |
<<<<<<<
isDesaturated: true,
autoPrecision: true,
heatMaxZoom: 16,
heatMinOpacity: 0.1,
heatRadius: 25,
heatBlur: 15,
heatNormalizeData: true
=======
isDesaturated: true
>>>>>>>
isDesaturated: true,
heatMaxZoom: 16,
heatMinOpacity: 0.1,
heatRadius: 25,
heatBlur: 15,
heatNormalizeData: true |
<<<<<<<
function TarBuilder() {
this._data = [];
}
TarBuilder.prototype = {
addFile: function addFile(filepath, input) {
var i,
checksum,
nameLen,
fileSize = input.length,
header = new Uint8Array(512);
for (i = 0, nameLen = Math.min(filepath.length, 100); i < nameLen; ++i) {
header[i] = filepath.charCodeAt(i) & 255;
}
this._padSet(header, 100, "100777", 8);
this._padSet(header, 108, "0", 8);
this._padSet(header, 116, "0", 8);
this._padSet(header, 124, fileSize.toString(8), 13);
this._padSet(header, 136, Math.floor(Date.now() / 1000).toString(8), 12);
this._padSet(header, 148, " ", 8);
header[156] = 48;
for (i = checksum = 0; i < 157; i++) {
checksum += header[i];
}
this._padSet(header, 148, checksum.toString(8), 8);
this._data.push(header);
this._data.push(input);
if ((i = Math.ceil(fileSize / 512) * 512 - fileSize) !== 0) {
this._data.push(new Uint8Array(i));
}
},
addString: function addString(filepath, str) {
var i,
len,
data,
sDat = unescape(encodeURIComponent(str));
for (i = 0, len = sDat.length, data = new Uint8Array(len); i < len; ++i) {
data[i] = sDat.charCodeAt(i) & 255;
}
this.addFile(filepath, data);
},
get: function get() {
this._data.push(new Uint8Array(1024));
return new Blob(this._data, { type: "application/x-tar" });
},
=======
====================================================================================================
function fixSettings() {
function toggleBox(state, arr) {
var i = arr.length,
nState = !state;
while(i--) {
($q(arr[i], doc) || {}).disabled = nState;
}
}
toggleBox(Cfg.ajaxUpdThr, [
'input[info="noErrInTitle"]', 'input[info="favIcoBlink"]',
'input[info="markNewPosts"]', 'input[info="desktNotif"]', 'input[info="updCount"]'
]);
toggleBox(Cfg.expandImgs, [
'input[info="imgNavBtns"]', 'input[info="resizeDPI"]', 'input[info="resizeImgs"]',
'input[info="minImgSize"]', 'input[info="zoomFactor"]',
'input[info="webmControl"]', 'input[info="webmVolume"]'
]);
toggleBox(Cfg.preLoadImgs, ['input[info="findImgFile"]']);
toggleBox(Cfg.openImgs, ['input[info="openGIFs"]']);
toggleBox(Cfg.linksNavig, [
'input[info="linksOver"]', 'input[info="linksOut"]', 'input[info="markViewed"]',
'input[info="strikeHidd"]', 'input[info="noNavigHidd"]'
]);
toggleBox(Cfg.strikeHidd && Cfg.linksNavig === 2, ['input[info="removeHidd"]']);
toggleBox(Cfg.addYouTube && Cfg.addYouTube !== 4, [
'select[info="YTubeType"]', 'input[info="YTubeHD"]', 'input[info="addVimeo"]'
]);
toggleBox(Cfg.addYouTube, [
'input[info="YTubeWidth"]', 'input[info="YTubeHeigh"]', 'input[info="YTubeTitles"]'
]);
toggleBox(Cfg.ajaxReply, ['input[info="sendErrNotif"]', 'input[info="scrAfterRep"]']);
toggleBox(Cfg.ajaxReply === 2, [
'input[info="postSameImg"]', 'input[info="removeEXIF"]', 'input[info="removeFName"]'
]);
toggleBox(Cfg.addTextBtns, ['input[info="txtBtnsLoc"]']);
toggleBox(Cfg.updScript, ['select[info="scrUpdIntrv"]']);
toggleBox(Cfg.hotKeys, ['input[info="loadPages"]']);
}
=======
// SETTINGS
// ===========================================================================================================
function fixSettings() {
function toggleBox(state, arr) {
var i = arr.length,
nState = !state;
while(i--) {
($q(arr[i], doc) || {}).disabled = nState;
}
}
toggleBox(Cfg.ajaxUpdThr, [
'input[info="updThrDelay"]', 'input[info="noErrInTitle"]', 'input[info="favIcoBlink"]',
'input[info="markNewPosts"]', 'input[info="desktNotif"]', 'input[info="updCount"]'
]);
toggleBox(Cfg.expandImgs, [
'input[info="imgNavBtns"]', 'input[info="resizeDPI"]', 'input[info="resizeImgs"]',
'input[info="minImgSize"]', 'input[info="zoomFactor"]',
'input[info="webmControl"]', 'input[info="webmVolume"]'
]);
toggleBox(Cfg.preLoadImgs, ['input[info="findImgFile"]']);
toggleBox(Cfg.openImgs, ['input[info="openGIFs"]']);
toggleBox(Cfg.linksNavig, [
'input[info="linksOver"]', 'input[info="linksOut"]', 'input[info="markViewed"]',
'input[info="strikeHidd"]', 'input[info="noNavigHidd"]'
]);
toggleBox(Cfg.strikeHidd && Cfg.linksNavig === 2, ['input[info="removeHidd"]']);
toggleBox(Cfg.addYouTube && Cfg.addYouTube !== 4, [
'select[info="YTubeType"]', 'input[info="YTubeHD"]', 'input[info="addVimeo"]'
]);
toggleBox(Cfg.addYouTube, [
'input[info="YTubeWidth"]', 'input[info="YTubeHeigh"]', 'input[info="YTubeTitles"]'
]);
toggleBox(Cfg.ajaxReply, ['input[info="sendErrNotif"]', 'input[info="scrAfterRep"]']);
toggleBox(Cfg.ajaxReply === 2, [
'input[info="postSameImg"]', 'input[info="removeEXIF"]', 'input[info="removeFName"]'
]);
toggleBox(Cfg.addTextBtns, ['input[info="txtBtnsLoc"]']);
toggleBox(Cfg.updScript, ['select[info="scrUpdIntrv"]']);
toggleBox(Cfg.hotKeys, ['input[info="loadPages"]']);
}
>>>>>>>
function TarBuilder() {
this._data = [];
}
TarBuilder.prototype = {
addFile: function addFile(filepath, input) {
var i,
checksum,
nameLen,
fileSize = input.length,
header = new Uint8Array(512);
for (i = 0, nameLen = Math.min(filepath.length, 100); i < nameLen; ++i) {
header[i] = filepath.charCodeAt(i) & 255;
}
this._padSet(header, 100, "100777", 8);
this._padSet(header, 108, "0", 8);
this._padSet(header, 116, "0", 8);
this._padSet(header, 124, fileSize.toString(8), 13);
this._padSet(header, 136, Math.floor(Date.now() / 1000).toString(8), 12);
this._padSet(header, 148, " ", 8);
header[156] = 48;
for (i = checksum = 0; i < 157; i++) {
checksum += header[i];
}
this._padSet(header, 148, checksum.toString(8), 8);
this._data.push(header);
this._data.push(input);
if ((i = Math.ceil(fileSize / 512) * 512 - fileSize) !== 0) {
this._data.push(new Uint8Array(i));
}
},
addString: function addString(filepath, str) {
var i,
len,
data,
sDat = unescape(encodeURIComponent(str));
for (i = 0, len = sDat.length, data = new Uint8Array(len); i < len; ++i) {
data[i] = sDat.charCodeAt(i) & 255;
}
this.addFile(filepath, data);
},
get: function get() {
this._data.push(new Uint8Array(1024));
return new Blob(this._data, { type: "application/x-tar" });
},
<<<<<<<
function getPrettyErrorMessage(e) {
return e.stack ? nav.WebKit ? e.stack : e.name + ": " + e.message + "\n" + (nav.Firefox ? e.stack.replace(/^([^@]*).*\/(.+)$/gm, function (str, fName, line) {
return " at " + (fName ? fName + " (" + line + ")" : line);
}) : e.stack) : e.name + ": " + e.message;
}
=======
function getCfgPosts() {
return $New('div', {'class': 'de-cfg-unvis', 'id': 'de-cfg-posts'}, [
$if(!localRun, $New('div', null, [
lBox('ajaxUpdThr', false, TNum ? function() {
if(Cfg.ajaxUpdThr) {
updater.enable();
} else {
updater.disable();
}
} : null),
$New('label', null, [
inpTxt('updThrDelay', 2, null),
$txt(Lng.cfg.updThrDelay[lang])
]),
$New('div', {'class': 'de-cfg-depend'}, [
lBox('noErrInTitle', true, null),
lBox('favIcoBlink', true, null),
lBox('markNewPosts', true, function() {
dForm.firstThr.clearPostsMarks();
}),
$if('Notification' in window, lBox('desktNotif', true, function() {
if(Cfg.desktNotif) {
Notification.requestPermission();
}
})),
lBox('updCount', true, function() {
updater.toggleCounter(Cfg.updCount);
})
])
])),
optSel('expandPosts', true, null),
optSel('postBtnsCSS', true, null),
lBox('noSpoilers', true, updateCSS),
lBox('noPostNames', true, updateCSS),
lBox('noPostScrl', true, updateCSS),
$New('div', null, [
lBox('correctTime', false, dateTime.toggleSettings),
$add('<a href="https://github.com/SthephanShinkufag/Dollchan-Extension-Tools/wiki/Settings-time-' +
(lang ? 'en' : 'ru') + '" class="de-abtn" target="_blank">[?]</a>')
]),
$New('div', {'class': 'de-cfg-depend'}, [
$New('div', null, [
inpTxt('timeOffset', 2, null),
$txt(Lng.cfg.timeOffset[lang])
]),
$New('div', null, [
inpTxt('timePattern', 25, null),
$txt(Lng.cfg.timePattern[lang])
]),
$New('div', null, [
inpTxt('timeRPattern', 25, null),
$txt(Lng.cfg.timeRPattern[lang])
])
])
]);
}
>>>>>>>
function getPrettyErrorMessage(e) {
return e.stack ? nav.WebKit ? e.stack : e.name + ": " + e.message + "\n" + (nav.Firefox ? e.stack.replace(/^([^@]*).*\/(.+)$/gm, function (str, fName, line) {
return " at " + (fName ? fName + " (" + line + ")" : line);
}) : e.stack) : e.name + ": " + e.message;
}
<<<<<<<
=======
}
if(!localRun){
updater = initThreadUpdater(doc.title, TNum && Cfg.ajaxUpdThr);
}
}
>>>>>>>
<<<<<<<
=======
function doScript(formEl) {
new Logger().log('Config loading');
if(Cfg.disabled) {
addPanel(formEl);
scriptCSS();
return;
}
spells = new Spells(!!Cfg.hideBySpell);
new Logger().log('Parsing spells');
doc.body.style.display = 'none';
formEl = DelForm.doReplace(formEl);
new Logger().log('Replace delform');
pByNum = Object.create(null);
try {
dForm = new DelForm(formEl, false);
} catch(e) {
console.log('DELFORM ERROR:\n' + getPrettyErrorMessage(e));
doc.body.style.display = '';
return;
}
!localRun && dForm.initAjax();
new Logger().log('Parse delform');
pr = new PostForm($q(aib.qPostForm, doc), false, !liteMode, doc);
new Logger().log('Parse postform');
if(Cfg.hotKeys) {
hKeys = new HotKeys();
new Logger().log('Init keybinds');
}
if(!liteMode) {
initPage();
new Logger().log('Init page');
addPanel(formEl);
new Logger().log('Add panel');
}
initMessageFunctions();
addDelformStuff(true);
readViewedPosts();
scriptCSS();
new Logger().log('Apply CSS');
if(needScroll) {
scrollPage();
}
doc.body.style.display = '';
new Logger().log('Scroll page');
readPosts();
readUserPosts();
readFavoritesPosts();
setTimeout(PostContent.purge, 0);
new Logger().log('Apply spells');
new Logger().finish();
}
>>>>>>> |
<<<<<<<
selection.each(function (data, i) {
// DOM element on which the tooltip is called
=======
selection.each(function () {
>>>>>>>
selection.each(function (data, i) {
<<<<<<<
offset = self.getOffsets(tooltipDiv, mouseMove);
// return text and position for tooltip
return tooltipDiv.datum(self.events.eventResponse(d, i))
.html(tooltipFormatter)
.style('display', 'block')
=======
offset = self.getOffsets(mouseMove);
return tooltipDiv.datum(d)
.html(self.tooltipFormatter)
.style('visibility', 'visible')
>>>>>>>
offset = self.getOffsets(mouseMove);
// return text and position for tooltip
return tooltipDiv.datum(self.events.eventResponse(d, i))
.html(tooltipFormatter)
.style('visibility', 'visible') |
<<<<<<<
return chain([
this.uiExports.find(get(this, 'spec.uses', [])),
this.uiExports.find(['chromeNavControls', 'sledgehammers']),
=======
return _.chain([
this.uiExports.find(_.get(this, 'spec.uses', [])),
this.uiExports.find(['chromeNavControls', 'hacks']),
>>>>>>>
return chain([
this.uiExports.find(get(this, 'spec.uses', [])),
this.uiExports.find(['chromeNavControls', 'hacks']), |
<<<<<<<
export function convert(processorApiDocument) {
return {
convert: {
tag: processorApiDocument.processor_id,
field: processorApiDocument.source_field,
type: processorApiDocument.type
}
};
}
=======
export function append(processorApiDocument) {
return {
append: {
tag: processorApiDocument.processor_id,
field: processorApiDocument.target_field,
value: processorApiDocument.values
}
};
}
>>>>>>>
export function append(processorApiDocument) {
return {
append: {
tag: processorApiDocument.processor_id,
field: processorApiDocument.target_field,
value: processorApiDocument.values
}
};
}
export function convert(processorApiDocument) {
return {
convert: {
tag: processorApiDocument.processor_id,
field: processorApiDocument.source_field,
type: processorApiDocument.type
}
};
} |
<<<<<<<
pie: Private(require('components/vislib/lib/handler/types/pie')),
tile_map: Private(require('components/vislib/lib/handler/types/tile_map'))
=======
area: Private(require('components/vislib/lib/handler/types/column')),
pie: Private(require('components/vislib/lib/handler/types/pie'))
>>>>>>>
pie: Private(require('components/vislib/lib/handler/types/pie')),
area: Private(require('components/vislib/lib/handler/types/column')),
tile_map: Private(require('components/vislib/lib/handler/types/tile_map')) |
<<<<<<<
defaultYExtents: false,
times: [],
addTimeMarker: false
=======
interpolate: 'linear',
defaultYExtents: false
>>>>>>>
interpolate: 'linear',
defaultYExtents: false,
times: [],
addTimeMarker: false |
<<<<<<<
let pkg = require('requirefrom')('src/utils')('packageJson');
import clone from './deep_clone_with_buffers';
=======
import pkg from '../../utils/packageJson';
import clone from './deepCloneWithBuffers';
>>>>>>>
import pkg from '../../utils/packageJson';
import clone from './deep_clone_with_buffers'; |
<<<<<<<
import { string } from './string';
import { palette } from './palette';
=======
>>>>>>>
import { string } from './string';
<<<<<<<
string,
=======
seriesStyle,
>>>>>>>
string,
seriesStyle, |
<<<<<<<
var indexPattern = new StubIndexPattern('logstash-*', 'time', [
{ name: 'bytes', type: 'number', indexed: true, analyzed: true, count: 10 },
{ name: 'ssl', type: 'boolean', indexed: true, analyzed: true, count: 20 },
{ name: '@timestamp', type: 'date', indexed: true, analyzed: true, count: 30 },
{ name: 'phpmemory', type: 'number', indexed: true, analyzed: true, count: 0 },
{ name: 'ip', type: 'ip', indexed: true, analyzed: true, count: 0 },
{ name: 'request_body', type: 'attachment', indexed: true, analyzed: true, count: 0 },
{ name: 'extension', type: 'string', indexed: true, analyzed: true, count: 0 },
{ name: 'point', type: 'geo_point', indexed: true, analyzed: true, count: 0 },
{ name: 'area', type: 'geo_shape', indexed: true, analyzed: true, count: 0 },
{ name: 'extension', type: 'string', indexed: true, analyzed: true, count: 0 },
{ name: 'machine.os', type: 'string', indexed: true, analyzed: true, count: 0 },
{ name: 'geo.src', type: 'string', indexed: true, analyzed: true, count: 0 },
{ name: '_type', type: 'string', indexed: true, analyzed: true, count: 0 },
{ name: 'custom_user_field', type: 'conflict', indexed: false, analyzed: false, count: 0 }
=======
return new StubIndexPattern('logstash-*', 'time', [
{ name: 'bytes', displayName: 'bytes', type: 'number', indexed: true, analyzed: true, count: 10 },
{ name: 'ssl', displayName: 'ssl', type: 'boolean', indexed: true, analyzed: true, count: 20 },
{ name: '@timestamp', displayName: '@timestamp', type: 'date', indexed: true, analyzed: true, count: 30 },
{ name: 'phpmemory', displayName: 'phpmemory', type: 'number', indexed: true, analyzed: true, count: 0 },
{ name: 'ip', displayName: 'ip', type: 'ip', indexed: true, analyzed: true, count: 0 },
{ name: 'request_body', displayName: 'request_body', type: 'attachment', indexed: true, analyzed: true, count: 0 },
{ name: 'extension', displayName: 'extension', type: 'string', indexed: true, analyzed: true, count: 0 },
{ name: 'point', displayName: 'point', type: 'geo_point', indexed: true, analyzed: true, count: 0 },
{ name: 'area', displayName: 'area', type: 'geo_shape', indexed: true, analyzed: true, count: 0 },
{ name: 'extension', displayName: 'extension', type: 'string', indexed: true, analyzed: true, count: 0 },
{ name: 'machine.os', displayName: 'machine.os', type: 'string', indexed: true, analyzed: true, count: 0 },
{ name: 'geo.src', displayName: 'geo.src', type: 'string', indexed: true, analyzed: true, count: 0 },
{ name: '_type', displayName: '_type', type: 'string', indexed: true, analyzed: true, count: 0 },
{ name: 'custom_user_field', displayName: 'custom_user_field', type: 'conflict', indexed: false, analyzed: false, count: 0 }
>>>>>>>
var indexPattern = new StubIndexPattern('logstash-*', 'time', [
{ name: 'bytes', displayName: 'bytes', type: 'number', indexed: true, analyzed: true, count: 10 },
{ name: 'ssl', displayName: 'ssl', type: 'boolean', indexed: true, analyzed: true, count: 20 },
{ name: '@timestamp', displayName: '@timestamp', type: 'date', indexed: true, analyzed: true, count: 30 },
{ name: 'phpmemory', displayName: 'phpmemory', type: 'number', indexed: true, analyzed: true, count: 0 },
{ name: 'ip', displayName: 'ip', type: 'ip', indexed: true, analyzed: true, count: 0 },
{ name: 'request_body', displayName: 'request_body', type: 'attachment', indexed: true, analyzed: true, count: 0 },
{ name: 'extension', displayName: 'extension', type: 'string', indexed: true, analyzed: true, count: 0 },
{ name: 'point', displayName: 'point', type: 'geo_point', indexed: true, analyzed: true, count: 0 },
{ name: 'area', displayName: 'area', type: 'geo_shape', indexed: true, analyzed: true, count: 0 },
{ name: 'extension', displayName: 'extension', type: 'string', indexed: true, analyzed: true, count: 0 },
{ name: 'machine.os', displayName: 'machine.os', type: 'string', indexed: true, analyzed: true, count: 0 },
{ name: 'geo.src', displayName: 'geo.src', type: 'string', indexed: true, analyzed: true, count: 0 },
{ name: '_type', displayName: '_type', type: 'string', indexed: true, analyzed: true, count: 0 },
{ name: 'custom_user_field', displayName: 'custom_user_field', type: 'conflict', indexed: false, analyzed: false, count: 0 } |
<<<<<<<
import ngMock from 'ng_mock';
import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source';
import CourierFetchRequestDocProvider from 'ui/courier/fetch/request/doc';
=======
import ngMock from 'ngMock';
>>>>>>>
import ngMock from 'ng_mock'; |
<<<<<<<
import { code } from './plugins/code';
import { gis } from './plugins/gis';
=======
import { maps } from './plugins/maps';
>>>>>>>
import { code } from './plugins/code';
import { maps } from './plugins/maps';
<<<<<<<
code(kibana),
gis(kibana),
=======
maps(kibana),
>>>>>>>
code(kibana),
maps(kibana), |
<<<<<<<
import { code } from './plugins/code';
=======
import { gis } from './plugins/gis';
>>>>>>>
import { code } from './plugins/code';
import { gis } from './plugins/gis';
<<<<<<<
code(kibana),
=======
gis(kibana),
>>>>>>>
code(kibana),
gis(kibana), |
<<<<<<<
InfraOpsGraphQLProvider,
SiemGraphQLProvider,
=======
InfraOpsGraphQLClientProvider,
InfraOpsGraphQLClientFactoryProvider,
>>>>>>>
InfraOpsGraphQLClientProvider,
InfraOpsGraphQLClientFactoryProvider,
SiemGraphQLProvider,
<<<<<<<
infraOpsGraphQLClient: InfraOpsGraphQLProvider,
siemGraphQLClient: SiemGraphQLProvider,
=======
infraOpsGraphQLClient: InfraOpsGraphQLClientProvider,
infraOpsGraphQLClientFactory: InfraOpsGraphQLClientFactoryProvider,
>>>>>>>
infraOpsGraphQLClient: InfraOpsGraphQLClientProvider,
infraOpsGraphQLClientFactory: InfraOpsGraphQLClientFactoryProvider,
siemGraphQLClient: SiemGraphQLProvider, |
<<<<<<<
(function () {
bdd.describe('creating and deleting default index', function describeIndexTests() {
bdd.before(function () {
// delete .kibana index and then wait for Kibana to re-create it
return esClient.deleteAndUpdateConfigDoc()
.then(function () {
return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
});
});
=======
bdd.describe('creating and deleting default index', function describeIndexTests() {
bdd.before(function () {
// delete .kibana index and then wait for Kibana to re-create it
return esClient.deleteAndUpdateConfigDoc()
.then(function () {
return settingsPage.navigateTo();
});
});
>>>>>>>
bdd.describe('creating and deleting default index', function describeIndexTests() {
bdd.before(function () {
// delete .kibana index and then wait for Kibana to re-create it
return esClient.deleteAndUpdateConfigDoc()
.then(function () {
return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
});
});
<<<<<<<
bdd.it('should return to the add data landing page', function returnToPage() {
return common.try(function tryingForTime() {
return common.findTestSubject('addData');
})
.catch(common.handleError(this));
});
=======
bdd.it('should return to index pattern creation page', function returnToPage() {
return common.try(function tryingForTime() {
return settingsPage.getCreateButton();
});
});
>>>>>>>
bdd.it('should return to the add data landing page', function returnToPage() {
return common.try(function tryingForTime() {
return common.findTestSubject('addData');
});
}); |
<<<<<<<
bdd.it('should return to the add data landing page', function returnToPage() {
return common.tryForTime(5000, function () {
return common.findTestSubject('addData');
=======
bdd.it('should return to index pattern creation page', function returnToPage() {
return common.try(function tryingForTime() {
return settingsPage.getCreateButton();
>>>>>>>
bdd.it('should return to the add data landing page', function returnToPage() {
return common.try(function tryingForTime() {
return common.findTestSubject('addData'); |
<<<<<<<
require('./_color');
=======
require('./_date');
>>>>>>>
require('./_color');
require('./_date'); |
<<<<<<<
if (!_.has(referableFunctionMap, functionName)) throw new Error(`Function not found: ${functionName}`);
=======
if (!_.includes(referableFunctionArray, functionName)) {
throw new Error(`Function not found: ${functionName}`);
}
>>>>>>>
if (!_.has(referableFunctionMap, functionName)) {
throw new Error(`Function not found: ${functionName}`);
} |
<<<<<<<
// TODO: This works around an Elasticsearch bug the always casts terms agg scripts to strings
// thus causing issues with filtering. This probably causes other issues since float might not
// be able to contain the number on the elasticsearch side
if (output.params.script) {
output.params.valueType = agg.field().type === 'number' ? 'float' : agg.field().type;
}
if (orderAgg.type.name === 'count') {
=======
if (!orderAgg || orderAgg.type.name === 'count') {
>>>>>>>
// TODO: This works around an Elasticsearch bug the always casts terms agg scripts to strings
// thus causing issues with filtering. This probably causes other issues since float might not
// be able to contain the number on the elasticsearch side
if (output.params.script) {
output.params.valueType = agg.field().type === 'number' ? 'float' : agg.field().type;
}
if (!orderAgg || orderAgg.type.name === 'count') { |
<<<<<<<
packageDir: 'build/packages',
=======
packageDir: 'packages',
senseDir: './sense',
>>>>>>>
packageDir: 'build/packages',
senseDir: './sense', |
<<<<<<<
const { SEND_ROUTE } = require('../routes')
const t = require('../../i18n')
=======
>>>>>>>
const { SEND_ROUTE } = require('../routes')
<<<<<<<
onClick: () => history.push(SEND_ROUTE),
}, t('send')),
=======
onClick: showSendPage,
}, this.props.t('send')),
>>>>>>>
onClick: () => history.push(SEND_ROUTE),
}, this.props.t('send')),
<<<<<<<
onClick: () => history.push(SEND_ROUTE),
}, t('send')),
=======
onClick: showSendTokenPage,
}, this.props.t('send')),
>>>>>>>
onClick: () => history.push(SEND_ROUTE),
}, this.props.t('send')), |
<<<<<<<
unapprovedTxs: this.getUnapprovedTxList(),
selectedAccountTxList: this.getFilteredTxList({metamaskNetworkId: this.getNetwork(), from: selectedAccount}),
=======
unconfTxs: this.getUnapprovedTxList(),
selectedAddressTxList: this.getFilteredTxList({metamaskNetworkId: this.getNetwork(), from: selectedAddress}),
>>>>>>>
unapprovedTxs: this.getUnapprovedTxList(),
selectedAddressTxList: this.getFilteredTxList({metamaskNetworkId: this.getNetwork(), from: selectedAddress}), |
<<<<<<<
var tiler = utilTiler().zoomExtent([tileZoom, tileZoom]).skipNullIsland(true);
var dispatch = d3_dispatch('loadedImages', 'loadedSigns');
=======
var dispatch = d3_dispatch('loadedImages', 'loadedSigns', 'bearingChanged');
>>>>>>>
var tiler = utilTiler().zoomExtent([tileZoom, tileZoom]).skipNullIsland(true);
var dispatch = d3_dispatch('loadedImages', 'loadedSigns', 'bearingChanged'); |
<<<<<<<
_forEach(issues, function(instances, type) {
=======
_forEach(validations, function(instances, severity) {
>>>>>>>
_forEach(issues, function(instances, severity) { |
<<<<<<<
iD.ui.inspector = function() {
var event = d3.dispatch('changeTags', 'close', 'change'),
=======
iD.ui.Inspector = function() {
var event = d3.dispatch('changeTags', 'close'),
>>>>>>>
iD.ui.Inspector = function() {
var event = d3.dispatch('changeTags', 'close', 'change'),
<<<<<<<
presetUI,
graph,
=======
context,
>>>>>>>
presetUI,
context,
<<<<<<<
inspectorButton.append('span').attr('class','label').text('Okay');
=======
inspectorButton.append('span')
.attr('class','label')
.text(t('inspector.okay'));
>>>>>>>
inspectorButton.append('span')
.attr('class','label')
.text(t('inspector.okay'));
<<<<<<<
minorButtons.append('a')
.attr('href', 'http://www.openstreetmap.org/browse/' + entity.type + '/' + entity.osmId())
.attr('target', '_blank')
.text('View on OSM');
=======
minorButtons.append('a')
.attr('href', 'http://www.openstreetmap.org/browse/' + entity.type + '/' + entity.osmId())
.attr('target', '_blank')
.text(t('inspector.view_on_osm'));
>>>>>>>
minorButtons.append('a')
.attr('href', 'http://www.openstreetmap.org/browse/' + entity.type + '/' + entity.osmId())
.attr('target', '_blank')
.text(t('inspector.view_on_osm'));
<<<<<<<
inspector.presetData = function(_) {
presetData = _;
return inspector;
};
inspector.graph = function(_) {
graph = _;
=======
inspector.context = function(_) {
context = _;
>>>>>>>
inspector.presetData = function(_) {
presetData = _;
return inspector;
};
inspector.context = function(_) {
context = _; |
<<<<<<<
=======
function reverseDirectionTags(node) {
// Update the direction based tags as appropriate then return an updated node
return node.update({tags: _.transform(node.tags, function(acc, tagValue, tagKey) {
// See if this is a direction tag and reverse (or use existing value if not recognised)
if (tagKey === 'direction') {
acc[tagKey] = {forward: 'backward', backward: 'forward', left: 'right', right: 'left'}[tagValue] || tagValue;
} else {
// Use the reverseKey method to cater for situations such as traffic_sign:forward=stop
// This will pass through other tags unchanged
acc[reverseKey(tagKey)] = tagValue;
}
return acc;
}, {})});
}
function reverseTagsOnNodes(graph, nodeIds) {
// Reverse the direction of appropriate tags attached to the nodes (#3076)
return _(nodeIds)
// Get each node from the graph
.map(function(nodeId) { return graph.entity(nodeId);})
// Check tags on the node, if there aren't any, we can skip
.filter(function(existingNode) { return existingNode.tags !== undefined;})
// Get a new version of each node with the appropriate tags reversed
.map(function(existingNode) { return reverseDirectionTags(existingNode);})
// Chain together consecutive updates to the graph for each updated node and return
.reduce(function (accGraph, value) { return accGraph.replace(value); }, graph);
}
>>>>>>>
function reverseDirectionTags(node) {
// Update the direction based tags as appropriate then return an updated node
return node.update({tags: _.transform(node.tags, function(acc, tagValue, tagKey) {
// See if this is a direction tag and reverse (or use existing value if not recognised)
if (tagKey === 'direction') {
acc[tagKey] = {forward: 'backward', backward: 'forward', left: 'right', right: 'left'}[tagValue] || tagValue;
} else {
// Use the reverseKey method to cater for situations such as traffic_sign:forward=stop
// This will pass through other tags unchanged
acc[reverseKey(tagKey)] = tagValue;
}
return acc;
}, {})});
}
function reverseTagsOnNodes(graph, nodeIds) {
// Reverse the direction of appropriate tags attached to the nodes (#3076)
return _(nodeIds)
// Get each node from the graph
.map(function(nodeId) { return graph.entity(nodeId);})
// Check tags on the node, if there aren't any, we can skip
.filter(function(existingNode) { return existingNode.tags !== undefined;})
// Get a new version of each node with the appropriate tags reversed
.map(function(existingNode) { return reverseDirectionTags(existingNode);})
// Chain together consecutive updates to the graph for each updated node and return
.reduce(function (accGraph, value) { return accGraph.replace(value); }, graph);
} |
<<<<<<<
points = iD.svg.Points(),
vertices = iD.svg.Vertices(),
lines = iD.svg.Lines(),
areas = iD.svg.Areas(),
midpoints = iD.svg.Midpoints(),
labels = iD.svg.Labels(),
=======
points = iD.svg.Points(roundedProjection),
vertices = iD.svg.Vertices(roundedProjection),
lines = iD.svg.Lines(roundedProjection),
areas = iD.svg.Areas(roundedProjection),
multipolygons = iD.svg.Multipolygons(roundedProjection),
midpoints = iD.svg.Midpoints(roundedProjection),
tail = d3.tail(),
>>>>>>>
points = iD.svg.Points(roundedProjection),
vertices = iD.svg.Vertices(roundedProjection),
lines = iD.svg.Lines(roundedProjection),
areas = iD.svg.Areas(roundedProjection),
multipolygons = iD.svg.Multipolygons(roundedProjection),
midpoints = iD.svg.Midpoints(roundedProjection),
labels = iD.svg.Labels(roundedProjection),
tail = d3.tail(),
<<<<<<<
.call(points, graph, all, filter, projection)
.call(vertices, graph, all, filter, projection)
.call(lines, graph, all, filter, projection)
.call(areas, graph, all, filter, projection)
.call(midpoints, graph, all, filter, projection)
.call(labels, graph, all, filter, projection);
=======
.call(points, graph, all, filter)
.call(vertices, graph, all, filter)
.call(lines, graph, all, filter)
.call(areas, graph, all, filter)
.call(multipolygons, graph, all, filter)
.call(midpoints, graph, all, filter);
>>>>>>>
.call(points, graph, all, filter)
.call(vertices, graph, all, filter)
.call(lines, graph, all, filter)
.call(areas, graph, all, filter)
.call(multipolygons, graph, all, filter)
.call(midpoints, graph, all, filter)
.call(labels, graph, all, filter, projection); |
<<<<<<<
async retryTransaction (txId) {
this.txStateManager.setTxStatusUnapproved(txId)
const txMeta = this.txStateManager.getTx(txId)
txMeta.lastGasPrice = txMeta.txParams.gasPrice
this.txStateManager.updateTx(txMeta, 'retryTransaction: manual retry')
}
=======
async updateTransaction (txMeta) {
this.txStateManager.updateTx(txMeta, 'confTx: user updated transaction')
}
>>>>>>>
async retryTransaction (txId) {
this.txStateManager.setTxStatusUnapproved(txId)
const txMeta = this.txStateManager.getTx(txId)
txMeta.lastGasPrice = txMeta.txParams.gasPrice
this.txStateManager.updateTx(txMeta, 'retryTransaction: manual retry')
}
async updateTransaction (txMeta) {
this.txStateManager.updateTx(txMeta, 'confTx: user updated transaction')
} |
<<<<<<<
}
export function utilExternalPresets() {
return utilStringQs(window.location.hash).hasOwnProperty('presets');
}
export function utilExternalValidationRules() {
return utilStringQs(window.location.hash).hasOwnProperty('validations');
=======
}
// https://stackoverflow.com/questions/194846/is-there-any-kind-of-hash-code-function-in-javascript
// https://werxltd.com/wp/2010/05/13/javascript-implementation-of-javas-string-hashcode-method/
export function utilHashcode(str) {
var hash = 0;
if (str.length === 0) {
return hash;
}
for (var i = 0; i < str.length; i++) {
var char = str.charCodeAt(i);
hash = ((hash << 5) - hash) + char;
hash = hash & hash; // Convert to 32bit integer
}
return hash;
>>>>>>>
}
export function utilExternalPresets() {
return utilStringQs(window.location.hash).hasOwnProperty('presets');
}
export function utilExternalValidationRules() {
return utilStringQs(window.location.hash).hasOwnProperty('validations');
}
// https://stackoverflow.com/questions/194846/is-there-any-kind-of-hash-code-function-in-javascript
// https://werxltd.com/wp/2010/05/13/javascript-implementation-of-javas-string-hashcode-method/
export function utilHashcode(str) {
var hash = 0;
if (str.length === 0) {
return hash;
}
for (var i = 0; i < str.length; i++) {
var char = str.charCodeAt(i);
hash = ((hash << 5) - hash) + char;
hash = hash & hash; // Convert to 32bit integer
}
return hash; |
<<<<<<<
var event = d3.dispatch('auth', 'load'),
url = 'http://www.openstreetmap.org',
=======
var event = d3.dispatch('auth', 'loading', 'load', 'loaded'),
url = 'http://api06.dev.openstreetmap.org',
>>>>>>>
var event = d3.dispatch('auth', 'loading', 'load', 'loaded'),
url = 'http://www.openstreetmap.org', |
<<<<<<<
var clip = selection.append('g')
.attr('clip-path', 'url(#clip)');
var layers = clip.selectAll('.layer')
.data(['fill', 'casing', 'stroke', 'text', 'hit', 'label']);
=======
var layers = selection.selectAll('.layer')
.data(['shadow', 'fill', 'casing', 'stroke', 'text', 'hit']);
>>>>>>>
var layers = selection.selectAll('.layer')
.data(['shadow', 'fill', 'casing', 'stroke', 'text', 'hit', 'label']); |
<<<<<<<
.attr('tabindex', -1)
.html('OSM');
=======
.text('OSM');
>>>>>>>
.html('OSM');
<<<<<<<
.attr('tabindex', -1)
.html('HDYC');
=======
.text('HDYC');
>>>>>>>
.attr('tabindex', -1)
.html('HDYC');
<<<<<<<
.attr('tabindex', -1)
.html('OSM');
=======
.text('OSM');
>>>>>>>
.html('OSM');
<<<<<<<
.attr('tabindex', -1)
.html('OSMCha');
=======
.text('OSMCha');
>>>>>>>
.html('OSMCha');
<<<<<<<
.attr('tabindex', -1)
.html('Achavi');
=======
.text('Achavi');
>>>>>>>
.html('Achavi');
<<<<<<<
.attr('tabindex', -1)
.attr('title', t('info_panels.history.link_text', { html: false }))
.html('OSM');
=======
.attr('title', t('info_panels.history.link_text'))
.text('OSM');
>>>>>>>
.attr('title', t('info_panels.history.link_text', { html: false }))
.html('OSM');
<<<<<<<
.attr('tabindex', -1)
.html('PeWu');
=======
.text('PeWu');
>>>>>>>
.attr('tabindex', -1)
.html('PeWu'); |
<<<<<<<
import { utilArrayUnion, utilQsString, utilRebind, utilTiler } from '../util';
=======
import { svgDefs } from '../svg/defs';
import { utilArrayUnion, utilQsString, utilRebind, utilTiler, utilStringQs } from '../util';
>>>>>>>
import { utilArrayUnion, utilQsString, utilRebind, utilTiler, utilStringQs } from '../util';
<<<<<<<
var _loadViewerPromise;
=======
var _mlyHighlightedDetection;
var _mlyShowFeatureDetections = false;
var _mlyShowSignDetections = false;
>>>>>>>
var _loadViewerPromise;
var _mlyHighlightedDetection;
var _mlyShowFeatureDetections = false;
var _mlyShowSignDetections = false;
<<<<<<<
initViewer: function(context) {
=======
highlightDetection: function(detection) {
if (detection) {
_mlyHighlightedDetection = detection.detection_key;
}
return this;
},
initViewer: function(context, imageKey) {
>>>>>>>
highlightDetection: function(detection) {
if (detection) {
_mlyHighlightedDetection = detection.detection_key;
}
return this;
},
initViewer: function(context) { |
<<<<<<<
function drawPaths(group, lines, filter, classes, lineString, prefix) {
var paths = group.selectAll('path')
.filter(filter)
.data(lines, iD.Entity.key);
paths.enter()
.append('path')
.attr('id', function(d) {
return prefix + d.id;
})
.attr('class', classes);
=======
return function drawLines(surface, graph, entities, filter) {
function drawPaths(group, lines, filter, classes, lineString) {
var paths = group.selectAll('path')
.filter(filter)
.data(lines, iD.Entity.key);
>>>>>>>
return function drawLines(surface, graph, entities, filter) {
function drawPaths(group, lines, filter, classes, lineString, prefix) {
var paths = group.selectAll('path')
.filter(filter)
.data(lines, iD.Entity.key); |
<<<<<<<
const { isLoading, tokens } = state
const { userAddress, network } = this.props
=======
const { tokens, isLoading, error } = state
const { userAddress } = this.props
>>>>>>>
const { tokens, isLoading, error } = state
const { userAddress, network } = this.props
<<<<<<<
=======
if (error) {
log.error(error)
return this.message('There was a problem loading your token balances.')
}
const network = this.props.network
>>>>>>>
if (error) {
log.error(error)
return this.message('There was a problem loading your token balances.')
} |
<<<<<<<
entered.append('div')
.attr('class', function(d) { return 'maki-' + d.icon + '-24 icon'; });
=======
var inner = entered.append('div')
.attr('class','grid-inner fillL');
inner.append('div')
.attr('class', function(d) {
var s = 'preset-icon-fill ' + entity.geometry(context.graph());
for (var i in d.match.tags) {
s += ' tag-' + i + ' tag-' + i + '-' + d.match.tags[i];
}
return s;
});
inner.append('div')
.attr('class', function(d) { return 'maki-' + d.icon + '-24 icon'; });
>>>>>>>
entered.append('div')
.attr('class', function(d) {
var s = 'preset-icon-fill ' + entity.geometry(context.graph());
for (var i in d.match.tags) {
s += ' tag-' + i + ' tag-' + i + '-' + d.match.tags[i];
}
return s;
});
entered.append('div')
.attr('class', function(d) { return 'maki-' + d.icon + '-24 icon'; }); |
<<<<<<<
const { conversionUtil, addCurrencies } = require('../../conversion-util')
const t = require('../../../i18n-helper').getMessage
=======
const {
conversionUtil,
addCurrencies,
multiplyCurrencies,
} = require('../../conversion-util')
const GasFeeDisplay = require('../send/gas-fee-display-v2')
const t = require('../../../i18n')
>>>>>>>
const {
conversionUtil,
addCurrencies,
multiplyCurrencies,
} = require('../../conversion-util')
const GasFeeDisplay = require('../send/gas-fee-display-v2')
const t = require('../../../i18n-helper').getMessage |
<<<<<<<
export { utilExternalPresets } from './util';
export { utilExternalValidationRules } from './util';
=======
export { utilEntityOrDeepMemberSelector } from './util';
>>>>>>>
export { utilEntityOrDeepMemberSelector } from './util';
export { utilExternalPresets } from './util';
export { utilExternalValidationRules } from './util';
<<<<<<<
export { utilIdleWorker} from './idle_worker';
export { utilMapCSSRule } from './mapcss_rule';
=======
export { utilHighlightEntity } from './util';
export { utilIdleWorker } from './idle_worker';
export { utilKeybinding } from './keybinding';
>>>>>>>
export { utilHighlightEntity } from './util';
export { utilIdleWorker } from './idle_worker';
export { utilKeybinding } from './keybinding'; |
<<<<<<<
.attr('tabindex', -1)
.attr('title', t('inspector.edit_reference', { html: false }))
=======
.attr('title', t('inspector.edit_reference'))
>>>>>>>
.attr('title', t('inspector.edit_reference', { html: false }))
<<<<<<<
.attr('class', 'tag-reference-button ' + klass)
.attr('title', t('icons.information', { html: false }))
.attr('tabindex', -1)
=======
.attr('class', 'tag-reference-button ' + (klass || ''))
.attr('title', t('icons.information'))
>>>>>>>
.attr('class', 'tag-reference-button ' + (klass || ''))
.attr('title', t('icons.information', { html: false })) |
<<<<<<<
host: 'http://localhost:<%= connect.test.options.port %>/',
template : require('./'),
=======
host: 'http://127.0.0.1:<%= connect.test.port %>/',
template: require('./'),
>>>>>>>
host: 'http://127.0.0.1:<%= connect.test.port %>/',
template: require('./'),
<<<<<<<
mainRequireConfigFile: 'test/fixtures/requirejs/src/main.js',
requireConfig : {
baseUrl: './test/fixtures/requirejs/src/',
config: {
sum: {
description: "Sum module (overridden)"
}
}
=======
requireConfig: {
baseUrl: './test/fixtures/requirejs/src/',
"shim": {
"fakeShim": {
"exports": 'fakeShim',
"init": function () {
return "this is fake shim";
}
}
},
"callback": function() {
define('inlineModule', function() {
return 'this is inline module';
});
}
>>>>>>>
requireConfig : {
baseUrl: './test/fixtures/requirejs/src/',
config: {
sum: {
description: "Sum module (overridden)"
}
},
"shim": {
"fakeShim": {
"exports": 'fakeShim',
"init": function () {
return "this is fake shim";
}
}
},
"callback": function() {
define('inlineModule', function() {
return 'this is inline module';
});
} |
<<<<<<<
'2.1.2' : __dirname + '/../vendor/require-2.1.2.js'
},
path = require('path'),
parse = require('./lib/parse'),
mixConfig = require('./lib/mixConfig');
function filterGlobPatterns(scripts) {
Object.keys(scripts).forEach(function (group) {
if (Array.isArray(scripts[group])) {
scripts[group] = scripts[group].filter(function(script) {
return script.indexOf('*') === -1;
});
} else {
scripts[group] = [];
}
});
}
function toQuotedString(array) {
return "'" + array.join("','") + "'";
}
function serializeRequireConfig(requireConfig) {
var funcCounter = 0;
var funcs = {};
function generateFunctionId() {
return '$template-jasmine-require_' + new Date().getTime() + '_' + (++funcCounter);
}
var jsonString = JSON.stringify(requireConfig, function(key, val) {
var funcId;
if (typeof val === 'function') {
funcId = generateFunctionId();
funcs[funcId] = val;
return funcId;
}
return val;
}, 2);
Object.keys(funcs).forEach(function(id) {
jsonString = jsonString.replace('"' + id + '"', funcs[id].toString());
});
return jsonString;
}
=======
'2.1.2' : __dirname + '/../vendor/require-2.1.2.js',
'2.1.3' : __dirname + '/../vendor/require-2.1.3.js',
'2.1.4' : __dirname + '/../vendor/require-2.1.4.js',
'2.1.5' : __dirname + '/../vendor/require-2.1.5.js'
};
>>>>>>>
'2.1.2' : __dirname + '/../vendor/require-2.1.2.js',
'2.1.3' : __dirname + '/../vendor/require-2.1.3.js',
'2.1.4' : __dirname + '/../vendor/require-2.1.4.js',
'2.1.5' : __dirname + '/../vendor/require-2.1.5.js'
},
path = require('path'),
parse = require('./lib/parse'),
mixConfig = require('./lib/mixConfig');
<<<<<<<
task.copyTempFile(requirejs[version], 'require.js');
=======
if (!(version in requirejs)) {
throw new Error('specified requirejs version [' + version + '] is not defined');
} else {
task.copyTempFile(requirejs[version],'require.js');
}
context.serializeRequireConfig = function(requireConfig) {
var funcCounter = 0;
var funcs = {};
function generateFunctionId() {
return '$template-jasmine-require_' + new Date().getTime() + '_' + (++funcCounter);
}
var jsonString = JSON.stringify(requireConfig, function(key, val) {
var funcId;
if (typeof val === 'function') {
funcId = generateFunctionId();
funcs[funcId] = val;
return funcId;
}
return val;
}, 2);
Object.keys(funcs).forEach(function(id) {
jsonString = jsonString.replace('"' + id + '"', funcs[id].toString());
});
return jsonString;
};
>>>>>>>
if (!(version in requirejs)) {
throw new Error('specified requirejs version [' + version + '] is not defined');
} else {
task.copyTempFile(requirejs[version],'require.js');
}
context.serializeRequireConfig = function(requireConfig) {
var funcCounter = 0;
var funcs = {};
function generateFunctionId() {
return '$template-jasmine-require_' + new Date().getTime() + '_' + (++funcCounter);
}
var jsonString = JSON.stringify(requireConfig, function(key, val) {
var funcId;
if (typeof val === 'function') {
funcId = generateFunctionId();
funcs[funcId] = val;
return funcId;
}
return val;
}, 2);
Object.keys(funcs).forEach(function(id) {
jsonString = jsonString.replace('"' + id + '"', funcs[id].toString());
});
return jsonString;
};
var source = grunt.file.read(template); |
<<<<<<<
var commit = '4e8c4da';
=======
var commit = 'bac9989';
>>>>>>>
var commit = 'b75282b';
<<<<<<<
_context7.next = 49;
=======
_context10.next = 45;
>>>>>>>
_context7.next = 45;
<<<<<<<
return _context7.abrupt('continue', 46);
=======
return _context10.abrupt('continue', 42);
>>>>>>>
return _context7.abrupt('continue', 42);
<<<<<<<
_context7.prev = 14;
_context7.next = 17;
return ajaxLoad(aib.getThrdUrl(b, num), true, true);
=======
_context10.prev = 14;
_context10.next = 17;
return ajaxLoad(aib.getThrdUrl(b, num), true);
>>>>>>>
_context7.prev = 14;
_context7.next = 17;
return ajaxLoad(aib.getThrdUrl(b, num), true);
<<<<<<<
_context7.next = 35;
=======
_context10.next = 31;
>>>>>>>
_context7.next = 31;
<<<<<<<
return _context7.abrupt('continue', 46);
=======
return _context10.abrupt('continue', 42);
>>>>>>>
return _context7.abrupt('continue', 42);
<<<<<<<
return _context7.abrupt('continue', 46);
=======
return _context10.abrupt('continue', 42);
>>>>>>>
return _context7.abrupt('continue', 42); |
<<<<<<<
Alert,
Container,
Row,
Col,
Navbar,
NavbarBrand,
NavbarToggler,
Nav,
NavItem,
NavDropdown,
NavLink,
Breadcrumb,
BreadcrumbItem,
Button,
ButtonDropdown,
ButtonGroup,
ButtonToolbar,
Dropdown,
DropdownItem,
DropdownMenu,
DropdownToggle,
Fade,
Badge,
Card,
CardLink,
CardGroup,
CardDeck,
CardColumns,
CardBody,
CardBlock,
CardFooter,
CardHeader,
CardImg,
CardImgOverlay,
Carousel,
UncontrolledCarousel,
CarouselControl,
CarouselItem,
CarouselIndicators,
CarouselCaption,
CardSubtitle,
CardText,
CardTitle,
Popover,
PopoverContent,
PopoverBody,
PopoverTitle,
PopoverHeader,
Progress,
Modal,
ModalHeader,
ModalBody,
ModalFooter,
PopperContent,
PopperTargetHelper,
Tooltip,
Table,
ListGroup,
Form,
FormFeedback,
// Overridden below
// FormGroup,
FormText,
InputGroup,
InputGroupAddon,
InputGroupButton,
InputGroupButtonDropdown,
InputGroupText,
Label,
Media,
PaginationItem as PagerItem,
PaginationLink as PagerLink,
TabContent,
TabPane,
Jumbotron,
// Overridden below
// Collapse,
ListGroupItem,
ListGroupItemText,
ListGroupItemHeading,
UncontrolledAlert,
UncontrolledButtonDropdown,
UncontrolledDropdown,
UncontrolledNavDropdown,
UncontrolledTooltip,
Util,
} from 'reactstrap';
=======
Alert,
Container,
Row,
Col,
Navbar,
NavbarBrand,
NavbarToggler,
Nav,
NavItem,
NavDropdown,
NavLink,
Breadcrumb,
BreadcrumbItem,
Button,
ButtonDropdown,
ButtonGroup,
ButtonToolbar,
Dropdown,
DropdownItem,
DropdownMenu,
DropdownToggle,
Fade,
// Overridden below
// Badge,
Card,
CardLink,
CardGroup,
CardDeck,
CardColumns,
CardBody,
CardBlock,
CardFooter,
CardHeader,
CardImg,
CardImgOverlay,
Carousel,
UncontrolledCarousel,
CarouselControl,
CarouselItem,
CarouselIndicators,
CarouselCaption,
CardSubtitle,
CardText,
CardTitle,
Popover,
PopoverContent,
PopoverBody,
PopoverTitle,
PopoverHeader,
Progress,
Modal,
ModalHeader,
ModalBody,
ModalFooter,
PopperContent,
PopperTargetHelper,
Tooltip,
Table,
ListGroup,
Form,
FormFeedback,
// Overridden below
// FormGroup,
FormText,
InputGroup,
InputGroupAddon,
InputGroupButton,
InputGroupButtonDropdown,
InputGroupText,
Label,
Media,
PaginationItem as PagerItem,
PaginationLink as PagerLink,
TabContent,
TabPane,
Jumbotron,
// Overridden below
// Collapse,
ListGroupItem,
ListGroupItemText,
ListGroupItemHeading,
UncontrolledAlert,
UncontrolledButtonDropdown,
UncontrolledDropdown,
UncontrolledNavDropdown,
UncontrolledTooltip,
Util
} from "reactstrap";
>>>>>>>
Alert,
Container,
Row,
Col,
Navbar,
NavbarBrand,
NavbarToggler,
Nav,
NavItem,
NavDropdown,
NavLink,
Breadcrumb,
BreadcrumbItem,
Button,
ButtonDropdown,
ButtonGroup,
ButtonToolbar,
Dropdown,
DropdownItem,
DropdownMenu,
DropdownToggle,
Fade,
Card,
CardLink,
CardGroup,
CardDeck,
CardColumns,
CardBody,
CardBlock,
CardFooter,
CardHeader,
CardImg,
CardImgOverlay,
Carousel,
UncontrolledCarousel,
CarouselControl,
CarouselItem,
CarouselIndicators,
CarouselCaption,
CardSubtitle,
CardText,
CardTitle,
Popover,
PopoverContent,
PopoverBody,
PopoverTitle,
PopoverHeader,
Progress,
Modal,
ModalHeader,
ModalBody,
ModalFooter,
PopperContent,
PopperTargetHelper,
Tooltip,
Table,
ListGroup,
Form,
FormFeedback,
FormText,
InputGroup,
InputGroupAddon,
InputGroupButton,
InputGroupButtonDropdown,
InputGroupText,
Label,
Media,
PaginationItem as PagerItem,
PaginationLink as PagerLink,
TabContent,
TabPane,
Jumbotron,
ListGroupItem,
ListGroupItemText,
ListGroupItemHeading,
UncontrolledAlert,
UncontrolledButtonDropdown,
UncontrolledDropdown,
UncontrolledNavDropdown,
UncontrolledTooltip,
Util,
} from 'reactstrap';
<<<<<<<
default as Autocomplete,
} from './components/Autocomplete/Autocomplete';
export { default as Collapse } from './components/Collapse/Collapse';
export { default as FormGroup } from './components/FormGroup/FormGroup';
export { default as Hero } from './components/Hero/Hero';
export { default as Input } from './components/Input/Input';
export { default as LinkList } from './components/LinkList/LinkList';
export { default as LinkListItem } from './components/LinkList/LinkListItem';
export { default as Offcanvas } from './components/Offcanvas/Offcanvas';
export { default as Pager } from './components/Pager/Pager';
export { default as PagerList } from './components/PagerList/PagerList';
=======
default as Autocomplete
} from "./components/Autocomplete/Autocomplete";
export { default as Badge } from "./components/Badge/Badge";
export { default as Collapse } from "./components/Collapse/Collapse";
export { default as FormGroup } from "./components/FormGroup/FormGroup";
export { default as Hero } from "./components/Hero/Hero";
export { default as Input } from "./components/Input/Input";
export { default as LinkList } from "./components/LinkList/LinkList";
export { default as LinkListItem } from "./components/LinkList/LinkListItem";
export { default as Offcanvas } from "./components/Offcanvas/Offcanvas";
export { default as Pager } from "./components/Pager/Pager";
export { default as PagerList } from "./components/PagerList/PagerList";
>>>>>>>
default as Autocomplete,
} from './components/Autocomplete/Autocomplete';
export { default as Badge } from './components/Badge/Badge';
export { default as Collapse } from './components/Collapse/Collapse';
export { default as FormGroup } from './components/FormGroup/FormGroup';
export { default as Hero } from './components/Hero/Hero';
export { default as Input } from './components/Input/Input';
export { default as LinkList } from './components/LinkList/LinkList';
export { default as LinkListItem } from './components/LinkList/LinkListItem';
export { default as Offcanvas } from './components/Offcanvas/Offcanvas';
export { default as Pager } from './components/Pager/Pager';
export { default as PagerList } from './components/PagerList/PagerList'; |
<<<<<<<
import { checkA11y } from "@storybook/addon-a11y";
=======
import { Viewport } from "@storybook/addon-viewport";
import { withA11y } from "@storybook/addon-a11y";
>>>>>>>
import { withA11y } from "@storybook/addon-a11y"; |
<<<<<<<
.addDecorator(withA11y)
.add("Esempi", EsempiComponent, {info:{text: Esempi}})
.add("Link evidenziato", LinkEvidenziatoComponent, {info:{text: LinkEvidenziato}})
.add("Contenuto aggiuntivo", ContenutoAggiuntivoComponent, {info:{text: ContenutoAggiuntivo}})
=======
.addDecorator(checkA11y)
.add("Esempi", withDocs(Esempi, withInfo()(EsempiComponent)))
.add("Link evidenziato", withDocs(LinkEvidenziato, withInfo()(LinkEvidenziatoComponent)))
.add("Contenuto aggiuntivo", withDocs(ContenutoAggiuntivo, withInfo()(ContenutoAggiuntivoComponent)))
>>>>>>>
.addDecorator(withA11y)
.add("Esempi", withDocs(Esempi, withInfo()(EsempiComponent)))
.add("Link evidenziato", withDocs(LinkEvidenziato, withInfo()(LinkEvidenziatoComponent)))
.add("Contenuto aggiuntivo", withDocs(ContenutoAggiuntivo, withInfo()(ContenutoAggiuntivoComponent)))
<<<<<<<
.addDecorator(withA11y)
.add("Non controllata", ChiusuraNonControllataComponent, {
info:{
text: Chiusura,
propTables: null
}
})
.add("Controllata", ChiusuraControllataComponent, {
info:{
text: Chiusura,
propTables: [Alert],
propTablesExclude: [AlertExample],
}
})
=======
.addDecorator(checkA11y)
.add("Non controllata", withDocs(Chiusura,withInfo({text: Chiusura,propTables:null})(ChiusuraNonControllataComponent)))
.add("Controllata", withDocs(Chiusura, withInfo({
text: Chiusura,
propTables: [Alert],
propTablesExclude: [AlertExample],
})(ChiusuraControllataComponent)))
>>>>>>>
.add("Non controllata", withDocs(Chiusura,withInfo({text: Chiusura,propTables:null})(ChiusuraNonControllataComponent)))
.add("Controllata", withDocs(Chiusura, withInfo({
text: Chiusura,
propTables: [Alert],
propTablesExclude: [AlertExample],
})(ChiusuraControllataComponent))) |
<<<<<<<
selectedCategories: Set<string>,
style?: ViewStyleProp
=======
selectedCategories: Set<EventCategoryName>,
style?: StyleObj
>>>>>>>
selectedCategories: Set<EventCategoryName>,
style?: ViewStyleProp |
<<<<<<<
if (this.props.state !== "hiding") return;
if (!this.props.noDataReceived) {
this.animateOut();
}
}
=======
SplashScreenController.hide();
if (this.props.state !== "hiding" || !this.state.heart || !this.state.slide)
return;
>>>>>>>
SplashScreenController.hide();
if (this.props.state !== "hiding") return;
if (!this.props.noDataReceived) {
this.animateOut();
}
} |
<<<<<<<
import { TabNavigator, TabBarBottom, StackNavigator } from "react-navigation";
import EventsScreen from "./screens/EventsScreen";
import EventDetailsScreen from "./screens/EventDetailsScreen";
import FeaturedEventListScreen from "./screens/FeaturedEventListScreen";
import HomeScreen from "./screens/HomeScreen";
import CategoriesFilterScreen from "./screens/CategoriesFilterScreen";
=======
import { Image, StyleSheet, View } from "react-native";
import { TabNavigator, StackNavigator } from "react-navigation";
import type { TabScene } from "react-navigation";
import LinearGradient from "react-native-linear-gradient";
import iconHomeActive from "../assets/images/homeActive.png";
import iconHomeDefault from "../assets/images/homeDefault.png";
import iconEventsActive from "../assets/images/eventsActive.png";
import iconEventsDefault from "../assets/images/eventsDefault.png";
import iconParadeActive from "../assets/images/paradeActive.png";
import iconParadeDefault from "../assets/images/paradeDefault.png";
import iconSavedActive from "../assets/images/savedActive.png";
import iconSavedDefault from "../assets/images/savedDefault.png";
import iconSupportUsActive from "../assets/images/supportUsActive.png";
import iconSupportUsDefault from "../assets/images/supportUsDefault.png";
import { transparent, tabBarShadowColor } from "./constants/colors";
>>>>>>>
import { TabNavigator, StackNavigator } from "react-navigation";
import { Image, StyleSheet, View } from "react-native";
import type { TabScene } from "react-navigation";
import LinearGradient from "react-native-linear-gradient";
import EventsScreen from "./screens/EventsScreen";
import EventDetailsScreen from "./screens/EventDetailsScreen";
import FeaturedEventListScreen from "./screens/FeaturedEventListScreen";
import HomeScreen from "./screens/HomeScreen";
import CategoriesFilterScreen from "./screens/CategoriesFilterScreen";
import iconHomeActive from "../assets/images/homeActive.png";
import iconHomeDefault from "../assets/images/homeDefault.png";
import iconEventsActive from "../assets/images/eventsActive.png";
import iconEventsDefault from "../assets/images/eventsDefault.png";
import iconParadeActive from "../assets/images/paradeActive.png";
import iconParadeDefault from "../assets/images/paradeDefault.png";
import iconSavedActive from "../assets/images/savedActive.png";
import iconSavedDefault from "../assets/images/savedDefault.png";
import iconSupportUsActive from "../assets/images/supportUsActive.png";
import iconSupportUsDefault from "../assets/images/supportUsDefault.png";
import { transparent, tabBarShadowColor } from "./constants/colors";
<<<<<<<
HOME,
EVENT_CATEGORIES_FILTER
=======
HOME,
PARADE,
SAVED,
SUPPORT_US
>>>>>>>
HOME,
EVENT_CATEGORIES_FILTER,
PARADE,
SAVED,
SUPPORT_US
<<<<<<<
[EVENT_LIST]: { screen: EventsScreen, tabBarLabel: "Events" },
[EVENT_DETAILS]: { screen: EventDetailsScreen, tabBarLabel: "Events" },
[EVENT_CATEGORIES_FILTER]: {
screen: CategoriesFilterScreen,
tabBarLabel: "Events"
}
=======
[EVENT_LIST]: { screen: withShadow(EventsScreen) },
[EVENT_DETAILS]: { screen: withShadow(EventDetailsScreen) }
>>>>>>>
[EVENT_LIST]: { screen: withShadow(EventsScreen) },
[EVENT_DETAILS]: { screen: withShadow(EventDetailsScreen) },
[EVENT_CATEGORIES_FILTER]: { screen: CategoriesFilterScreen } |
<<<<<<<
import { Image, Linking, ScrollView, StyleSheet, View } from "react-native";
=======
import { Image, Linking, View, StyleSheet } from "react-native";
>>>>>>>
import { Image, Linking, StyleSheet, View } from "react-native"; |
<<<<<<<
=======
import type { Asset } from "../data/asset";
import type { Event } from "../data/event";
>>>>>>>
import type { Event } from "../data/event";
<<<<<<<
=======
assets: Asset[],
events: Event[],
>>>>>>>
events: Event[],
<<<<<<<
=======
assets: [],
events: [],
>>>>>>>
events: [],
<<<<<<<
=======
assets: action.data.assets,
events: resultWithDefault([], decodeEvents(action.data.entries)),
>>>>>>>
events: resultWithDefault([], decodeEvents(action.data.entries)), |
<<<<<<<
import type { EventDays, SavedEvents } from "../../data/event";
=======
import type { EventDays, SavedEvents } from "../../data/event-deprecated";
import type { ImageSource } from "../../data/get-asset-source";
import type { FieldRef } from "../../data/field-ref";
import getAssetSource from "../../data/get-asset-source";
>>>>>>>
import type { EventDays, SavedEvents } from "../../data/event-deprecated"; |
<<<<<<<
it("updates endTime to be same distance from startTime", () => {
=======
it("does not create new events recurrence is on the same day as start date", () => {
const events = [
{
fields: {
startTime: { "en-GB": "2018-08-02T00:00+00:00" },
endTime: { "en-GB": "2018-08-02T04:00+00:00" },
recurrenceDates: { "en-GB": ["02/08/2018"] }
},
sys: {
id: "event1",
contentType: { sys: { id: "event" } }
}
},
{
fields: { startTime: { "en-GB": "2018-08-01T00:00+00:00" } },
sys: { id: "event2", contentType: { sys: { id: "event" } } }
}
];
const expected = [
{
fields: {
startTime: { "en-GB": "2018-08-02T00:00+00:00" },
endTime: { "en-GB": "2018-08-02T04:00+00:00" },
recurrenceDates: { "en-GB": ["02/08/2018"] }
},
sys: {
id: "event1",
contentType: { sys: { id: "event" } }
}
},
{
fields: { startTime: { "en-GB": "2018-08-01T00:00+00:00" } },
sys: { id: "event2", contentType: { sys: { id: "event" } } }
}
];
expect(expandRecurringEventsInEntries(events)).toEqual(expected);
});
it("does not modify endTime if on different day to startTime", () => {
>>>>>>>
it("does not create new events recurrence is on the same day as start date", () => {
const events = [
{
fields: {
startTime: { "en-GB": "2018-08-02T00:00+00:00" },
endTime: { "en-GB": "2018-08-02T04:00+00:00" },
recurrenceDates: { "en-GB": ["02/08/2018"] }
},
sys: {
id: "event1",
contentType: { sys: { id: "event" } }
}
},
{
fields: { startTime: { "en-GB": "2018-08-01T00:00+00:00" } },
sys: { id: "event2", contentType: { sys: { id: "event" } } }
}
];
const expected = [
{
fields: {
startTime: { "en-GB": "2018-08-02T00:00+00:00" },
endTime: { "en-GB": "2018-08-02T04:00+00:00" },
recurrenceDates: { "en-GB": ["02/08/2018"] }
},
sys: {
id: "event1",
contentType: { sys: { id: "event" } }
}
},
{
fields: { startTime: { "en-GB": "2018-08-01T00:00+00:00" } },
sys: { id: "event2", contentType: { sys: { id: "event" } } }
}
];
expect(expandRecurringEventsInEntries(events)).toEqual(expected);
});
it("updates endTime to be same distance from startTime", () => { |
<<<<<<<
dateFilter: ?DateOrDateRange,
timeFilter: Set<Time>,
onFilterButtonPress: () => void
=======
dateFilter: ?DateRange,
timeFilter: Set<Time>
>>>>>>>
dateFilter: ?DateRange,
timeFilter: Set<Time>,
onFilterButtonPress: () => void |
<<<<<<<
import {
buildDateFilter,
buildDateRangeFilter,
buildTimeFilter,
buildPriceFilter,
buildStringSetFilter
} from "./basic-event-filters";
=======
import { buildDateRangeFilter, buildTimeFilter } from "./basic-event-filters";
>>>>>>>
import {
buildDateRangeFilter,
buildTimeFilter,
buildPriceFilter,
buildStringSetFilter
} from "./basic-event-filters";
<<<<<<<
export type BuildStateArguments = {
date: ?DateOrDateRange,
timeOfDay: Set<Time>,
categories?: Set<string>,
price?: Set<string>,
audience?: Set<string>,
venueDetails?: Set<string>
};
=======
>>>>>>>
<<<<<<<
selectedFilters: {
date: selectedFilers.date,
timeOfDay: selectedFilers.timeOfDay,
categories: selectedFilers.categories || new Set(),
price: selectedFilers.price || new Set(),
audience: selectedFilers.audience || new Set(),
venueDetails: selectedFilers.venueDetails || new Set()
},
stagedFilters: {
date: stagedFilters.date,
timeOfDay: stagedFilters.timeOfDay,
categories: stagedFilters.categories || new Set(),
price: stagedFilters.price || new Set(),
audience: selectedFilers.audience || new Set(),
venueDetails: selectedFilers.venueDetails || new Set()
}
=======
selectedFilters,
stagedFilters
>>>>>>>
selectedFilters,
stagedFilters |
<<<<<<<
=======
assets: [],
events: [],
>>>>>>>
events: [],
<<<<<<<
=======
assets: [],
events: [],
>>>>>>>
events: [],
<<<<<<<
=======
assets: [],
events: [],
>>>>>>>
events: [],
<<<<<<<
=======
assets: [],
events: [],
>>>>>>>
events: [],
<<<<<<<
=======
assets: [],
events: [],
>>>>>>>
events: [], |
<<<<<<<
import type { Event } from "../../data/event";
import type { LocalizedFieldRef } from "../../data/localized-field-ref";
=======
import type {
Event,
LocalizedFieldRef,
EventCategoryName
} from "../../data/event";
>>>>>>>
import type { Event, EventCategoryName } from "../../data/event";
import type { LocalizedFieldRef } from "../../data/localized-field-ref"; |
<<<<<<<
export const dialogBgColor = "#FFFFFF";
export const dialogTitleColor = "rgb(45, 47, 127)";
export const dialogApplyButtonBgColor = "rgb(44, 218, 157)";
export const dialogApplyButtonTextColor = "rgb(45, 47, 127)";
export const dialogHeaderDividerColor = "#F2F2F2";
=======
export const dialogBgColor = whiteColor;
export const dialogApplyButtonBgColor = "rgb(51, 51, 51)";
export const dialogApplyButtonTextColor = whiteColor;
export const dialogHeaderDividerColor = lightGreyColor;
// TAB BAR
export const tabBarBgColor = "rgb(243, 243, 243)";
export const tabBarLabelColor = "rgb(88, 88, 88)";
export const tabBarActiveLineColor = "rgb(44, 218, 157)";
export const tabBarActiveLabelColor = "rgb(45, 47, 127)";
export const tabBarShadowColor = "rgba(0, 0, 0, 0.1)";
export const tabBarBorderColor = "rgba(0, 0, 0, 0.25)";
>>>>>>>
export const dialogBgColor = "#FFFFFF";
export const dialogTitleColor = "rgb(45, 47, 127)";
export const dialogApplyButtonBgColor = "rgb(44, 218, 157)";
export const dialogApplyButtonTextColor = "rgb(45, 47, 127)";
export const dialogHeaderDividerColor = "#F2F2F2";
// TAB BAR
export const tabBarBgColor = "rgb(243, 243, 243)";
export const tabBarLabelColor = "rgb(88, 88, 88)";
export const tabBarActiveLineColor = "rgb(44, 218, 157)";
export const tabBarActiveLabelColor = "rgb(45, 47, 127)";
export const tabBarShadowColor = "rgba(0, 0, 0, 0.1)";
export const tabBarBorderColor = "rgba(0, 0, 0, 0.25)"; |
<<<<<<<
height: 100 * Math.min(1.25, PixelRatio.getFontScale()),
minHeight: 100,
=======
>>>>>>> |
<<<<<<<
import type { EventDays } from "../../data/event";
import type { LocalizedFieldRef } from "../../data/localized-field-ref";
=======
import type {
SavedEvents,
EventDays,
LocalizedFieldRef
} from "../../data/event";
>>>>>>>
import type { SavedEvents, EventDays } from "../../data/event";
import type { LocalizedFieldRef } from "../../data/localized-field-ref"; |
<<<<<<<
): StateProps => ({
navigation,
stages: selectStages(state),
isFocused,
savedEvents: selectSavedEvents(state)
});
=======
): StateProps => {
if (!cache || isFocused) {
cache = {
navigation,
stages: selectStages(state),
amenities: getAmenities(state),
isFocused,
savedEvents: selectSavedEvents(state)
};
}
return cache;
};
>>>>>>>
): StateProps => ({
navigation,
amenities: getAmenities(state),
stages: selectStages(state),
isFocused,
savedEvents: selectSavedEvents(state)
}); |
<<<<<<<
import { selectEventIsFree } from "../selectors/event";
import { whiteColor } from "../constants/colors";
=======
>>>>>>>
import { whiteColor } from "../constants/colors";
<<<<<<<
<EventCard
id={item.sys.id}
name={item.fields.name[locale]}
locationName={item.fields.locationName[locale]}
eventPriceLow={item.fields.eventPriceLow[locale]}
eventPriceHigh={item.fields.eventPriceHigh[locale]}
startTime={item.fields.startTime[locale]}
endTime={item.fields.endTime[locale]}
image={getAssetSource(item.fields.eventsListPicture[locale])}
isFree={selectEventIsFree(item)}
isSaved={isSavedEvent(item.sys.id)}
addSavedEvent={addSavedEvent}
removeSavedEvent={removeSavedEvent}
onPress={onPress}
/>
=======
<Touchable
style={styles.eventListItem}
onPress={() => onPress(item.sys.id)}
>
<EventCard
name={item.fields.name[locale]}
locationName={item.fields.locationName[locale]}
eventPriceLow={item.fields.eventPriceLow[locale]}
eventPriceHigh={item.fields.eventPriceHigh[locale]}
startTime={item.fields.startTime[locale]}
endTime={item.fields.endTime[locale]}
image={getAssetSource(item.fields.eventsListPicture[locale])}
isSaved={isSavedEvent(item.sys.id)}
toggleSaved={active => {
if (active) {
addSavedEvent(item.sys.id);
} else {
removeSavedEvent(item.sys.id);
}
}}
/>
</Touchable>
>>>>>>>
<EventCard
id={item.sys.id}
name={item.fields.name[locale]}
locationName={item.fields.locationName[locale]}
eventPriceLow={item.fields.eventPriceLow[locale]}
eventPriceHigh={item.fields.eventPriceHigh[locale]}
startTime={item.fields.startTime[locale]}
endTime={item.fields.endTime[locale]}
image={getAssetSource(item.fields.eventsListPicture[locale])}
isSaved={isSavedEvent(item.sys.id)}
addSavedEvent={addSavedEvent}
removeSavedEvent={removeSavedEvent}
onPress={onPress}
/> |
<<<<<<<
/**
* Represents, and contains data about, an 'eth_signTypedData' type signature request. These are created when a
* signature for an eth_signTypedData call is requested.
*
* @see {@link }
*
* @typedef {Object} TypedMessage
* @property {number} id An id to track and identify the message object
* @property {object} msgParams The parameters to pass to the eth_signTypedData method once the signature request is
* approved.
* @property {object} msgParams.metamaskId Added to msgParams for tracking and identification within Metamask.
* @property {object} msgParams.from The address that is making the signature request.
* @property {string} msgParams.data A hex string conversion of the raw buffer data of the signature request
* @property {number} time The epoch time at which the this message was created
* @property {string} status Indicates whether the signature request is 'unapproved', 'approved', 'signed' or 'rejected'
* @property {string} type The json-prc signing method for which a signature request has been made. A 'Message' will
* always have a 'eth_signTypedData' type.
*
*/
=======
const log = require('loglevel')
>>>>>>>
const log = require('loglevel')
/**
* Represents, and contains data about, an 'eth_signTypedData' type signature request. These are created when a
* signature for an eth_signTypedData call is requested.
*
* @see {@link }
*
* @typedef {Object} TypedMessage
* @property {number} id An id to track and identify the message object
* @property {object} msgParams The parameters to pass to the eth_signTypedData method once the signature request is
* approved.
* @property {object} msgParams.metamaskId Added to msgParams for tracking and identification within Metamask.
* @property {object} msgParams.from The address that is making the signature request.
* @property {string} msgParams.data A hex string conversion of the raw buffer data of the signature request
* @property {number} time The epoch time at which the this message was created
* @property {string} status Indicates whether the signature request is 'unapproved', 'approved', 'signed' or 'rejected'
* @property {string} type The json-prc signing method for which a signature request has been made. A 'Message' will
* always have a 'eth_signTypedData' type.
*
*/ |
<<<<<<<
import type {
Asset,
Event,
FeaturedEvents,
EventDays,
Performance,
PerformancePeriods
} from "../data/event";
import { buildEventFilter } from "./event-filters";
=======
import type { Asset } from "../data/asset";
import type { Event, EventDays, FeaturedEvents } from "../data/event";
>>>>>>>
import type {
Event,
FeaturedEvents,
EventDays,
Performance,
PerformancePeriods
} from "../data/event";
import type { Asset } from "../data/asset";
import { buildEventFilter } from "./event-filters"; |
<<<<<<<
onBack: undefined,
rightElement: undefined,
testID: undefined
=======
rightElement: undefined
>>>>>>>
rightElement: undefined,
testID: undefined |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.