conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
// axis is an optional parameter. Can be set to 'x' or 'y'.
Dygraph.prototype.isZoomed = function(axis) {
if (axis == null) return this.zoomed_x_ || this.zoomed_y_;
if (axis == 'x') return this.zoomed_x_;
if (axis == 'y') return this.zoomed_y_;
throw "axis parameter to Dygraph.isZoomed must be missing, ... |
<<<<<<<
// Zoomed indicators - These indicate when the graph has been zoomed and on what axis.
this.zoomed_x_ = false;
this.zoomed_y_ = false;
=======
// Number of digits to use when labeling the x (if numeric) and y axis
// ticks.
this.numXDigits_ = 2;
this.numYDigits_ = 2;
// When labeling x (if n... |
<<<<<<<
* global_ - global attributes (common among all graphs, AIUI)
* user_ - attributes set by the user
* axes_ - array of axis index to { series : [ series names ] , options : { axis-specific options. }
* series_ - { seriesName -> { idx, yAxis, options }
* labels_ - used as mapping from index to series name.
... |
<<<<<<<
yValueFormatter: function(x, opt_numDigits) {
return x.toPrecision(Math.min(21, Math.max(1, opt_numDigits || 2)));
},
=======
yValueFormatter: function(x) { return Dygraph.round_(x, 2); },
>>>>>>>
yValueFormatter: Dygraph.defaultFormat,
<<<<<<<
// Number of digits to use when labeling the x... |
<<<<<<<
var valueWindows;
if (this.axes_ != undefined) {
// Preserve valueWindow settings.
valueWindows = [];
for (var index = 0; index < this.axes_.length; index++) {
valueWindows.push(this.axes_[index].valueWindow);
}
}
this.axes_ = [{}]; // always have at least one y-axis.
=======
... |
<<<<<<<
else {
if ( node.specifiers.length ) {
node.specifiers.forEach( specifier => {
const localName = specifier.local.name;
const exportedName = specifier.exported.name;
if ( this.exports[ exportedName ] || this.reexports[ exportedName ] ) {
this.error( {
code: 'DUPLICATE_EXPORT... |
<<<<<<<
},
"title": {
"labels": ["Chart labels"],
"type": "string",
"default": "null",
"description": "Text to display above the chart. You can supply any HTML for this value, not just text. If you wish to style it using CSS, use the 'dygraph-label' or 'dygraph-title' classes."
},
"titleHeight":... |
<<<<<<<
var seriesExtremes = this.extremeValues_(series);
extremes[seriesName] = seriesExtremes;
var thisMinY = seriesExtremes[0];
var thisMaxY = seriesExtremes[1];
if (minY === null || thisMinY < minY) minY = thisMinY;
if (maxY === null || thisMaxY > maxY) maxY = thisMaxY;
=======
var ext... |
<<<<<<<
message: 'Unknown option found: abc. Allowed keys: input, legacy, treeshake, acorn, acornInjectPlugins, context, moduleContext, plugins, onwarn, watch, cache, preferConst, experimentalDynamicImport, entry, external, extend, amd, banner, footer, intro, format, outro, sourcemap, sourcemapFile, name, globals,... |
<<<<<<<
import { lstatSync, readFileSync, realpathSync } from './fs.js';
import { dirname, isAbsolute, resolve } from './path.js';
=======
import { isFile, readdirSync, readFileSync } from './fs.js';
import { basename, dirname, isAbsolute, resolve } from './path.js';
>>>>>>>
import { lstatSync, readdirSync, readFile... |
<<<<<<<
describe('constructor', function() {
it('throws error if stages is not a function', function() {
assert.throws(function() {
p = new Prompt({
stages: 'nope'
});
=======
describe('constructor', function () {
it('throws error if stages is not a function', function () {... |
<<<<<<<
recentCommentsCount={2}
maxLinesPerComment={1}
=======
onLikes={this.onLikes(item.photo)}
>>>>>>>
onLikes={this.onLikes(item.photo)}
recentCommentsCount={2}
maxLinesPerComment={1} |
<<<<<<<
label = item.error.message
} else if (item.state === 'processing'){
label = item.progress
=======
label = item.error
localStatus = styles.statusPink
remoteStatus = styles.statusRed
>>>>>>>
label = item.error.message
localStatus = styles.statusPink
remoteSta... |
<<<<<<<
viewWalletPhoto: (photoId) => { dispatch(PhotoViewingActions.viewWalletPhoto(photoId)) },
refresh: (threadId: string) => { dispatch(PhotoViewingActions.refreshThreadRequest(threadId)) },
toggleVerboseUi: () => { dispatch(PreferencesActions.toggleVerboseUi()) },
=======
dismissPhoto: () => { di... |
<<<<<<<
import { CellType } from 'vtk.js/Sources/Common/DataModel/CellTypes/Constants';
const POLYDATA_FIELDS = ['verts', 'lines', 'polys', 'strips'];
=======
import { POLYDATA_FIELDS } from 'vtk.js/Sources/Common/DataModel/PolyData/Constants';
>>>>>>>
import { CellType } from 'vtk.js/Sources/Common/DataModel/Cel... |
<<<<<<<
<StatusBar barStyle='light-content' />
<ReduxNavigation />
=======
<StatusBar barStyle='dark-content' />
<AppNavigation />
>>>>>>>
<StatusBar barStyle='light-content' />
<AppNavigation /> |
<<<<<<<
function toMercator(geojson, options) {
return convert(geojson, 'mercator', options);
=======
export function toMercator(geojson, mutate) {
return convert(geojson, mutate, 'mercator');
>>>>>>>
export function toMercator(geojson, options) {
return convert(geojson, 'mercator', options);
<<<<<<<
f... |
<<<<<<<
t.distance(lowLeft, lowRight, 'miles', function(err, horizontalDistance){
t.distance(lowLeft, topLeft, 'miles', function(err, verticalDistance){
if(horizontalDistance >= verticalDistance){
squareBbox[0] = bbox[0]
squareBbox[2] = bbox[2]
t.midpoint(lowLeft, topLeft, function(e... |
<<<<<<<
module("Raven.parseDSN");
test("should parse dsn into an object", function() {
var dsn = "http://public:secret@example.com:80/project-id";
var config = Raven.parseDSN(dsn);
equal(config['publicKey'], 'public');
equal(config['secretKey'], 'secret');
e... |
<<<<<<<
var server = app.listen(8080, 'localhost', function () {
=======
app.get('/feed.xml', function(req, res) {
const data = readData();
const feed = createFeed(data);
res.set('Content-Type', 'application/rss+xml');
res.send(feed.xml());
});
// rss rendering
function createFeed(data) {
var feed = new R... |
<<<<<<<
=======
// Ideally we would use AuthService instead of SessionService dep here to retrieve email and token, but it causes a circular dependency issue. So we go right to the source - SessionService
rcMod.
factory('authHttpResponseInterceptor',['$q','$location','SessionService',function($q,$location,SessionS... |
<<<<<<<
$http({method:'GET', url:'api/projects/'+name+'/settings'})
.success(function (data,status) {deferred.resolve(data)})
=======
$http({method:'GET', url:'services/projects/'+name+'/settings'})
.success(function (data,status) {
cachedProjectSettings = data;
deferred.resolve(cachedProjectSettings);
... |
<<<<<<<
projectSettings: function (projectSettingsService, $route) {return projectSettingsService.retrieve($route.current.params.projectName);},
=======
authInfo: function (authentication) {return authentication.authResolver();},
//projectSettings: function (projectSettingsService, $route) {return projectSet... |
<<<<<<<
gather: {kind:'gather', label:'gather', title:'collect', action:undefined, method:'GET', timeout:undefined, finishOnKey:undefined, numDigits:undefined, steps:[], gatherType:"menu", menu:{mappings:[] /*{digits:1, next:"welcome.step1"}*/,}, collectdigits:{collectVariable:'',next:''}, iface:{}},
=======
ga... |
<<<<<<<
$scope.nodes = packedState.nodes;
/*
* for ( var i=0; i < $scope.nodes.length; i++) { var packedNode =
* $scope.nodes[i]; for (var j=0; j<packedNode.steps.length; j++) { var
* step; step = stepPacker.unpack(packedNode.steps[j]); $scope.nodes[i]
*/
// if (node.steps[j].kind == 'gather') {
... |
<<<<<<<
define('bforms-toolbar-order', [
'jquery',
'bforms-toolbar',
'bforms-form',
'bforms-sortable'
], function () {
var Order = function ($toolbar, opts) {
this.options = $.extend(true, {}, this._defaultOptions, opts);
this.name = 'order';
this.type = 't... |
<<<<<<<
"csscomb",
"cssmin",
"decache"]);
grunt.registerTask("amd", ["jshint", "uglify", "decache"]);
=======
'csscomb',
'cssmin',
"decache"
]);
grunt.registerTask('amd', function() {
grunt.fail.warn([
"The task 'amd' is not configured i... |
<<<<<<<
const d0 = "0x80084bf2fba02475726feb2cab2d8215eab14bc6bdd8bfb2c8151257032ecd8b";
const d1 = "0xb039179a8a4ce2c252aa6f2f25798251c19b75fc1508d9d511a191e0487d64a7"
const d2 = "0x263ab762270d3b73d3e2cddf9acc893bb6bd41110347e5d5e4bd1d3c128ea90a"
const d3 = "0x4ce8765e720c576f6f5a34ca3... |
<<<<<<<
res.swagger.lastModified = _.max(resources, "modifiedOn").modifiedOn;
=======
res.swagger.lastModified = _.maxBy(resources, 'modifiedOn').modifiedOn;
>>>>>>>
res.swagger.lastModified = _.maxBy(resources, "modifiedOn").modifiedOn;
<<<<<<<
resources = _.pluck(resources, "data")... |
<<<<<<<
dayName, ", ", _.padLeft(date.getUTCDate(), 2, "0"), " ", monthName, " ", date.getUTCFullYear(), " ",
_.padLeft(date.getUTCHours(), 2, "0"), ":", _.padLeft(date.getUTCMinutes(), 2, "0"), ":", _.padLeft(date.getUTCSeconds(), 2, "0"), " GMT"
].join("");
=======
dayName, ', ', _.padStart(date.getUT... |
<<<<<<<
if (_.contains(name.substring(1, name.length - 1), "/")) {
throw ono("Resource names cannot contain slashes");
=======
if (_.includes(name.substring(1, name.length - 1), '/')) {
throw ono('Resource names cannot contain slashes');
>>>>>>>
if (_.includes(name.substring(1, name.length - 1), "/")) ... |
<<<<<<<
if (!this._headers.hasOwnProperty("Origin")) {
var originScheme = uri.getScheme() === "wss" ? "https" : "http";
var originHost = uri.getPort() !== -1 ? uri.getHost() + ":" + uri.getPort() : uri.getHost();
this._headers["Origin"] = originScheme + "://" + originHost;
}
if (th... |
<<<<<<<
it('should return the notation pattern matching whole string for "' + name + '"', function(){
var pattern = DiceRoll.notationPatterns.get(name, null, true);
=======
it(`should return the notation pattern matching whole string for "${name}"`, () => {
const pattern = DiceRoll... |
<<<<<<<
class ArtistInviteSubmissionsAsGridSimple extends PureComponent { // eslint-disable-line max-len, react/no-multi-comp
static propTypes = {
submissionIds: PropTypes.object.isRequired,
toggleLightBox: PropTypes.func.isRequired,
columnCount: PropTypes.number.isRequired,
headerText: PropTypes.stri... |
<<<<<<<
import _ from 'lodash'
import { LOCATION_CHANGE } from 'react-router-redux'
import { BEACONS, PROFILE, SET_LAYOUT_MODE } from '../constants/action_types'
=======
import { UPDATE_LOCATION } from 'react-router-redux'
import {
BEACONS,
GUI,
HEAD_FAILURE,
HEAD_REQUEST,
HEAD_SUCCESS,
LOAD_STREAM_SUCCE... |
<<<<<<<
assert.ok(ReactDOM.findDOMNode(panes[0]).className.match(/\bcustom\b/));
assert.equal(ReactDOM.findDOMNode(panes[0]).id, 'pane0id');
=======
assert.ok(React.findDOMNode(panes[0]).className.match(/\bcustom\b/));
assert.ok(React.findDOMNode(navs[1]).className.match(/\btcustom\b/));
assert.eq... |
<<<<<<<
import React, {cloneElement} from 'react';
import ReactDOM from 'react-dom';
=======
import domUtils from './utils/domUtils';
import getScrollbarSize from 'dom-helpers/util/scrollbarSize';
import EventListener from './utils/EventListener';
import createChainedFunction from './utils/createChainedFunction';
imp... |
<<<<<<<
it('Should have collapsing class', function () {
instance.setState({ in: true });
=======
it('Should have collapsing class', () => {
instance.setProps({ in: true });
>>>>>>>
it('Should have collapsing class', () => {
instance.setState({ in: true });
<<<<<<<
it('Should set i... |
<<<<<<<
export const CHANGE_CURRENT_FRAME = 'CHANGE_CURRENT_FRAME'
export const CHANGE_THREED_COLORMAP = 'CHANGE_THREED_COLORMAP'
export const UPDATE_THREE_D_COLORBY = 'UPDATE_THREE_D_COLORBY'
export const UPDATE_THREE_D_COLORBY_OPTIONS = 'UPDATE_THREE_D_COLORBY_OPTIONS'
export const UPDATE_THREE_D_CAMERAS = 'UPDATE_TH... |
<<<<<<<
import warning from 'react/lib/warning';
=======
import childrenToArray from './childrenToArray';
>>>>>>>
import warning from 'react/lib/warning';
import childrenToArray from './childrenToArray'; |
<<<<<<<
devtool: 'cheap-module-inline-source-map',
stats: 'minimal',
}),
=======
},
>>>>>>>
devtool: 'cheap-module-inline-source-map',
stats: 'minimal',
}, |
<<<<<<<
<div className="bs-docs-section">
<h1 id="modals" className="page-header">Modals <small>Modal</small></h1>
<h3 id="modals-static">A static example</h3>
<p>A rendered modal with header, body, and set of actions in the footer.</p>
... |
<<<<<<<
var Popover = BS.Popover
=======
var Carousel = BS.Carousel
var CarouselItem = BS.CarouselItem
>>>>>>>
var Popover = BS.Popover
var Carousel = BS.Carousel
var CarouselItem = BS.CarouselItem |
<<<<<<<
afterEach(function() {
ReactDOM.unmountComponentAtNode(focusableContainer);
=======
afterEach(() => {
React.unmountComponentAtNode(focusableContainer);
>>>>>>>
afterEach(() => {
ReactDOM.unmountComponentAtNode(focusableContainer);
<<<<<<<
describe('Keyboard Navigation', fun... |
<<<<<<<
import ReactDOM from 'react-dom';
=======
import getOffset from 'dom-helpers/query/offset';
import css from 'dom-helpers/style';
>>>>>>>
import ReactDOM from 'react-dom';
import getOffset from 'dom-helpers/query/offset';
import css from 'dom-helpers/style';
<<<<<<<
let elem = ReactDOM.findDOMNode(this.r... |
<<<<<<<
<PanelGroup bsStyle="default" id="panel">
<Panel><Panel.Body>Panel 1</Panel.Body></Panel>
</PanelGroup>
=======
<PanelGroup bsStyle="default">
<Panel>Panel 1</Panel>
</PanelGroup>,
>>>>>>>
<PanelGroup bsStyle="default" id="panel">
<Panel><Panel.Body>Panel... |
<<<<<<<
ButtonGroupJustified: require('fs').readFileSync(__dirname + '/../examples/ButtonGroupJustified.js', 'utf8'),
ButtonGroupBlock: require('fs').readFileSync(__dirname + '/../examples/ButtonGroupBlock.js', 'utf8'),
CustomButtonStyle: require('fs').readFileSync(__dirname + '/... |
<<<<<<<
it('forwards provided href', function() {
=======
it('forwards arbitrary props to the anchor', () => {
const instance = ReactTestUtils.renderIntoDocument(<SafeAnchor herpa='derpa' />);
const anchor = ReactTestUtils.findRenderedDOMComponentWithTag(instance, 'A');
anchor.props.herpa.should.equa... |
<<<<<<<
import ReactDOM from 'react-dom';
=======
import React from 'react';
import canUseDom from 'dom-helpers/util/inDOM';
>>>>>>>
import ReactDOM from 'react-dom';
import canUseDom from 'dom-helpers/util/inDOM';
<<<<<<<
let elem = ReactDOM.findDOMNode(componentOrElement);
return (elem && elem.ownerDocument) ... |
<<<<<<<
const normalize = require('./lib/sig-util').normalize
const BN = ethUtil.BN
=======
const createId = require('./lib/random-id')
const normalizeAddress = require('./lib/sig-util').normalize
const messageManager = require('./lib/message-manager')
function noop () {}
>>>>>>>
const normalizeAddress = require('.... |
<<<<<<<
h('.sender-to-recipient__recipient', [
h('i.fa.fa-file-text-o'),
h('.sender-to-recipient__name.sender-to-recipient__recipient-name', this.props.t('newContract')),
]),
=======
this.renderRecipient(),
>>>>>>>
this.renderRecipient(),
<<<<<<<
localeMessages:... |
<<<<<<<
await this.balancesController.updateAllBalances()
=======
await this.txController.pendingTxTracker.updatePendingTxs()
>>>>>>>
await this.balancesController.updateAllBalances()
await this.txController.pendingTxTracker.updatePendingTxs() |
<<<<<<<
this.keyringController.getState(),
this.txManager.getState()
=======
this.keyringController.getState(),
this.noticeController.getState()
>>>>>>>
this.keyringController.getState(),
this.txManager.getState()
this.noticeController.getState()
<<<<<<<
const txManager... |
<<<<<<<
}, this.props.t('cancel')),
h('button.request-signature__footer__sign-button', {
=======
}, t('cancel')),
h('button.btn-primary--lg', {
>>>>>>>
}, this.props.t('cancel')),
h('button.btn-primary--lg', { |
<<<<<<<
this.identities = {} // Essentially a name hash
=======
this._unconfMsgCbs = {}
>>>>>>>
this.identities = {} // Essentially a name hash
<<<<<<<
return Promise.all(this.keyrings.map(this.displayForKeyring))
.then((displayKeyrings) => {
const state = this.store.getState()
// ... |
<<<<<<<
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 }... |
<<<<<<<
function closePopupIfOpen (windowType) {
if (windowType !== 'notification') {
notificationManager.closePopup()
}
}
function displayCriticalError (err) {
container.innerHTML = '<div class="critical-error">The MetaMask app failed to load: please open and close MetaMask again to restart.</... |
<<<<<<<
=======
checkBrowserForConsoleErrors,
verboseReportOnFailure,
>>>>>>>
<<<<<<<
let extensionUri
let tokenAddress
=======
>>>>>>>
let extensionUri |
<<<<<<<
isAccountMenuOpen: false,
=======
isMascara: window.platform instanceof MetamascaraPlatform,
>>>>>>>
isAccountMenuOpen: false,
isMascara: window.platform instanceof MetamascaraPlatform,
<<<<<<<
selectedTokenAddress: null,
tokenExchangeRates: {},
tokens: [],
send: {
gasL... |
<<<<<<<
=======
const gasLimit = new BN(parseInt(blockGasLimit))
const safeGasLimitBN = this.bnMultiplyByFraction(gasLimit, 19, 20)
const saferGasLimitBN = this.bnMultiplyByFraction(gasLimit, 18, 20)
const safeGasLimit = safeGasLimitBN.toString(10)
>>>>>>>
// From latest master
// const gasLimit = ne... |
<<<<<<<
const t = require('../i18n')
=======
const { OLD_UI_NETWORK_TYPE } = require('../../app/scripts/config').enums
const environmentType = require('../../app/scripts/lib/environment-type')
>>>>>>>
const t = require('../i18n')
const { OLD_UI_NETWORK_TYPE } = require('../../app/scripts/config').enums
const environ... |
<<<<<<<
const { withRouter } = require('react-router-dom')
const { compose } = require('recompose')
const { CONFIRM_TRANSACTION_ROUTE } = require('../routes')
=======
const t = require('../../i18n')
>>>>>>>
const { withRouter } = require('react-router-dom')
const { compose } = require('recompose')
const { CONFIRM_TR... |
<<<<<<<
formatDate,
bnMultiplyByFraction,
getTxFeeBn,
shortenBalance,
getContractAtAddress,
=======
exportAsFile: exportAsFile,
>>>>>>>
formatDate,
bnMultiplyByFraction,
getTxFeeBn,
shortenBalance,
getContractAtAddress,
exportAsFile: exportAsFile,
<<<<<<<
}
function bnMultiplyByFraction (ta... |
<<<<<<<
=======
}
App.prototype.render = function () {
var props = this.props
const {
isLoading,
loadingMessage,
network,
isMouseUser,
setMouseUserState,
} = props
const isLoadingNetwork = network === 'loading' && props.currentView.name !== 'config'
const loadMessage = loadingMessage ||... |
<<<<<<<
removeListeners,
applyListeners,
=======
getPlatform,
>>>>>>>
removeListeners,
applyListeners,
getPlatform, |
<<<<<<<
let clock, network, preferences, controller, keyringMemStore
const sandbox = sinon.createSandbox()
const noop = () => {}
const networkControllerProviderConfig = {
getAccounts: noop,
}
beforeEach(async () => {
nock('https://api.infura.io')
.get(/.*/)
.reply(200)
keyring... |
<<<<<<<
const t = require('../../../i18n')
const DIRECT_DEPOSIT_ROW_TITLE = t('directDepositEther')
const DIRECT_DEPOSIT_ROW_TEXT = t('directDepositEtherExplainer')
const COINBASE_ROW_TITLE = t('buyCoinbase')
const COINBASE_ROW_TEXT = t('buyCoinbaseExplainer')
const SHAPESHIFT_ROW_TITLE = t('depositShapeShift')
const ... |
<<<<<<<
h('div', {
className: classnames({
'confirm-screen-section-column--with-error': errors['insufficientFunds'],
'confirm-screen-section-column': !errors['insufficientFunds'],
}),
}, [
h('span.confirm-screen-label', [ ... |
<<<<<<<
// STATUS METHODS
// statuses:
// - `'unapproved'` the user has not responded
// - `'rejected'` the user has responded no!
// - `'approved'` the user has approved the tx
// - `'signed'` the tx is signed
// - `'submitted'` the tx is sent to a server
// - `'confirmed'` the tx has b... |
<<<<<<<
const connect = require('react-redux').connect
const { compose } = require('recompose')
const { withRouter } = require('react-router-dom')
=======
const connect = require('../../metamask-connect')
>>>>>>>
const connect = require('../../metamask-connect')
const { compose } = require('recompose')
const { withR... |
<<<<<<<
unapprovedMsgCount,
unapprovedPersonalMsgCount,
send: state.metamask.send,
=======
selectedAddressTxList: state.metamask.selectedAddressTxList,
>>>>>>>
unapprovedMsgCount,
unapprovedPersonalMsgCount,
send: state.metamask.send,
selectedAddressTxList: state.metamask.selectedAddr... |
<<<<<<<
=======
const t = require('../../../i18n')
const SenderToRecipient = require('../sender-to-recipient')
const NetworkDisplay = require('../network-display')
>>>>>>>
const t = require('../../../i18n')
const SenderToRecipient = require('../sender-to-recipient')
const NetworkDisplay = require('../network-display... |
<<<<<<<
const { ADD_TOKEN_ROUTE } = require('../routes')
=======
const t = require('../../i18n')
>>>>>>>
const { ADD_TOKEN_ROUTE } = require('../routes')
const t = require('../../i18n')
<<<<<<<
h('button.btn-clear.wallet-view__add-token-button', {
onClick: () => history.push(ADD_TOKEN_ROUTE),
}, 'Add ... |
<<<<<<<
driver.findElement(By.css('button')).click()
=======
driver.findElement(By.css(
'button'
)).click()
await delay(300)
>>>>>>>
driver.findElement(By.css('button')).click()
await delay(300) |
<<<<<<<
module.exports = compose(
withRouter,
connect(mapStateToProps, mapDispatchToProps)
)(TxView)
=======
TxView.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(TxView)
>>>>>>>
module.exports = compose(
withRouter,
connect(mapStateToProps, mapDispatch... |
<<<<<<<
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(... |
<<<<<<<
icon: h('img', { src: 'images/plus-btn-white.svg' }),
text: t('createAccount'),
=======
icon: h('img.account-menu__item-icon', { src: 'images/plus-btn-white.svg' }),
text: 'Create Account',
>>>>>>>
icon: h('img.account-menu__item-icon', { src: 'images/plus-btn-white.svg' }),
... |
<<<<<<<
const {
SETTINGS_ROUTE,
INFO_ROUTE,
NEW_ACCOUNT_ROUTE,
IMPORT_ACCOUNT_ROUTE,
DEFAULT_ROUTE,
} = require('../../routes')
module.exports = compose(
withRouter,
connect(mapStateToProps, mapDispatchToProps)
)(AccountMenu)
=======
const t = require('../../../i18n')
module.exports = connect(mapState... |
<<<<<<<
const { EventEmitter } = require('events')
const { Component } = require('react')
const { connect } = require('react-redux')
=======
const inherits = require('util').inherits
const EventEmitter = require('events').EventEmitter
const Component = require('react').Component
const connect = require('../metamask-c... |
<<<<<<<
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) {
... |
<<<<<<<
/**
* 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
* @prope... |
<<<<<<<
const { SEND_ROUTE } = require('../routes')
=======
const t = require('../../i18n')
>>>>>>>
const { SEND_ROUTE } = require('../routes')
const t = require('../../i18n')
<<<<<<<
onClick: () => history.push(SEND_ROUTE),
}, 'SEND'),
=======
onClick: showSendPage,
}, t('send... |
<<<<<<<
return new Promise((resolve, reject) => {
background.submitPassword(password, err => {
dispatch(actions.hideLoadingIndication())
if (err) {
reject(err)
} else {
dispatch(actions.transitionForward())
return forceUpdateMetamaskState(dispatch).then(... |
<<<<<<<
const { ADD_TOKEN_ROUTE } = require('../routes')
const t = require('../../i18n')
=======
>>>>>>>
const { ADD_TOKEN_ROUTE } = require('../routes')
<<<<<<<
onClick: () => history.push(ADD_TOKEN_ROUTE),
}, t('addToken')),
=======
onClick: () => {
showAddTokenPage()
hideSidebar... |
<<<<<<<
var txData = unconfTxList[index] || {}
var isNotification = isPopupOrNotification() === 'notification'
=======
var txData = unconfTxList[index] || unconfTxList[0] || {}
>>>>>>>
var txData = unconfTxList[index] || unconfTxList[0] || {}
var isNotification = isPopupOrNotification() === 'notification' |
<<<<<<<
const unapprovedTxsAll = txHelper(metamaskState.unapprovedTxs, metamaskState.unapprovedMsgs, metamaskState.unapprovedPersonalMsgs, metamaskState.unapprovedTypedMessages, metamaskState.network)
if (unapprovedTxsAll.length > 0) {
store.dispatch(actions.showConfTxPage())
=======
const unapprovedTxsAll ... |
<<<<<<<
this.blockTracker.once('latest', async (blockNumberHex) => {
let recentBlocks
let blockNumber = Number.parseInt(blockNumberHex, 16)
let state = this.store.getState()
recentBlocks = state.recentBlocks
while (recentBlocks.length < this.historyLength) {
=======
this.blockTr... |
<<<<<<<
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import {connect} from 'react-redux'
import { createNewVaultAndKeychain } from '../../../../ui/app/actions'
=======
import EventEmitter from 'events'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import {c... |
<<<<<<<
});
test("Texture tables", function() {
var simple_data = {
number_columns: [0, 1, 2],
columns: [0, 1, 2],
data: [ { 0: 0, 1: 1, 2: 2 },
{ 0: 3, 1: 4, 2: 5 },
{ 0: 6, 1: 7, 2: 8 } ]
};
var table = Facet.Data.texture_table(simple_data);
fo... |
<<<<<<<
onClick: () => {
toggleAccountMenu()
history.push(NEW_ACCOUNT_ROUTE)
},
icon: h('img', { src: 'images/plus-btn-white.svg' }),
=======
onClick: () => showNewAccountPage('CREATE'),
icon: h('img.account-menu__item-icon', { src: 'images/plus-btn-white.svg' }),
>>>>>>... |
<<<<<<<
=======
const fs = require('fs')
const mkdirp = require('mkdirp')
const pify = require('pify')
const assert = require('assert')
const {until} = require('selenium-webdriver')
>>>>>>>
const fs = require('fs')
const mkdirp = require('mkdirp')
const pify = require('pify')
const assert = require('assert')
<<<<<<... |
<<<<<<<
h('button.confirm-screen-back-button', {
onClick: () => this.editTransaction(txMeta),
=======
h('button.btn-clear.confirm-screen-back-button', {
onClick: () => editTransaction(txMeta),
>>>>>>>
h('button.btn-clear.confirm-screen-back-button', {
... |
<<<<<<<
}, t(this.props.localeMessages, 'edit')),
h('div.page-container__title', t(this.props.localeMessages, 'confirm')),
h('div.page-container__subtitle', t(this.props.localeMessages, 'pleaseReviewTransaction')),
=======
}, t('edit')),
h('div.page-container__title',... |
<<<<<<<
import ptbr from './lang/pt-br';
=======
import es from './lang/es';
import th from './lang/th';
>>>>>>>
import es from './lang/es';
import th from './lang/th';
import ptbr from './lang/pt-br';
<<<<<<<
en, de, fr, pt, cn, it, 'pt-br': ptbr
=======
en, de, fr, pt, cn, it, es, th
>>>>>>>
en, de, fr, ... |
<<<<<<<
import './cool.vue';
import './cool-rtl2.vue';
import './green.vue';
=======
import './cool.vue';
import './cool-rtl.vue';
>>>>>>>
import './cool.vue';
import './cool-rtl.vue';
import './cool-rtl2.vue';
import './green.vue'; |
<<<<<<<
test: /\.scss/,
include: path.resolve(__dirname, 'app/assets/scss'),
loader: ExtractTextPlugin.extract('style-loader', 'css-loader!sass-loader')
=======
test: /\.scss$/,
include: path.resolve(__dirname, 'app/assets/scss'),
loader: ExtractTextPlugin.extract("styl... |
<<<<<<<
'btford.socket-io',
'cfp.hotkeys'
=======
'btford.socket-io',
'infinite-scroll',
'monospaced.elastic'
>>>>>>>
'btford.socket-io',
'cfp.hotkeys'
'infinite-scroll',
'monospaced.elastic'
<<<<<<<
require('angular-hotkeys');
=======
require('angular-elastic');
>>>>>>>
require('angular-hotkeys');
requ... |
<<<<<<<
const topAppBarBundles = require('./top-app-bar/webpack.config.js');
const fabBundles = require('./fab/webpack.config.js');
=======
const materialIconBundles = require('./material-icon/webpack.config.js');
const topAppBarBundles = require('./top-app-bar/webpack.config.js');
>>>>>>>
const materialIconBundles ... |
<<<<<<<
// This order (and the avoidance of yields) is important to make
// sure that when publish functions are rerun, they see a
// consistent view of the world: this.userId is set and matches
// the login token on the connection (not that there is
// currently a public API for reading t... |
<<<<<<<
=======
// The reload safetybelt is some js that will be loaded after everything else in
// the HTML. In some multi-server deployments, when you update, you have a
// chance of hitting an old server for the HTML and the new server for the JS or
// CSS. This prevents you from displaying the page in that case... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.