conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
import React from "react"
import Switch from "react-router-dom/Switch"
import Route from "react-router-dom/Route"
import Helmet from "react-helmet"
import Menu from "components/Menu/Menu"
import Loading from "components/Loading/Loading"
import RedirectWithStatus from "components/RouterStatus/RedirectWithStatus"... |
<<<<<<<
import React from "react"
import Helmet from "react-helmet"
import Link from "react-router-dom/Link"
=======
// @flow
import React from 'react'
import Helmet from 'react-helmet'
import Link from 'react-router-dom/Link'
>>>>>>>
// @flow
import React from "react"
import Helmet from "react-helmet"
import Link... |
<<<<<<<
let bountyToken, bountyDecimals
this.props.tokens.forEach(
token => {
if(token.symbol === bountySymbol) {
bountyToken = token.addr
bountyDecimals = token.decimals
}
=======
let bountyToken
this.props.tokens.forEach(token => {
if (token.symbol ===... |
<<<<<<<
=======
Button,
>>>>>>>
<<<<<<<
import { Form, FormField, FieldTitle } from '../../Form'
import { DateInput } from '../../../../../../shared/ui'
=======
import {
DateInput,
Form,
FormField,
FieldTitle,
DescriptionInput
} from '../../Form'
>>>>>>>
import { Form, FormField, FieldTitle } from '.... |
<<<<<<<
// TODO: @aragon/ui Table?
// workStatus can be either: 'new', 'review-applicants', 'review-work', or 'finished'
// It represents the state of the current issue in the approval bounty flow
const Issue = ({workStatus, title, repo, number, labels, isSelected, onSelect, onSubmitWork, onRequestAssignment, onReviewA... |
<<<<<<<
import { AppBar, Main, SidePanel } from '@aragon/ui'
=======
import styled from 'styled-components'
import { map } from 'rxjs/operators'
import { AppBar, AppView, Main, SidePanel, observe, font } from '@aragon/ui'
>>>>>>>
import { AppBar, AppView, Main, SidePanel } from '@aragon/ui'
<<<<<<<
import AppView ... |
<<<<<<<
import { AppBar, AppView, Main, observe, TabBar, font } from '@aragon/ui'
=======
import { AppView, AppBar, Main, observe, SidePanel, TabBar, Root, Viewport, font, breakpoint } from '@aragon/ui'
>>>>>>>
import { AppBar, AppView, Main, observe, TabBar, font } from '@aragon/ui'
<<<<<<<
const { network, di... |
<<<<<<<
const activities = (issue, requestsData, workSubmissions, onReviewApplication, onReviewWork) => {
=======
const activities = (requestsData, workSubmissions, fundingHistory, onReviewApplication, onReviewWork) => {
>>>>>>>
const activities = (issue, requestsData, workSubmissions, fundingHistory, onReviewApplic... |
<<<<<<<
handleToggleWhitelistOnly = organization => {
const {actions: {updateOrganizationAsync}} = this.props
const whitelistOnly = !organization.whitelistOnly
updateOrganizationAsync(organization, {...organization, whitelistOnly})
}
=======
handleChooseDefaultRole = (organization, defaultRole) => ... |
<<<<<<<
=======
Button,
Field,
>>>>>>>
<<<<<<<
Button,
=======
Info
>>>>>>>
Button,
Info,
<<<<<<<
bounties[issue.id].size = this.calculateSize(bounties[issue.id])
} else {
this.props.issues.map(issue => {
bounties[issue.id] = {
repo: issue.repo,
number: is... |
<<<<<<<
case TEMPLATE_VARIABLE_SELECTED: {
const {dashboardID, tvID, values: updatedSelectedValues} = action.payload
const newDashboards = state.dashboards.map((dashboard) => {
if (dashboard.id === dashboardID) {
const newTVs = dashboard.tempVars.map((staleTV) => {
if (sta... |
<<<<<<<
=======
//overflow-y: hidden;
>>>>>>> |
<<<<<<<
import { observe, SidePanel, Main, AppBar, AppView, breakpoint } from '@aragon/ui'
=======
import { observe, SidePanel, Main, AppBar, AppView } from '@aragon/ui'
>>>>>>>
import { observe, SidePanel, Main, AppBar, AppView } from '@aragon/ui'
<<<<<<<
<IdentityProvider
onResolve={this.handleR... |
<<<<<<<
onNewReward = reward => {
this.props.app.newReward(
reward.isMerit, //bool _isMerit,
reward.referenceAsset, //address _referenceToken,
reward.currency, //address _rewardToken,
reward.amount, //uint _amount,
reward.duration, //uint _duration, (number of blocks until reward wi... |
<<<<<<<
const handleSubmit = async e => {
e.preventDefault()
const newIssueData = {
number: issues.filter(i => i.id === repoHexIds[selectedProject - 1]).length,
id: repoHexIds[selectedProject - 1],
title,
body: description,
author: {
login: this.props.ac... |
<<<<<<<
() => {
this.props.app.cache('github', {
status: STATUS.FAILED,
token: null,
})
}
)
=======
}, () => {
this.props.app.cache('github', {
event: REQUESTED_GITHUB_TOKEN_FAILURE,
status: STATU... |
<<<<<<<
const expLevelsMul = expLevels.map(l => web3.toHex(l.mul) * 100)
=======
let expLevelsMul = expLevels.map(l => web3.toHex(l.mul))
>>>>>>>
const expLevelsMul = expLevels.map(l => web3.toHex(l.mul) * 100)
<<<<<<<
bountyCurrencies[bountyCurrency],
bountyAllocator
=======
this.... |
<<<<<<<
import {
Button,
DropDown,
IconClose,
IconFundraising,
IdentityBadge,
Info,
SafeLink,
Text,
TextInput,
useTheme,
} from '@aragon/ui'
=======
import {
DropDown,
IconClose,
Text,
TextInput,
useTheme,
} from '@aragon/ui'
>>>>>>>
import {
Button,
DropDown,
IconClose,
Identit... |
<<<<<<<
let bobafettInitialBalance,
dengarInitialBalance,
bosskInitialBalance,
allocationId,
supports,
token
=======
let bobafettInitialBalance
let dengarInitialBalance
let bosskInitialBalance
let accountId
let payoutId
let supports
>>>>>>>
let bobafettIn... |
<<<<<<<
let appState, vault, bounties, tokens, vaultAddress
=======
let appState = determineStateVars()
let vault, bounties, tokens
>>>>>>>
let appState = determineStateVars()
let vault, bounties, tokens, vaultAddress
<<<<<<<
if (response.address === vaultAddress) {
console.log('[Projects] VaultDeposit', ... |
<<<<<<<
hint={isMerit && <span>The <b>start date</b> for one-time merits defines the beginning of the review period in which newly accrued amounts of the reference asset will be determined.</span>}
=======
width={`calc(50% - ${GU}px)`}
>>>>>>>
hint={isMerit && <span>The <b>start date</b> for ... |
<<<<<<<
disbursements,
semanticErrors,
=======
errors,
>>>>>>>
disbursements,
errors,
<<<<<<<
<React.Fragment>
<Form
onSubmit={this.submitDraft}
submitText="Continue"
disabled={!this.isDraftValid()}
errors={
<React.Fragm... |
<<<<<<<
<Root.Provider>
<StyledAragonApp publicUrl={ASSETS_URL}>
<BaseStyles />
<ToastHub>
<Title text="Projects" />
<ApolloProvider client={client}>
<ErrorBoundary>
<AppContent
onLogin={this.handleGithubSignIn}
... |
<<<<<<<
renderRefreshingGraph(type, queries) {
const {autoRefresh, templates, synchronizer} = this.props
=======
renderRefreshingGraph(type, queries, cellHeight) {
const {timeRange, autoRefresh, templates} = this.props
>>>>>>>
renderRefreshingGraph(type, queries, cellHeight) {
const {timeRange, aut... |
<<<<<<<
var CartoError = require('../error');
var metadataParser = require('./metadata/parser');
=======
var CartoError = require('../error-handling/carto-error');
var CartoValidationError = require('../error-handling/carto-validation-error');
var EVENTS = require('../events');
>>>>>>>
var CartoError = require('../... |
<<<<<<<
var options = JSON.parse(data.options);
options.allowWheelOnFullscreen = false;
=======
var options = data.options;
>>>>>>>
var options = data.options;
options.allowWheelOnFullscreen = false; |
<<<<<<<
var CartoValidationError = require('../error-handling/carto-error');
=======
var CartoError = require('../error');
// Event constants
var CONTENT_CHANGED = 'contentChanged';
>>>>>>>
var CartoValidationError = require('../error-handling/carto-error');
var CartoError = require('../error-handling/carto-error')... |
<<<<<<<
var Backbone = require('backbone');
var VisModel = require('../../../../src/vis/vis');
=======
var LayersCollection = require('../../../../src/geo/map/layers');
>>>>>>>
var VisModel = require('../../../../src/vis/vis');
var LayersCollection = require('../../../../src/geo/map/layers'); |
<<<<<<<
// TODO: change Dropdown to a MultiSelectDropdown, `selected` to
// the full array, and [item] to all `selected` values when we update
// this component to support multiple values
return (
<div key={id} className="template-control--dropdown... |
<<<<<<<
this.filter.setDataOrigin(this._dataOrigin);
// Retrigger an event when the changes
this.filter.bind('change', this._onFilterChanged, this);
=======
>>>>>>>
this.filter.setDataOrigin(this._dataOrigin); |
<<<<<<<
<h2 className="hosts-graph-heading">{cell.name}</h2>
<div className="hosts-graph graph-container">
<RefreshingLineGraph
queries={qs}
autoRefresh={autoRefreshMs}
showSingleStat={cell.type === "line-plus-single-stat"}
displayO... |
<<<<<<<
calculateTimeColumnWidth,
=======
VERTICAL_TIME_AXIS_DEFAULT,
>>>>>>>
VERTICAL_TIME_AXIS_DEFAULT,
calculateTimeColumnWidth,
<<<<<<<
unzippedData: [[]],
hoveredColumnIndex: NULL_COLUMN_INDEX,
hoveredRowIndex: NULL_ROW_INDEX,
sortByColumnIndex: NULL_COLUMN_INDEX,
clickToS... |
<<<<<<<
=======
_onLocalTimezoneChanged: function () {
this._originalData.set('localTimezone', this.get('localTimezone'));
},
_updateURLBinding: function () {
// We shouldn't listen url change for fetching the data (with filter) because
// we have to wait until we know all the data available (witho... |
<<<<<<<
describe("when there're grid URLs", function () {
beforeEach(function () {
this.cartoDBLayerGroup.set('urls', {
=======
it('should return an array with the grid URL templates', function () {
this.cartoDBLayerGroup.set('urls', {
grids: [
[ 'url1' ],
[ 'ur... |
<<<<<<<
const containerStyle = {
width: 'calc(100% - 32px)',
height: 'calc(100% - 16px)',
position: 'absolute',
top: '8px',
}
=======
let prefix
let suffix
if (axes) {
prefix = axes.y.prefix
suffix = axes.y.suffix
}
>>>>>>>
const containerStyle = {
... |
<<<<<<<
aggregation: model.get('aggregation') || 'minute',
offset: model.get('offset') || 0,
bins: model.get('bins'),
=======
>>>>>>> |
<<<<<<<
// keep this for backward compatibility with tiler_* variables
if (!dataLayer.options.maps_api_template) {
this._setupTilerConfiguration(dataLayer.options.tiler_protocol, dataLayer.options.tiler_domain, dataLayer.options.tiler_port);
} else {
this.options.maps_api_tem... |
<<<<<<<
/**
* Creates a new internal model with the given engine
* and the attributes initialized in the constructor.
*
* @param {Engine} engine - The engine object to be assigned to the internalModel.
*/
=======
Dataset.prototype = Object.create(Base.prototype);
>>>>>>>
/**
* Creates a new internal model wi... |
<<<<<<<
*
* @param {object} source - The source where the layer will fetch the data.
* @param {carto.style.CartoCSS} style - A CartoCSS object with the layer styling.
* @param {object} [options]
* @param {string} [options.id=Autogenerated ID] - Unique layer ID.
* @param {Array<string>} [options.featureClickColum... |
<<<<<<<
var CartoDBLayerGroupNamed = require('cdb/geo/map/cartodb-layer-group-named');
var CartoDBLayerGroupAnonymous = require('cdb/geo/map/cartodb-layer-group-anonymous');
=======
var TimeWidgetView = require('cdb/geo/ui/widgets/time/view');
var Model = require('cdb/core/model');
>>>>>>>
var CartoDBLayerGroupNamed... |
<<<<<<<
var data = this.dataModel.getData();
=======
_.bindAll(this, '_onWindowResize');
$(window).bind('resize', this._onWindowResize);
var data = this.model.getData();
>>>>>>>
var data = this.model.getData();
<<<<<<<
height: this.defaults.chartHeight,
data: this.dataModel.getData... |
<<<<<<<
_.extend(Base.prototype, Backbone.Events);
=======
/**
*
*/
Base.prototype.validateSource = function () {
};
>>>>>>>
_.extend(Base.prototype, Backbone.Events);
/**
*
*/
Base.prototype.validateSource = function () {
}; |
<<<<<<<
// this var stores views information for each model
this.layers = {};
this.bind('clean', this._removeLayers, this);
=======
// this var stores views information for each model
this.layers = {};
>>>>>>>
// this var stores views information for each model
this.layers = {};
... |
<<<<<<<
hoverTime: NULL_HOVER_TIME,
queryASTs: [],
=======
>>>>>>>
queryASTs: [],
<<<<<<<
handleQueryAST = queryASTs => {
this.setState({queryASTs})
}
handleSetHoverTime = hoverTime => {
this.setState({hoverTime})
}
=======
>>>>>>>
handleQueryAST = queryASTs => {
this.se... |
<<<<<<<
setResolution: func,
=======
cellHeight: number,
>>>>>>>
setResolution: func,
cellHeight: number, |
<<<<<<<
var LeafletLayer = require('../../../../src/api/v4/leaflet-layer');
var Engine = require('../../../../src/engine');
var Events = require('../../../../src/api/v4/events');
=======
var LeafletLayer = require('../../../../src/api/v4/native/leaflet-layer');
var GoogleMapsMapType = require('../../../../src/api/v4/... |
<<<<<<<
it("should extract the cdn_url from the vizjson", function(done) {
var vizjson = "http://documentation.cartodb.com/api/v2/viz/e7b04b62-b901-11e4-b0d7-0e018d66dc29/viz.json";
var image = cartodb.Image(vizjson);
image.getUrl(function(err, url) {
expect(image.options.cdn_url.http).toEqual("a... |
<<<<<<<
require('../../../src/vis/overlays'); // Overlay.register calls
=======
var OverlaysFactory = require('../../../src/vis/overlays-factory');
require('../../../src/vis/layers'); // Layers.register calls
>>>>>>>
var OverlaysFactory = require('../../../src/vis/overlays-factory'); |
<<<<<<<
WidgetModel.prototype.initialize.call(this, attrs, opts);
// Retrigger an event when the changes
this.filter.bind('change', this._onFilterChanged, this);
=======
WidgetModel.prototype.initialize.call(this);
this._dataOrigin = new Backbone.Collection(this.get('data'));
>>>>>>>
this._d... |
<<<<<<<
var dataProvider = this.layer.getDataProvider();
if (dataProvider) {
dataProvider.bind('featuresChanged', this._onDataProviderChanged, this);
} else {
this.listenToOnce(this, 'change:url', function () {
this._fetch(this._onChangeBinds.bind(this));
});
}
=======
... |
<<<<<<<
var dataProvider = this.layer.getDataProvider();
if (dataProvider) {
dataProvider.bind('featuresChanged', this._onDataProviderChanged, this);
} else {
this.listenToOnce(this, 'change:url', function () {
this.fetch({
success: this._onChangeBinds.bind(this)
});
... |
<<<<<<<
if (torque) {
this.torqueLayer = torque;
// send step events from torque layer
this.torqueLayer.bind('change:time', function(s) {
this.trigger('change:step', this.torqueLayer, this.torqueLayer.getStep());
}, this);
if (!this.isMobileEnabled && this.torqueLayer) {
... |
<<<<<<<
var AnalysisFactory = require('../analysis/analysis-factory');
=======
var VizJSON = require('./vizjson');
var util = require('cdb.core.util');
>>>>>>>
var AnalysisFactory = require('../analysis/analysis-factory');
var VizJSON = require('./vizjson');
var util = require('cdb.core.util');
<<<<<<<
if (data... |
<<<<<<<
// there is a race condition in leaflet. If size is invalidated
// and at the same time the center is set the final center is displaced
// so set pan to false so the map is not moved and then force the map
// to be at the place it should be
this._leafletMap.invalidateSize({ pan: false }); //... |
<<<<<<<
function _setVibrancy(win, op = null) {
if (op && supportedType.indexOf(op) === -1 && op[0] !== '#') op = 'appearance-based';
if (op === 'appearance-based') {
if (nativeTheme.shouldUseDarkColors) op = 'dark';
else op = 'light';
}
let redValue, greenValue, blueValue, alphaValue;
... |
<<<<<<<
const roundId = 3, poorJuror = juror100
=======
const roundId = DEFAULTS.maxRegularAppealRounds.toNumber(), poorJuror = juror500
>>>>>>>
const roundId = DEFAULTS.maxRegularAppealRounds.toNumber(), poorJuror = juror100 |
<<<<<<<
// advance one term to avoid drafting all the batches in the same term
await courtHelper.passRealTerms(1)
const receipt = await court.draft(disputeId, { from: drafter })
=======
const receipt = await court.draft(disputeId, jurorsPerBatch, { from: drafter })
>>>... |
<<<<<<<
const { assertAmountOfEvents, assertEvent } = require('../helpers/assertEvent')
const { OUTCOMES, getVoteId, oppositeOutcome } = require('../helpers/crvoting')
=======
const { assertAmountOfEvents, assertEvent } = require('@aragon/os/test/helpers/assertEvent')(web3)
const { getVoteId, oppositeOutcome, OUTCOME... |
<<<<<<<
const { receipt, addresses, weights, outputLength, selectedJurors } = await draft({ batchRequestedJurors, roundRequestedJurors })
=======
const receipt = await draft({ batchRequestedJurors, roundRequestedJurors })
const { addresses, weights, outputLength } = getEventAt(rece... |
<<<<<<<
if (!readTransactionFinished) {
SelfTest.finishWithError(errorcb, 'readTransaction did not finish');
return;
}
return db.transaction(function(tx3) {
tx3.executeSql('DELETE FROM TestTable');
re... |
<<<<<<<
// TBD Test for Android Web SQL ONLY in this version branch:
if (isWP8) pending('NOT IMPLEMENTED for WP8');
if (isWindows) pending('NOT IMPLEMENTED for Windows');
if (!isWebSql && !isWindows && isAndroid) pending('SKIP for Android plugin'); // TBD SKIP for Android plugin ... |
<<<<<<<
insertChildHTML_: function (child, before, desktop) {
jq(this.$n('pp')).append(child.redrawHTML_()); //color palette and color picker
child.bind(desktop);
},
popupDomContent_:function (){//override toolbarbutton, color picker draw pp dom at another location
return '';
},
=======
>>>>>... |
<<<<<<<
/**
* =================================================================================================================
=======
/*
>>>>>>>
/*
* =================================================================================================================
<<<<<<<
* var stage = new createjs.S... |
<<<<<<<
active={isDragging}
staticLegendHeight={staticLegendHeight}
=======
active={!!isDragging}
>>>>>>>
active={!!isDragging}
staticLegendHeight={staticLegendHeight} |
<<<<<<<
module.exports = function (fn, options) {
var keys = [];
=======
module.exports = function (fn) {
>>>>>>>
module.exports = function (fn, options) { |
<<<<<<<
=======
import DomUtils from './domUtils'
import './soundtouch'
>>>>>>>
import DomUtils from './domUtils' |
<<<<<<<
const util = require('util');
const accessAsync = util.promisify(fs.access);
const config = ('../lib/config');
=======
>>>>>>>
const util = require('util');
const accessAsync = util.promisify(fs.access);
const config = ('../lib/config');
<<<<<<<
const { path } = params;
try {
await accessAsync... |
<<<<<<<
var blockHash = block.hash.toString();
console.log('Block received! ' + JSON.stringify(blockHash));
_getBlocks();
=======
console.log('Block received! ' + JSON.stringify(block));
var blockHash = block.toString();
if (parseInt($scope.blocks.length, 10) > parseInt(BLOCKS_DISPLAYED, 10) ... |
<<<<<<<
Script.prototype.isPubkey = function() {
return (this.chunks.length == 2 &&
Buffer.isBuffer(this.chunks[0]) &&
this.chunks[1] == OP_CHECKSIG);
};
=======
var util = b.util || require('./util/util');
var Parser = b.Parser || require('./util/BinaryParser').class();
var Put = b.Put || require('bu... |
<<<<<<<
const util = require('../util');
=======
const db = require('../db');
>>>>>>>
const util = require('../util');
const db = require('../db');
<<<<<<<
if (!util.isBitcoinAddress(addr)) {
return res.status(400).send({
error: 'Invalid bitcoin address',
});
}
logg... |
<<<<<<<
// Return UI JSON
return res.send({
txid: tx.hash,
version: tx.version,
time: tx.ps,
blocktime: tx.ps,
locktime: tx.locktime,
blockhash: tx.block,
fees: tx.fee / 1e8,
confirmations: (height - tx.height) + 1,
... |
<<<<<<<
angular.module('insight.system').controller('IndexController',
['$scope',
'Global',
'socket',
'Blocks',
'Transactions',
function($scope, Global, socket, Blocks, Transactions) {
=======
angular.module('insight.system').controller('IndexController', ['$scope', '$rootScope', 'Global', 'so... |
<<<<<<<
// For now, blocks handles these calls.
// These will be replaced with more advanced mongo
// No optimization yet.
=======
// Will be replaced with a more sophisticated api soon
>>>>>>>
// For now, blocks handles these calls.
// These will be replaced with more advanced mongo
// No optimization yet.
// Will ... |
<<<<<<<
var addrs = [];
=======
// Is it from genesis block? (testnet==livenet)
// TODO: parse it from networks.genesisTX
if (txid === genesisTXID) return cb();
>>>>>>>
var addrs = [];
// Is it from genesis block? (testnet==livenet)
// TODO: parse it from networks.genesisTX
if (txid === genesisTXI... |
<<<<<<<
eventBus.on('resetEditableWords', (region, uuid) => {
if (uuid && uuid === editableUuid) {
return
}
=======
const checkIsEmpty = () => {
if (!element[0].textContent.trim().length) {
element[0].class... |
<<<<<<<
iconSize: [11 , 10],
iconAnchor: [20 , 0],
popupAnchor: [-5, -5]
=======
iconSize: [15 , 10],
iconAnchor: [20 , 0],
popupAnchor: [-5, -5]
>>>>>>>
iconSize: [11 , 10],
iconAnchor: [20 , 0],
popupAnchor: [-5, -5]
<<<<<<<
url: 'https://www.pu... |
<<<<<<<
},{"jquery":2,"leaflet":6}],9:[function(require,module,exports){
require('./purpleAirMarkerLayer.js') ;
=======
},{}],9:[function(require,module,exports){
require('jquery') ;
require('leaflet') ;
>>>>>>>
},{}],9:[function(require,module,exports){
require('jquery') ;
require('leaflet') ;
require('./pur... |
<<<<<<<
require('./mapKnitterLayer.js') ;
=======
require('./toxicReleaseLayer.js') ;
>>>>>>>
require('./mapKnitterLayer.js') ;
require('./toxicReleaseLayer.js') ; |
<<<<<<<
require(path.join(__dirname, '..', '..', '..', 'node_modules', 'codemirror', 'addon', 'fold', 'xml-fold.js'))
=======
require(path.join(__dirname, '..', '..', '..', 'node_modules', 'codemirror', 'addon', 'fold', 'xml-fold.js'))
require(path.join(__dirname, '..', '..', '..', 'node_modules', 'codemi... |
<<<<<<<
// implementation of a chord diagram view of the job graph
AMBROSE.chordView = function() {
var ui, view;
=======
/**
* Ambrose module "chord" provides a chord diagram of the job graph.
*/
(function($, d3, colorbrewer, ambrose) {
var chord = ambrose.chord = function(ui) {
return new ambrose.chord.fn... |
<<<<<<<
scriptTags: getTagsFromPropsList(TAG_NAMES.SCRIPT, [TAG_PROPERTIES.SRC], propsList),
htmlAttributes: getHtmlAttributesFromPropsList(propsList)
=======
scriptTags: getTagsFromPropsList(TAG_NAMES.SCRIPT, [TAG_PROPERTIES.SRC, TAG_PROPERTIES.INNER_HTML, TAG_PROPERTIES.NAME], propsList)
>>>>>>>
sc... |
<<<<<<<
console.log(facingMode);
getDeviceId(facingMode).then(function (deviceId) {
=======
getDeviceId(facingMode, chooseDeviceId).then(function (deviceId) {
>>>>>>>
getDeviceId(facingMode, chooseDeviceId).then(function (deviceId) {
<<<<<<<
style: PropTypes.any,
className: PropTypes.st... |
<<<<<<<
, auth: {
user: user
, pass: pass
}
, maxMessages: 1
=======
>>>>>>>
, maxMessages: 1 |
<<<<<<<
if(data['updatedEntities'][0]['state']['next_state_transition_in'] !== undefined){
Unit.NextHarvest = data['updatedEntities'][0]['state']['next_state_transition_at'];
Unit.NextAmount = data['updatedEntities'][0]['state']['current_product']['amount'];
}
if(data.responseData.militaryProducts.length > 5){
... |
<<<<<<<
// PlayerDict
MainParser.UpdatePlayerDict(data.responseData, 'StartUpService');
=======
// freigeschaltete Erweiterungen sichern
MainParser.UnlockedAreas = data.responseData.city_map.unlocked_areas;
>>>>>>>
// PlayerDict
MainParser.UpdatePlayerDict(data.responseData, 'StartUpService');
// f... |
<<<<<<<
const collections = options.collections || [];
=======
>>>>>>>
const collections = options.collections || [];
<<<<<<<
collections: collections.join(),
q: options.query,
=======
query: options.query,
>>>>>>>
collections: collections.join(),
query: opti... |
<<<<<<<
var __values;
var __read;
var __spread;
var __asyncGenerator;
var __asyncDelegator;
var __asyncValues;
=======
var __exportStar;
>>>>>>>
var __exportStar;
var __values;
var __read;
var __spread;
var __asyncGenerator;
var __asyncDelegator;
var __asyncValues;
<<<<<<<
__values = function (o) {
var ... |
<<<<<<<
this.__state = null;
this.__rawState = null;
=======
this.state = null;
this.__roots = null;
>>>>>>>
this.__state = null;
this.__rawState = null;
this.__roots = null; |
<<<<<<<
var existingWidget = global.__rerenderWidget;
var widgetsContext = widgets.getWidgetsContext(out);
=======
var rerenderWidget = global.__rerenderWidget;
var widgetsContext = markoWidgets.getWidgetsContext(out);
>>>>>>>
var existingWidget = global.__rerenderWidget;
var widgetsContext =... |
<<<<<<<
function create(__markoHelpers) {
var marko_loadTag = __markoHelpers.t,
test_hello = marko_loadTag(require("./tags/test-hello/renderer"));
=======
function create(__helpers) {
var str = __helpers.s,
empty = __helpers.e,
notEmpty = __helpers.ne,
escapeXml = __helpers.x,
__load... |
<<<<<<<
if (isRerenderInBrowser !== true) {
var targetNode = out.$__getOutput();
var fromEl;
var targetEl = targetNode.firstChild;
while(targetEl) {
var id = targetEl.id;
if (id) {
... |
<<<<<<<
var url = require('url')
, express = require('express')
, mirrorRouter = express.Router()
, path = require('path')
, fs = require('fs')
, request = require('request');
mirrorRouter.use(function(req, res, next) {
next();
});
mirrorRouter.get('/', function(req, res, ... |
<<<<<<<
}
Authenticate.takePhoto = function(addFace, faceIdCallback) {
=======
};
Authenticate.takePhoto = function(addFace) {
>>>>>>>
};
Authenticate.takePhoto = function(addFace) {
<<<<<<<
authenticated = true
authenticating = false
message.innerText = resultObj.name;
... |
<<<<<<<
t.test('addOverride error with non existing file', function (t) {
confit(path.join(__dirname, 'fixtures', 'defaults'))
.addOverride('nonexistent.json')
.create(function(err, config) {
t.ok(err);
t.equal(err.code, 'MODULE_NOT_FOUND');
... |
<<<<<<<
=======
const asyncForEach = async (_this, array, callback) => {
for (let index = 0; index < array.length; index += 1) {
await callback(array[index], index, array, _this);
}
};
const getDifficultyName = zone => {
const boss = zone.type === 4 ? 'BOSS - ' : '';
switch (zone.difficulty) {
case ... |
<<<<<<<
=======
get getPopup() {
return _.bind(instance.getPopup, instance);
},
>>>>>>>
get getPopup() {
return _.bind(instance.getPopup, instance);
}, |
<<<<<<<
// test offset returns are correct
var b = new Buffer(16);
assert.equal(4, b.writeUInt32LE(0, 0));
assert.equal(6, b.writeUInt16LE(0, 4));
assert.equal(7, b.writeUInt8(0, 6));
assert.equal(8, b.writeInt8(0, 7));
assert.equal(16, b.writeDoubleLE(0, 8));
=======
// test unmatched surrogates not producing inval... |
<<<<<<<
'http://x:1/\' <>"`/{}|\\^~`/': {
protocol: 'http:',
slashes: true,
host: 'x:1',
port: '1',
hostname: 'x',
pathname: '/%27%20%3C%3E%22%60/%7B%7D%7C%5C%5E~%60/',
path: '/%27%20%3C%3E%22%60/%7B%7D%7C%5C%5E~%60/',
href: 'http://x:1/%27%20%3C%3E%22%60/%7B%7D%7C%5C%5E~%60/'
},
=... |
<<<<<<<
if (!util.isBuffer(chunk) &&
!util.isString(chunk) &&
!util.isNullOrUndefined(chunk) &&
!state.objectMode &&
!er) {
=======
if (!Buffer.isBuffer(chunk) &&
'string' !== typeof chunk &&
chunk !== null &&
chunk !== undefined &&
!state.objectMode) {
>>>>>>>
i... |
<<<<<<<
next();
}
=======
if (stats) next(stats);
else _next();
}
exports.realpathSync = function(path) {
var stats = exports.lstatSync(path);
if (stats.isSymbolicLink())
return readlinkDeepSync(path, stats);
else
return normalize(path);
}
exports.realpath = function(path, callback) {
var reso... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.