conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
/**
* WordPress dependencies
*/
import { Component } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
=======
const { Component } = wp.element;
const { __, _x } = wp.i18n;
>>>>>>>
/**
* WordPress dependencies
*/
import { Component } from '@wordpress/element';
import { __, _x } from '@word... |
<<<<<<<
import { Component, render } from '@wordpress/element';
=======
import { Component, render, Fragment, Suspense, lazy } from '@wordpress/element';
>>>>>>>
import { Component, render, Suspense, lazy } from '@wordpress/element';
<<<<<<<
import ErrorHandler from 'GoogleComponents/ErrorHandler';
import { Suspens... |
<<<<<<<
trackEvent( 'search_console_setup', 'add_new_sc_property' );
=======
if ( isNew ) {
sendAnalyticsTrackingEvent( 'search_console_setup', 'add_new_sc_property' );
}
>>>>>>>
if ( isNew ) {
trackEvent( 'search_console_setup', 'add_new_sc_property' );
} |
<<<<<<<
fetchEdges(site, languages, edgeType, callback){
const locationEdgeFragment = `fragment FortisDashboardLocationEdges on LocationCollection {
=======
fetchEdges(site, langCode, edgeType, callback) {
const locationEdgeFragment = `fragment FortisDashboardLocationEdges on LocationCollection {
... |
<<<<<<<
<Cell
className="googlesitekit-widget--analyticsAllTrafficV2__dimensions"
lgSize={ 5 }
mdSize={ 4 }
smSize={ 4 }
>
<DimensionTabs dimensionName={ dimensionName } />
<UserDimensionsPieChart dimensionName={ dimensionName } />
=======
<Cell size={ 4 }>
<Di... |
<<<<<<<
import report from './report';
=======
import service from './service';
>>>>>>>
import report from './report';
import service from './service';
<<<<<<<
const store = Data.combineStores(
baseModuleStore,
report,
);
const {
actions,
controls,
reducer,
resolvers,
selectors,
} = store;
=======
const s... |
<<<<<<<
import Widgets from 'googlesitekit-widgets';
import { FORM_ALL_TRAFFIC_WIDGET, DATE_RANGE_OFFSET, STORE_NAME } from '../../../datastore/constants';
=======
import { FORM_ALL_TRAFFIC_WIDGET, DATE_RANGE_OFFSET, MODULES_ANALYTICS } from '../../../datastore/constants';
>>>>>>>
import { FORM_ALL_TRAFFIC_WIDGET, D... |
<<<<<<<
);
domReady( () => {
Widgets.registerWidget(
'analyticsAllTraffic',
{
component: DashboardAllTrafficWidget,
width: Widgets.WIDGET_WIDTHS.FULL,
priority: 1,
wrapWidget: true,
},
[
AREA_DASHBOARD_ALL_TRAFFIC,
AREA_PAGE_DASHBOARD_ALL_TRAFFIC,
],
);
Widgets.registerWidget(
'analyt... |
<<<<<<<
import Dialog from '../../components/Dialog';
import ModuleIcon from '../../components/module-icon';
=======
import Dialog from '../../components/dialog';
import ModuleIcon from '../ModuleIcon';
>>>>>>>
import Dialog from '../../components/Dialog';
import ModuleIcon from '../ModuleIcon'; |
<<<<<<<
=======
import apiFetch from '@wordpress/api-fetch';
import { getQueryArg } from '@wordpress/url';
>>>>>>>
import { getQueryArg } from '@wordpress/url';
<<<<<<<
fetchMock.postOnce(
/^\/google-site-kit\/v1\/core\/modules\/data\/activation/,
{ body: { success: true }, status: 200 }
);
fe... |
<<<<<<<
const hasAccountCreateForm = useSelect( ( select ) => select( STORE_NAME ).hasForm( FORM_ACCOUNT_CREATE ) );
const hasProvisioningScope = useSelect( ( select ) => select( STORE_NAME ).hasProvisioningScope() );
=======
const accounts = useSelect( ( select ) => select( STORE_NAME ).getAccounts() );
>>>>>>>
... |
<<<<<<<
Actions.constants.FACTS.CHANGE_LANGUAGE, this.handleLanguageChange,
Actions.constants.FACTS.LOAD_FACTS, this.handleLoadFacts,
=======
Actions.constants.FACTS.INITIALIZE, this.intializeSettings,
>>>>>>>
Actions.constants.FACTS.CHANGE_LANGUAGE, this.handleLanguageChange,
Actions.c... |
<<<<<<<
import { STORE_NAME, CONTAINER_CREATE, CONTEXT_WEB, CONTEXT_AMP, FORM_SETUP } from './constants';
=======
import { STORE_NAME, CONTAINER_CREATE, CONTEXT_WEB, CONTEXT_AMP } from './constants';
import { STORE_NAME as CORE_MODULES } from '../../../googlesitekit/modules/datastore/constants';
>>>>>>>
import { STO... |
<<<<<<<
title={ sprintf( __( 'Top acquisition channels over the last %s', 'google-site-kit' ), dateRange ) }
=======
title={ sprintf( __( 'Top acquisition sources over the last %s', 'google-site-kit' ), currentDateRange ) }
>>>>>>>
title={ sprintf( __( 'Top acquisition channels over the la... |
<<<<<<<
doAction( 'googlesitekit.dataReceived', request.key );
this.setCache( request.key, result );
=======
this.setCache( request.dataObject, request.key, result );
>>>>>>>
this.setCache( request.key, result ); |
<<<<<<<
router.delete('/dashboards/:id', (req, res) => {
try {
let { id } = req.params;
const { privateDashboard } = paths();
let dashboardPath = path.join(privateDashboard, id + '.private.js');
let dashboardExists = fs.existsSync(dashboardPath);
if (!dashboardExists) {
return res.json({ e... |
<<<<<<<
* @param {Array.<{ maxAge: timestamp, type: string, identifier: string, datapoint: string, datapointId: int, callback: function }>} combinedRequest An array of data requests to resolve.
=======
* @param {Array.<{ maxAge: timestamp, dataObject: string, identifier: string, datapoint: string, datapointId: ... |
<<<<<<<
// Check if each section has zero data.
const adminBarImpressionsHasZeroData = useSelect( AdminBarImpressions.selectHasZeroData );
const adminBarClicksHasZeroData = useSelect( AdminBarClicks.selectHasZeroData );
const adminBarUniqueVisitorsHasZeroData = useSelect( AdminBarUniqueVisitors.selectHasZeroData );... |
<<<<<<<
const { Component, Fragment } = wp.element;
const { __, sprintf } = wp.i18n;
=======
/**
* WordPress dependencies
*/
import { Component } from '@wordpress/element';
import { __, sprintf } from '@wordpress/i18n';
>>>>>>>
/**
* WordPress dependencies
*/
import { Component, Fragment } from '@wordpress/eleme... |
<<<<<<<
/**
* WordPress dependencies
*/
import { Component, Fragment } from '@wordpress/element';
import { __, sprintf } from '@wordpress/i18n';
=======
const { Component, Fragment } = wp.element;
const { __, _x, sprintf } = wp.i18n;
>>>>>>>
/**
* WordPress dependencies
*/
import { Component, Fragment } from '@w... |
<<<<<<<
=======
// Actions
const WAIT_FOR_EXISTING_TAG = 'WAIT_FOR_EXISTING_TAG';
const WAIT_FOR_TAG_PERMISSION = 'WAIT_FOR_TAG_PERMISSION';
>>>>>>>
// Actions
const WAIT_FOR_TAG_PERMISSION = 'WAIT_FOR_TAG_PERMISSION';
<<<<<<<
=======
const baseActions = {
waitForExistingTag() {
return {
payload: {},
t... |
<<<<<<<
import Button from '../Button';
import ResetButton from '../reset-button';
=======
import Button from '../button';
import ResetButton from '../ResetButton';
>>>>>>>
import Button from '../Button';
import ResetButton from '../ResetButton'; |
<<<<<<<
// Actions
const START_FETCH_SET_MODULE_ACTIVATION = 'START_FETCH_SET_MODULE_ACTIVATION';
const FETCH_SET_MODULE_ACTIVATION = 'FETCH_SET_MODULE_ACTIVATION';
const FINISH_FETCH_SET_MODULE_ACTIVATION = 'FINISH_FETCH_SET_MODULE_ACTIVATION';
const CATCH_FETCH_SET_MODULE_ACTIVATION = 'CATCH_FETCH_SET_MODULE_ACTIVATI... |
<<<<<<<
if ( ( menuButtonRef && menuButtonRef.current ) && ( menuRef && menuRef.current ) ) {
// Close the menu if the user presses the Escape key
// or if they click outside of the menu.
if (
( ( 'keyup' === event.type && 27 === event.keyCode ) || 'mouseup' === event.type ) &&
! menuButtonRef.... |
<<<<<<<
import { STORE_NAME } from '../../datastore';
=======
import ProgressBar from '../../../../components/progress-bar';
import { STORE_NAME } from '../../datastore/constants';
>>>>>>>
import { STORE_NAME } from '../../datastore/constants'; |
<<<<<<<
import { isZeroReport, reduceAdSenseData } from '../../util';
import { readableLargeNumber, extractForSparkline, getSiteKitAdminURL } from '../../../../util';
=======
import { reduceAdSenseData } from '../../util';
import { readableLargeNumber, getSiteKitAdminURL } from '../../../../util';
import extractForSp... |
<<<<<<<
import { STORE_NAME as CORE_FORMS } from '../../assets/js/googlesitekit/datastore/forms/constants';
import coreLocationStore from '../../assets/js/googlesitekit/datastore/location';
import { STORE_NAME as CORE_LOCATION } from '../../assets/js/googlesitekit/datastore/location/constants';
=======
import { CORE_... |
<<<<<<<
registry.dispatch( STORE_NAME ).finishResolution( 'getAccounts', [] );
=======
registry.dispatch( MODULES_TAGMANAGER ).setSettings( {} );
registry.dispatch( STORE_NAME ).finishResolution( 'getAccounts', [] );
>>>>>>>
registry.dispatch( MODULES_TAGMANAGER ).setSettings( {} );
registry.dispatch( STORE_NAM... |
<<<<<<<
} );
generateReportBasedWidgetStories( {
moduleSlug: 'analytics',
datastore: STORE_NAME,
group: 'Analytics Module/Components/Dashboard/Bounce Rate Widget',
data: dashboardBounceRateWidgetData,
options: dashboardBounceRateWidgetArgs,
component: DashboardBounceRateWidget,
} );
generateReportBasedWidgetSto... |
<<<<<<<
describe( 'needsReauthentication', () => {
it( 'dispatches an error if the request fails', async () => {
const response = {
code: 'internal_server_error',
message: 'Internal server error',
data: { status: 500 },
};
fetch
.doMockOnceIf( coreUserDataEndpointRegExp )
.moc... |
<<<<<<<
* @since n.e.x.t
* @private
=======
* @since 1.11.0
>>>>>>>
* @since 1.11.0
* @private
<<<<<<<
* @since n.e.x.t
* @private
=======
* @since 1.11.0
>>>>>>>
* @since 1.11.0
* @private
<<<<<<<
* @since n.e.x.t
* @private
*
* @param {number} count Number of containers to generate.
* @pa... |
<<<<<<<
import goals from './goals';
=======
import adsense from './adsense';
>>>>>>>
import adsense from './adsense';
import goals from './goals';
<<<<<<<
goals,
=======
adsense,
>>>>>>>
adsense,
goals, |
<<<<<<<
=======
import { default as setupTagMatchers } from '../components/setup/tag-matchers';
import { default as adsenseTagMatchers } from '../modules/adsense/util/tagMatchers';
import { default as analyticsTagMatchers } from '../modules/analytics/util/tagMatchers';
import { tagMatchers as tagmanagerTagMatchers } ... |
<<<<<<<
<<<<<<< HEAD
(function (factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define('bootstrap.wysihtml5.es-AR', ['jquery', 'bootstrap.wysihtml5'], factory);
} else {
// Browser globals
factory(jQuery);
}
}(function($){... |
<<<<<<<
<<<<<<< HEAD
(function (factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define('bootstrap.wysihtml5.es-ES', ['jquery', 'bootstrap.wysihtml5'], factory);
} else {
// Browser globals
factory(jQuery);
}
}(function($){... |
<<<<<<<
// Drop any relations
function dropTable(item, next) {
=======
// Escape Table Name
table = utils.escapeName(table);
>>>>>>>
// Drop any relations
function dropTable(item, next) {
<<<<<<<
=======
// Escape Table Name
table = utils.escapeName(... |
<<<<<<<
var hmac = crypto.createHmac(algorithm, key);
=======
var hmac = crypto.createHmac('sha1', new Buffer(key));
>>>>>>>
var hmac = crypto.createHmac(algorithm, key);
<<<<<<<
var offset = digest_bytes[(hash_size/8 - 1)] & 0xf;
=======
var offset = digest_bytes[19] & 0xf;
>>>>>>>
var offset =... |
<<<<<<<
function cacheCoordsFor(listView, listItem, prepend) {
listItem.$el.remove();
=======
function cacheCoordsFor(listView, listItem) {
listItem.$el.detach();
>>>>>>>
function cacheCoordsFor(listView, listItem, prepend) {
listItem.$el.remove();
listItem.$el.detach(); |
<<<<<<<
async build (editor: any, path: string = editor.getPath()): Promise<any> {
if (!isValidEditor(editor)) {
throw new Error('invalid editor')
}
this.deleteMessages()
const options = this.goconfig.executor.getOptions('file')
const cmd = await this.goconfig.locator.findTool('go')
if (... |
<<<<<<<
godoc: null,
=======
loaded: null,
>>>>>>>
godoc: null,
loaded: null,
<<<<<<<
let pkgs = [ 'gofmt', 'tester-go', 'builder-go', 'go-get', 'go-config', 'godoc' ]
=======
let pkgs = [ 'gofmt', 'tester-go', 'builder-go', 'autocomplete-go', 'go-get', 'go-config' ]
>>>>>>>
let pkgs = [ 'gof... |
<<<<<<<
=======
putAction = wiki.putAction = function(pageElement, action) {
var site;
action.date = (new Date()).getTime();
if ((site = pageElement.data('site')) != null) {
action.fork = site;
pageElement.find('h1 img').attr('src', '/favicon.png');
pageElement.find('h1 a... |
<<<<<<<
var LEFTARROW, RIGHTARROW, addToJournal, createPage, doInternalLink, findScrollContainer, getItem, pushToLocal, pushToServer, putAction, refresh, resolveFrom, resolveLinks, scrollContainer, scrollTo, setActive, textEditor, useLocalStorage;
=======
var LEFTARROW, RIGHTARROW, addToJournal, asSlug, creat... |
<<<<<<<
var action, addContext, context, footerElement, journalElement, page, site, slug, storyElement, _i, _len, _ref, _ref1;
=======
var action, addContext, context, doItem, footerElement, journalElement, page, site, slug, storyElement, _i, _len, _ref, _ref2;
>>>>>>>
var action, addContext, context, do... |
<<<<<<<
}
}, m('.items', [
ctrl.options()
.map(function (o) {
return o.value() ?
m('.item.scrollable', {'data-value': o.value(), onclick: function(e){
e.stopPropagation();... |
<<<<<<<
'frontend/express/public/javascripts/countly/countly.vue.components.js',
'frontend/express/public/javascripts/countly/countly.token.manager.js',
=======
'frontend/express/public/javascripts/countly/countly.vue.components.js',
'frontend/express/public/javascripts/countly... |
<<<<<<<
=======
if (updatedMember.member_image && updatedMember.member_image === 'delete') {
updatedMember.member_image = "";
}
/**
* Removes all active sessions for user
* @param {string} userId - id of the user for which to remove sessions
**/
function killAllSessionForUser(user... |
<<<<<<<
/** fetchedQuery
* @param {object} note - note object
* @param {array} uids - array of user ids
* @returns {object} query - query object
*/
_fetchedQuery(note, uids) {
=======
async _fetchedQuery(note, uids) {
>>>>>>>
/** fetchedQuery
* @param {object} note - note obj... |
<<<<<<<
query._id = {$ne: "meta_v2"};
validate(params, function(paramsNew) {
var columns = ["ts", "u", "a", "ip", "i"];
common.db.collection('systemlogs').count({}, function(err1, total) {
=======
query._id = {$ne:"meta_v2"};
validate(par... |
<<<<<<<
req.body.email = (req.body.email + "").trim();
countlyDb.collection('members').findOne({"email": req.body.email}, function(err, member) {
if (member) {
var timestamp = Math.round(new Date().getTime() / 1000),
prid = sha512Hash(member.username + mem... |
<<<<<<<
mochaTest: {
test: {
options: {
reporter: 'spec',
timeout: 50000
},
src: ['test/*/*.js']
}
}
});
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-concat');
... |
<<<<<<<
if(!update_array['map'][idss[i]])
update_array['map'][idss[i]]={};
if(params.qstring.set_visibility=='hide')
... |
<<<<<<<
var traverse = require('traverse');
/**
* Try to parse provided value as JSON, or some other value
* @param {string} val - value to parse
* @returns {string|object} parsed value
**/
var defaultParser = function(val) {
=======
var parser = function(val) {
>>>>>>>
/**
* Try to parse provided value as JSON, or... |
<<<<<<<
(function (prevent) {
//countly database connection
prevent.db = null;
//mail service
prevent.mail = null;
//allowed fails
prevent.fails = 3;
//first wait time after reaching fail amount
prevent.wait = 5*60;
//paths to prevent
prevent.paths = [];
prevent.defaultP... |
<<<<<<<
var countlyFs = require('./countlyFs');
var log = require('./log.js')('core:render');
=======
var countlyConfig = require('./../config', 'dont-enclose');
>>>>>>>
var countlyFs = require('./countlyFs');
var log = require('./log.js')('core:render');
var countlyConfig = require('./../config', 'dont-enclose'); |
<<<<<<<
=======
common.db = plugins.dbConnection();
common.writeBatcher = new WriteBatcher(common.db);
common.readBatcher = new ReadBatcher(common.db);
>>>>>>>
common.writeBatcher = new WriteBatcher(common.db);
common.readBatcher = new ReadBatcher(common.db);
<<<<<<<
plugins.dispatch("/m... |
<<<<<<<
"bSortable": false
},
];
$('body').on('click', '.edit-event', function() {
$("#events-blueprint-drawer").addClass("open");
$('#eb-key-name').val($(this).data('event').key);
$('#eb-event-name').val($(this... |
<<<<<<<
el && (me.$el = $( el ));
// options中存在el时，覆盖el
options && options.el && (el = me.$el = $( options.el ));
// if( !el ) {
// throw new Error('Error! No element input.');
... |
<<<<<<<
kValidatorCompiler,
kSerializerCompiler,
kReplySerializerDefault,
=======
kSchemaCompiler,
kSchemaResolver,
kReplySerializerDefault,
>>>>>>>
kValidatorCompiler,
kSerializerCompiler,
kReplySerializerDefault,
<<<<<<<
kPluginNameChain
=======
kGlobalHooks,
kPluginNameChain
>>>>>>>
... |
<<<<<<<
const ContentTypeParser = require('./lib/ContentTypeParser')
const { Hooks, hookRunner, hookIterator, buildHooks } = require('./lib/hooks')
=======
const ContentTypeParser = require('./lib/contentTypeParser')
const Hooks = require('./lib/hooks')
>>>>>>>
const ContentTypeParser = require('./lib/contentTypePar... |
<<<<<<<
const kFluentSchema = Symbol.for('fluent-schema-object')
=======
const { kSchemaVisited } = require('./symbols')
const kFluentSchema = Symbol.for('fluent-schema-object')
>>>>>>>
const { kSchemaVisited } = require('./symbols')
const kFluentSchema = Symbol.for('fluent-schema-object')
<<<<<<<
FST_ERR_SCH_D... |
<<<<<<<
$(events).trigger('DataSetsCacheChanged', {
uri,
action: 'loaded',
cacheInfo: getCacheInfo()
});
}, (error) => {
reject(error);
}).then(() => {
=======
}, reject).then(() => {
>>>>>>>
$(events).trigger('DataSetsCacheChanged', {
uri,
... |
<<<<<<<
log({err: 'couch', body: parsed, headers: rh});
=======
if(verbose) {
console.log({err: 'couch', body: parsed, headers: rh});
}
if (!parsed) { parsed = {}; } // if HEAD request, body will be undefined
>>>>>>>
log({err: 'couch', body: parsed, hea... |
<<<<<<<
correct_answer = data['questions'][q_idx][2];
var wrong_answers = get_wrong_answers(label, correct_answer);
=======
>>>>>>>
correct_answer = data['questions'][q_idx][2];
var wrong_answers = get_wrong_answers(label, correct_answer); |
<<<<<<<
self._server._fiber(function() {
try {
=======
Fiber(function() {
try {
if(!self._beforeHandling('DELETE', self._requestPath.collectionId, self._requestCollection.findOne(self._requestPath.collectionId))) {
return self._rejectedResponse("Could not delete that object.");
}... |
<<<<<<<
//TODO: figure what to put in controller, some dom modification should go in link
=======
//TODO figure what to put in controller, some dom modification should go in link
>>>>>>>
//TODO: figure what to put in controller, some dom modification should go in link
<<<<<<<
... |
<<<<<<<
this.updateHighlightRangeAndObtainDataPoints = function (graph, mouseOverHighlightBar, tipItems, series, sources, extraY, mousePositionData, timestampSelector, dateBisector, dateFormatter, isDataStacked, distanceToRight) {
var datapoints = [];
var bandOffset = graph.x0.bandwidth() + graph.x0.paddingInner()... |
<<<<<<<
var y;
if(metric.extraYAxis){
y = extraY_[metric.extraYAxis];
}else{
y = y_;
}
if (metric.data.length === 0 || !sources[index].displaying) {
=======
var displayingInLegend = ChartToolService.findMatchingMetricInSources(metric, sources).displaying;
if (metric.data.length === 0 || !... |
<<<<<<<
require("./services/tokenAuthInterceptor")
=======
require("./services/agTableService")
>>>>>>>
require("./services/tokenAuthInterceptor")
require("./services/agTableService") |
<<<<<<<
var defaultContainerHeight = containerHeight;
=======
>>>>>>>
var defaultContainerHeight = containerHeight;
<<<<<<<
// watch changes from chart options modal to update graph
scope.$watch('menuOption', function() {
if (!scope.hideMenu) {
... |
<<<<<<<
this.buildViewElement = function(scope, element, attributes, dashboardCtrl, elementType, index, DashboardService, growl) {
=======
this.updateIndicatorStatus = updateIndicatorStatus;
this.buildViewElement = buildViewElement;
function populateChart(metricList, annotationExpres... |
<<<<<<<
var bufferRatio = 0.2; //the ratio of buffer above/below max/min on yAxis for better showing experience
var resizeTimeout = 250; //the time for resize function to fire
=======
var bufferRatio = 0.2 //the ratio of buffer above/below max/min on yAxis for better showing experi... |
<<<<<<<
var xScale = timeInfo.GMTon? d3.scaleUtc(): d3.scaleTime();
var y = this.getY(sizeInfo, yScaleType, yScaleConfigValue);
return {
x: xScale.domain([timeInfo.startTime, timeInfo.endTime]).range([0, sizeInfo.width]),
y: y.y,
yScalePlain: y.yScalePlain
};
};
this.getY = function (sizeInfo, yScal... |
<<<<<<<
},
alphabeticalSort: function(a, b) {
var textA = a.name.toUpperCase();
var textB = b.name.toUpperCase();
return (textA < textB) ? -1 : (textA > textB) ? 1 : 0;
},
objectWithoutProperties: function (obj, keys) {
var target = {};
for (var i in obj) {
if (keys.indexOf(i) >= 0) continu... |
<<<<<<<
var ms = require('humanize-ms');
var utility = require('utility');
=======
var ms = require('ms');
var thunkify = require('thunkify-wrap');
>>>>>>>
var ms = require('humanize-ms');
var thunkify = require('thunkify-wrap'); |
<<<<<<<
// give each series an unique ID
for (var i = 0; i < series.length; i++) {
lineChartScope.series[i].graphClassName = newChartId + "_graph" + i;
}
// append, compile, & attach new scope to line-chart directive
=======
>>>>>>>
// give each series an unique ... |
<<<<<<<
import { TransitionablePortal, Segment, Progress, Modal, Button, Icon } from 'semantic-ui-react';
=======
import { TransitionablePortal, Segment, Progress } from 'semantic-ui-react';
import uuidV4 from 'uuid/v4';
>>>>>>>
import { TransitionablePortal, Segment, Progress, Modal, Button, Icon } from 'semantic-u... |
<<<<<<<
key={Math.random()}
index={index}
currentSlideIndex={this.getActiveSlideIndex()}
=======
key={index}
index={index}
>>>>>>>
key={Math.random()}
currentSlideIndex={this.getActiveSlideIndex()}
index={... |
<<<<<<<
if (options.urls) {
// Handle for multiple file share
NativeModules.RNShare.open(options, (error) => {
return reject({error: error});
}, (success, activityType) => {
if (success) {
return resolve({
app: activityType
... |
<<<<<<<
Crawler = require("../");
crawler = new Crawler("http://example.com");
discover = crawler.discoverResources.bind(crawler);
=======
crawler = new Crawler();
discover = function (resourceText, queueItem) {
queueItem = queueItem || {};
var resourc... |
<<<<<<<
if (error) {
=======
response.destroy();
>>>>>>>
if (error) {
<<<<<<<
response.socket.destroy();
/**
* Fired when the downloading of a resource was prevented
... |
<<<<<<<
/**
* Creates a new queue
* @class
*/
=======
/**
* Recursive function that takes two objects and updates the properties on the
* first object based on the ones in the second. Basically, it's a recursive
* version of Object.assign.
*/
function deepAssign(object, source) {
for (var key in source) {
... |
<<<<<<<
=======
// Extract request options from queue;
var requestHost = queueItem.host,
requestPort = queueItem.port,
requestPath = queueItem.path;
// Are we passing through an HTTP proxy?
if (crawler.useProxy) {
requestHost = crawler.proxyHostname;
requestPort = craw... |
<<<<<<<
.option(['t', 'translateTime'], 'Display epoch timestamps as UTC ISO format or according to an optional format string (default ISO 8601)')
=======
.option(['n', 'localTime'], 'Display timestamps according to system timezone')
.option(['t', 'translateTime'], 'Convert Epoch timestamps to ISO format')
.o... |
<<<<<<<
patch: 0,
metadata: "development",
=======
patch: 1,
metadata: null,
>>>>>>>
patch: 1,
metadata: "development", |
<<<<<<<
const { name, size } = this.state.value || '';
const { image } = this.state || '';
const { customMetadata: CustomMetadata, customImageThumbnail: CustomImageThumbnail } = this.props;
const MetadataClass = CustomMetadata || FileInputMetadata;
const ImageThumbnailClass = CustomImageThumbnail |... |
<<<<<<<
editorWillChangeBuffer: function(newBuffer) {
// Remove events from the old layoutManager.
var layoutManager = this.editor.layoutManager;
layoutManager.invalidatedRects.remove(this);
layoutManager.changedTextAtRow.remove(this);
// Add the events to the new layoutMana... |
<<<<<<<
parent.innerHTML = '<div id="editor" class="center">Editor goes here</div><div class="south">Command line goes here</div>';
=======
parent.innerHTML = '<div class="center">Editor goes here</div>';
>>>>>>>
parent.innerHTML = '<div id="editor" class="center">Editor goes here</div>'; |
<<<<<<<
var needAspectCalc = anychart.utils.isPercent(this.getOption('zAspect'));
=======
>>>>>>>
<<<<<<<
if (needAspectCalc) {
var aspectRatio = parseFloat(zAspect) / 100;
=======
if (anychart.utils.isPercent(this.zAspectInternal)) {
var aspectRatio = parseFloat(this.zAspectInternal) / 100;
>>>>>... |
<<<<<<<
// If any streams are empty, return an empty stream
if( streams.filter( function(x) { return x.empty(); } ).length > 0 ) {
return new Stream();
}
return new Stream(
f.apply( null, streams.map( function(x) { return x.head(); }) ),
function () {
... |
<<<<<<<
if(getWidth(wcwidth, lines[i]) > this.columns - c.x) {
if(c.x >= this.columns)
c.x = this.columns - 1;
splitWidth =
indexOfWidth(wcwidth, lines[i], this.columns - c.x);
=======
if(lines[i].length > this.columns - c.x) {
>>>>>>>
if(getWidth(wcwidth, lines[i]) > this.columns - c.x) {
<<<<<... |
<<<<<<<
if (!session.getData('currentScene')) {
session.setData('currentScene', null)
=======
if (!session.data.currentScene) {
session.update({ currentScene: null })
>>>>>>>
if (!session.getData('currentScene')) {
session.setData('currentScene', null)
<<<<<<<
if (matchedScene) {... |
<<<<<<<
this.fuseOptions = config || {
tokenize: true,
threshold: 0.1,
distance: 10,
=======
this.fuseOptions = {
tokenize: false,
threshold: config.fuzzyTreshold || 0.3,
distance: config.fuzzyDistance || 10,
>>>>>>>
this.fuseOptions = config || {
tokenize: false... |
<<<<<<<
=======
$(".vis-live-toggle", $nc).click(function () {
$(this).toggleClass("running", !reload_queues.running);
reload_queues.toggle(!reload_queues.running);
}).click();
let physics_running = true;
$(".vis-physics-toggle", $nc).click(function () {
$(this).toggleClass("ru... |
<<<<<<<
actionCableConsumer.subscriptions.create(
{ channel, ...actionCableParams },
{
received: data => {
if (!data.cableReady) return
if (data.operations.morph && data.operations.morph.length) {
const urls = Array.from(
new Set(data.operations.morp... |
<<<<<<<
import {emitter} from './channel'
=======
import { asap } from './scheduler'
import { emitter } from './channel'
import { ident } from './utils'
>>>>>>>
import { emitter } from './channel'
import { ident } from './utils' |
<<<<<<<
=======
function emitter() {
var subscribers = [];
function subscribe(sub) {
subscribers.push(sub);
return function () {
return remove(subscribers, sub);
};
}
function emit(item) {
var arr = subscribers.slice();
for (var i = 0, len = arr.length; i < len; i++) {
arr[... |
<<<<<<<
import { noop, is, check, uid as nextSagaId, wrapSagaDispatch, isDev, log, object, createSetContextWarning } from './utils'
import proc from './proc'
=======
import { is, isDev, log } from './utils'
>>>>>>>
import { noop, is, check, uid as nextSagaId, wrapSagaDispatch, isDev, log, object, createSetContextWar... |
<<<<<<<
return '#### ' + (pass ? (kitten + votePassComment) : voteFailComment) + '\n\n' +
=======
var resp = '#### ' + (pass ? votePassComment : voteFailComment) + '\n\n' +
>>>>>>>
var resp = '#### ' + (pass ? (kitten + votePassComment) : voteFailComment) + '\n\n' + |
<<<<<<<
if(nick.indexOf("~") >= 0) {
var fname = nick.split("~")[0];
socket.send("/nick " + fname + "~" + conn_id);
} else {
socket.send("/nick " + HTMLEncode(nick) + "~" + conn_id);
}
=======
socket.send("/nick " + HTMLEncode(nick) + "_" + conn_id);
>>>>>>>
if(nick.indexOf("~") >= 0)... |
<<<<<<<
set isVisible(isVisible) {
if (this._isVisible === isVisible) {
return;
}
this._isVisible = isVisible;
this.domNode.style.display = isVisible ? 'block' : 'none';
if (isVisible) {
this.invalidate();
}
},
=======
>>>>>>>
set ... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.