conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
currentCustomizeScript: appContainer.config.customizeScript,
=======
currentCustomizeCss: appContainer.config.customizeCss,
>>>>>>>
currentCustomizeCss: appContainer.config.customizeCss,
currentCustomizeScript: appContainer.config.customizeScript,
<<<<<<<
* Change customize script... |
<<<<<<<
currentHighlightJsStyle: appContainer.config.highlightJsStyle,
isHighlightJsStyleBorderEnabled: appContainer.config.highlightJsStyleBorder,
=======
currentCustomizeCss: appContainer.config.customizeCss,
currentCustomizeScript: appContainer.config.customizeScript,
>>>>>>>
current... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
const globalLang = crowi.configManager.getConfig('crowi', 'app:globalLang');
=======
const globalLang = configManager.getConfig('crowi', 'globalLang');
>>>>>>>
const globalLang = configManager.getConfig('crowi', 'app:globalLang');
<<<<<<<
const ... |
<<<<<<<
* GeneralSetting:
* type:object
* GuestModeParams:
* type: object
* properties:
* restrictGuestMode:
* type: string
* description: type of restrictGuestMode
* PageDeletionP... |
<<<<<<<
// don't add any more middlewares to this file.
// all new middlewares should be an independent file under /server/routes/middlewares
const debug = require('debug')('growi:lib:middlewares');
=======
// eslint-disable-next-line no-unused-vars
>>>>>>>
// don't add any more middlewares to this file.
// all new... |
<<<<<<<
, UserGroup = models.UserGroup
=======
, ExternalAccount = models.ExternalAccount
>>>>>>>
, ExternalAccount = models.ExternalAccount
, UserGroup = models.UserGroup
<<<<<<<
actions.userGroup = {};
actions.userGroup.index = function (req, res) {
var page = parseInt(req.query.page) || 1... |
<<<<<<<
router.use('/app-settings', require('./app-settings')(crowi));
=======
router.use('/customize-setting', require('./customize-setting')(crowi));
>>>>>>>
router.use('/app-settings', require('./app-settings')(crowi));
router.use('/customize-setting', require('./customize-setting')(crowi)); |
<<<<<<<
Array.from(this.state.selectedPages).map((page) => {
const pageId = page._id;
const revisionId = page.revision._id;
this.props.crowi.apiPost('/pages.remove',
{page_id: pageId, revision_id: revisionId, completely: deleteCompletely})
.then(res => {
if (res.ok) {
... |
<<<<<<<
define(['embed'], function(embed){
["indexOf", "lastIndexOf"].forEach(
function(name, idx){
embed[name] = function(arr, callback, thisObj){
// This is due to a bug found in in Chrome 9, FF 3.6 and 4:
// Having undefined as the second parameter to lastIndexOf
// will result in lastIndeOf inte... |
<<<<<<<
const { body } = require('express-validator/check');
const ErrorV3 = require('../../models/vo/error-apiv3');
=======
>>>>>>>
const { body } = require('express-validator/check');
const ErrorV3 = require('../../models/vo/error-apiv3');
<<<<<<<
const LIMIT_FOR_LIST = 10;
=======
const { query } = require(... |
<<<<<<<
customizeScript: [
body('customizeScript').isString(),
],
=======
customizeCss: [
body('customizeCss').isString(),
],
>>>>>>>
customizeCss: [
body('customizeCss').isString(),
],
customizeScript: [
body('customizeScript').isString(),
],
<<<<<<<
/**
... |
<<<<<<<
const validator = {
lineBreak: [
body('isEnabledLinebreaks').isBoolean(),
body('isEnabledLinebreaksInComments').isBoolean(),
],
presentationSetting: [
body('pageBreakSeparator').isInt().not().isEmpty(),
],
xssSetting: [
body('isEnabledXss').isBoolean(),
body('tagWhiteList').isArray... |
<<<<<<<
/**
* @swagger
*
* /page/archive:
* post:
* tags: [Page]
* summary: /page/archive
* description: create page archive
* requestBody:
* content:
* application/json:
* schema:
* properties:
... |
<<<<<<<
layoutType: Config.layoutType(config),
=======
env: {
PLANTUML_URI: env.PLANTUML_URI || null,
MATHJAX: env.MATHJAX || null,
},
>>>>>>>
layoutType: Config.layoutType(config),
env: {
PLANTUML_URI: env.PLANTUML_URI || null,
MATHJAX: env.MATHJAX || nu... |
<<<<<<<
s3Region: crowi.configManager.getConfig('crowi', 'aws:region'),
s3CustomEndpoint: crowi.configManager.getConfig('crowi', 'aws:customEndpoint'),
s3Bucket: crowi.configManager.getConfig('crowi', 'aws:bucket'),
s3AccessKeyId: crowi.configManager.getConfig('crowi', 'aws:accessKeyId'),
... |
<<<<<<<
const middlewares = require('../util/middlewares')(crowi);
=======
const middlewares = require('../util/middlewares')(crowi, app);
const accessTokenParser = require('../middleware/access-token-parser')(crowi);
const loginRequiredStrictly = require('../middleware/login-required')(crowi);
const loginR... |
<<<<<<<
customtheme: require('./admin/customtheme'),
=======
customtitle: require('./admin/customtitle'),
>>>>>>>
customtheme: require('./admin/customtheme'),
customtitle: require('./admin/customtitle'), |
<<<<<<<
onBuildEnd: [],
onExit: []
=======
onBuildEnd: [],
dev: true,
verbose: false
>>>>>>>
onBuildEnd: [],
onExit: [],
dev: true,
verbose: false
<<<<<<<
if(!options.onExit) {
options.onExit = defaultOptions.onExit;
}
=======
if (!options.dev) {
options.dev = de... |
<<<<<<<
if (word !== undefined) {
return (this.memory[loc + 1].toString(16) + this.memory[loc].toString(16)).toString(16);
}
return this.memory[loc].toString(16);
=======
return this.memory[loc].toString(16).toUpperCase();
>>>>>>>
if (word !== undefined) {
return (this.memory[loc + 1].toString(16) ... |
<<<<<<<
return isObject(blob) ? Ok(blob) : makeErr('Must be an object', blob, []);
=======
return typeof blob === 'object' ? Ok(blob) : Err(annotate(blob, 'Must be an object'));
>>>>>>>
return isObject(blob) ? Ok(blob) : Err(annotate(blob, 'Must be an object')); |
<<<<<<<
* Creates a higher-order component which adds filtering capability to the
* wrapped component. Filters get applied when the original component is about
* to be mounted.
=======
* Creates a higher-order component which adds filtering capability to the wrapped component.
* Filters get applied when the orig... |
<<<<<<<
{ slug: 'rest-api', title: __( 'REST API Blocks' ) },
{ slug: 'embed', title: __( 'Embed' ) },
=======
{ slug: 'widgets', title: __( 'Widgets' ) },
>>>>>>>
{ slug: 'rest-api', title: __( 'REST API Blocks' ) },
{ slug: 'widgets', title: __( 'Widgets' ) },
{ slug: 'embed', title: __( 'Embed' ) }, |
<<<<<<<
if ( this.props.onSetup ) {
this.props.onSetup( editor );
}
=======
editor.on( 'selectionChange', this.onSelectionChange );
>>>>>>>
editor.on( 'selectionChange', this.onSelectionChange );
if ( this.props.onSetup ) {
this.props.onSetup( editor );
} |
<<<<<<<
this.onScroll = throttle( this.onScroll.bind( this ), 250 );
=======
this.isEndOfEditor = this.isEndOfEditor.bind( this );
>>>>>>>
this.onScroll = throttle( this.onScroll.bind( this ), 250 );
this.isEndOfEditor = this.isEndOfEditor.bind( this );
<<<<<<<
onScroll() {
if ( this.toolbarElem ) {
c... |
<<<<<<<
placeholder={ placeholder || __( 'New Paragraph' ) }
/>
</Autocomplete>,
=======
placeholder={ placeholder || __( 'Add text or type / to insert content' ) }
/>
</BlockAutocomplete>,
>>>>>>>
placeholder={ placeholder || __( 'Add text or type / to insert content' ) }
/>
</Auto... |
<<<<<<<
const getOptions = ( search ) => {
let payload;
if ( search ) {
payload = { data: { search } };
}
return ( new wp.api.collections.Users() ).fetch( payload ).then( ( users ) => {
=======
const getOptions = () => {
return wp.apiRequest( { path: '/wp/v2/users' } ).then( ( users ) => {
>>>>>>>
co... |
<<<<<<<
const { ENTER, ESCAPE, UP, DOWN, LEFT, RIGHT, TAB, SPACE } = keycodes;
=======
const { ENTER, ESCAPE, UP, DOWN, LEFT, RIGHT } = keycodes;
>>>>>>>
const { ENTER, ESCAPE, UP, DOWN, LEFT, RIGHT, SPACE } = keycodes;
<<<<<<<
export default withSpokenMessages( withInstanceId( Autocomplete ) );
=======
export de... |
<<<<<<<
export { default as ToolbarMenu } from './toolbar-menu';
=======
export { default as Popover } from './popover';
>>>>>>>
export { default as ToolbarMenu } from './toolbar-menu';
export { default as Popover } from './popover'; |
<<<<<<<
=======
* WordPress dependencies
*/
import { switchChildrenNodeName } from 'element';
import { Toolbar } from 'components';
/**
>>>>>>>
* WordPress dependencies
*/
import { Toolbar } from 'components';
/** |
<<<<<<<
config.oauth_token=access_token;
if(this.client && this.client.downstream){
this.client.downstream.init();
}
=======
setTimeout(()=>{
this.client.downstream.init();
},2000);
>>>>>>>
config.oauth_token=access_token;
setTimeout(()=... |
<<<<<<<
it( 'allows named exports to be added explicitly via config', () => {
return rollup({
entry: 'samples/custom-named-exports/main.js',
plugins: [
npm({ main: true }),
commonjs({
namedExports: {
'samples/custom-named-exports/secret-named-exporter.js': [ 'named' ],
'external': [ '... |
<<<<<<<
import { isEqual } from '../util/minilo'
import { makeWatchers } from '../util/vue-helpers'
=======
import { hasSource } from '../util/assert'
>>>>>>>
import { hasSource } from '../util/assert'
import { isEqual } from '../util/minilo'
import { makeWatchers } from '../util/vue-helpers' |
<<<<<<<
import { isEqual, isFunction, isString, pick, replaceTokens } from '../util/minilo'
import { makeWatchers } from '../util/vue-helpers'
=======
import { hasSource, hasView } from '../util/assert'
import { isFunction, isString, pick, replaceTokens } from '../util/minilo'
>>>>>>>
import { hasSource, hasView } f... |
<<<<<<<
import uuid from 'uuid/v4'
=======
/** @module ol-ext/feature */
>>>>>>>
/** @module ol-ext/feature */
import uuid from 'uuid/v4' |
<<<<<<<
AutomationController.prototype.setProfiles = function () {
var langFile = this.loadMainLang();
if (!this.profiles || this.profiles.length === 0) {
sid = _.uniqueId('sua'+ Math.floor(new Date().getTime() /1000));
this.profiles = [{
id: 1,
sid: sid,
... |
<<<<<<<
this.zway.controller.data.smartStart.dskProvisioningList.value = dskProvisioningList;
=======
var zway = this.zway;
/* TODO
// get controller node
var controllerNode = zway.controller.data.nodeId.value;
// update provisioning list
zway.devices[controllerNode].data.smartStart.dskProvisioningList.value ... |
<<<<<<<
var rand = require('rand-paul');
=======
var request = require('request');
var progress = require('request-progress');
>>>>>>>
var rand = require('rand-paul');
var request = require('request');
var progress = require('request-progress'); |
<<<<<<<
export const EVENTS_MAP = "EVENTS_MAP";
=======
export const TRASH_POINT = "TRASH_POINT";
>>>>>>>
export const TRASH_POINT = "TRASH_POINT";
export const EVENTS_MAP = "EVENTS_MAP";
<<<<<<<
Navigation.registerComponent(EVENTS_MAP, () => EventsMap, store, Provider);
=======
Navigation.registerCompo... |
<<<<<<<
CLEAR_EVENTS_ACTION,
LOAD_EVENTS_FOR_MAP_ACTION,
LOAD_EVENTS_FOR_MAP_SUCCESS,
LOAD_EVENTS_FOR_MAP_ERROR, SHOW_NEW_DELTA
} from "../actions/events";
=======
CLEAR_EVENTS_ACTION,
LOAD_EVENT_SUCCESS,
CLEAN_EVENT,
LOAD_EVENTS_ERROR,
} from '../types/events';
import { LOGOUT } from... |
<<<<<<<
=======
import {
SEARCH_EVENTS_ACTION,
SEARCH_EVENTS_ERROR_ACTION,
SEARCH_EVENTS_SUCCESS_ACTION,
CLEAR_EVENTS_ACTION,
LOAD_EVENT,
LOAD_EVENT_SUCCESS,
LOAD_EVENTS_ERROR,
CLEAN_EVENT,
} from '../types/events';
>>>>>>>
import {
LOAD_EVENT,
LOAD_EVENT_SUCCESS,
LOAD_EVE... |
<<<<<<<
loadMyTrashPointsFlow, createTrashPointFlow,
=======
loadMyTrashPointsFlow,
loadEventFlow,
>>>>>>>
loadMyTrashPointsFlow,
createTrashPointFlow,
loadEventFlow,
<<<<<<<
sagaMiddleware.run(createTrashPointFlow),
=======
sagaMiddleware.run(loadEventFlow),
>>>>>>>
sag... |
<<<<<<<
getMapEventsFlow,
=======
loadMyEventsFlow,
loadMyTrashPointsFlow,
>>>>>>>
getMapEventsFlow,
loadMyEventsFlow,
loadMyTrashPointsFlow,
<<<<<<<
sagaMiddleware.run(getMapEventsFlow),
=======
sagaMiddleware.run(loadMyEventsFlow),
sagaMiddleware.run(loadMyTrashPointsFl... |
<<<<<<<
import styles from './styles';
import strings from '../../assets/strings';
import { GooglePlacesAutocomplete } from 'react-native-google-places-autocomplete';
import { Map } from '../../components';
import { DEFAULT_ZOOM } from '../../shared/constants';
import { MARKER_STATUS_IMAGES } from '../../components/Map... |
<<<<<<<
import {ADD_TRASH_POINTS, ADD_COORDINATOR, ADD_LOCATION, CREATE_EVENT} from "../../index";
=======
import {ADD_COORDINATOR, ADD_LOCATION} from "../../index";
>>>>>>>
import {ADD_TRASH_POINTS, ADD_COORDINATOR, ADD_LOCATION, CREATE_EVENT} from "../../index";
<<<<<<<
<TouchableOpacity onP... |
<<<<<<<
fetchDatasetFlow,
=======
loadEventFlow,
>>>>>>>
fetchDatasetFlow,
loadEventFlow,
<<<<<<<
sagaMiddleware.run(getMapEventsFlow),
sagaMiddleware.run(fetchDatasetFlow),
=======
sagaMiddleware.run(loadEventFlow),
>>>>>>>
sagaMiddleware.run(loadEventFlow),
sagaM... |
<<<<<<<
import * as userSaga from "../reducers/user/saga";
import * as trashPointsSaga from "../reducers/trashpoints/saga";
=======
import reducers from './reducers';
import {
loginGoogleFlow,
loginFacebookFlow,
updateProfileStatusFlow,
loadProfileFlow,
createEventFlow,
} from './sagas';
>>>>>>>... |
<<<<<<<
createEventFlow,
searchTrashPointsFlow,
searchEventsFlow
=======
logoutFlow,
>>>>>>>
logoutFlow,
createEventFlow,
searchTrashPointsFlow,
searchEventsFlow
<<<<<<<
=======
>>>>>>>
<<<<<<<
const sagaMiddleware = createSagaMiddleware();
const store = createStore(
... |
<<<<<<<
import EventsMap from '../EventMap/EventsMap';
=======
>>>>>>>
import EventsMap from '../EventMap/EventsMap';
<<<<<<<
this.loadEvents(0);
// const { onLoadMapEventsAction } = this.props;
// onLoadMapEventsAction()
=======
this.loadEvents(0)
>>>>>>>
this.loa... |
<<<<<<<
export default async function server({ cwd, overlayDir, middleware, http2 = false, compress = true, aliases } = {}) {
try {
await fs.access(posix.resolve(cwd, 'index.html'));
} catch (e) {
throw new Error(`You are missing an "index.html" file in "${cwd}".`);
}
=======
export default async function ser... |
<<<<<<<
switch (sourceType) {
case sourceTypes.JAVASCRIPT:
try{
data = esprima_parse(content, { loc: true, tolerant: true, jsx: true });
}catch(e){
data = '';
}
break;
case sourceTypes.HTML:
data = cheerio_load(content, { xmlMode: true, withSta... |
<<<<<<<
case 'ts':
case 'tsx':
=======
case 'jsx':
case 'htm':
>>>>>>>
case 'jsx':
case 'ts':
case 'tsx':
case 'htm': |
<<<<<<<
import URL from './URLShim.js';
import { PalindromError, PalindromConnectionError } from './palindrom-errors.js';
import { Heartbeat, NoHeartbeat } from './heartbeat.js';
=======
import { PalindromError, PalindromConnectionError } from './palindrom-errors';
import { Heartbeat, NoHeartbeat } from './heartbeat'... |
<<<<<<<
this.useWebSocket = false; //change to TRUE to enable WebSocket connection
=======
var useWebSocket = false;
var that = this;
Object.defineProperty(this, "useWebSocket", {
get: function () {
return useWebSocket;
},
set: function (newValue) {
if(newValue == fa... |
<<<<<<<
=======
name: "ABC News",
logo: "stations/images-europe/albania/ABC News.png",
url: "https://abcradiolivehls-lh.akamaihd.net/i/newsradio_1@327297/master.m3u8"
},
{
name: "Alfa dhe Omega Radio",
logo: "stations/images-europe/albania/Al... |
<<<<<<<
const config = {
devtool: isProduction ? undefined : 'cheap-module-source-map',
entry: APP_DIR + '/index.jsx',
output: {
path: BUILD_DIR,
publicPath: '/',
filename: '[name].js',
chunkFilename: '[name].js'
},
devServer: {
host: 'localhost',
historyApiFallback: true,
port: ... |
<<<<<<<
=======
this.useCompress = false; // 是否使用压缩文件
// 当你即将发布你的塔时，请使用“JS代码压缩工具”将所有js代码进行压缩，然后将这里的useCompress改为true。
// 请注意，只有useCompress是false时才会读取floors目录下的文件，为true时会直接读取libs目录下的floors.min.js文件。
// 如果要进行剧本的修改请务必将其改成false。
this.floorIds = [ // 在这里按顺序放所有的楼层；其顺序直接影响到楼层传送器的顺序和上楼器/下楼器的顺序
"... |
<<<<<<<
music.src = 'project/sounds/'+t;
=======
if (main.bgmRemote) music.src = 'https://gitee.com/ckcz123/h5music/raw/master/'+core.firstData.name+'/'+t;
else music.src = 'sounds/'+t;
>>>>>>>
if (main.bgmRemote) music.src = 'https://gitee.com/ckcz123/h5music/raw/mast... |
<<<<<<<
'autoHeroMove': false,
'automaticRouting': false,
'automaticRouted': false,
'autoStep': 0,
'movedStep': 0,
'destStep': 0,
'automaticRoutingTemp': {'destX': 0, 'destY': 0, 'moveStep': []},
'autoStepRoutes': [],
'holdingPath': 0,
'st... |
<<<<<<<
var namesObj={};
namesObj.allIds = core.getAllIconIds();
namesObj.allIconIds = namesObj.allIds.concat(Object.keys(core.statusBar.icons).filter(function (x) {
=======
var allIds = ["this"].concat(core.getAllIconIds());
var allIconIds = allIds.concat(Object.keys(core.sta... |
<<<<<<<
const sendGridKey = keys.sendGrid;
// For emails
const sgMail = require('@sendgrid/mail'); // eslint-disable-line
sgMail.setApiKey(sendGridKey);
// @route POST api/employees/add
=======
// @route POST api/employees/register
>>>>>>>
const sendGridKey = keys.sendGrid;
// For emails
const sgMail = require... |
<<<<<<<
/**
* function parses a Javascript file and returns an object containing interesting nodes and their details,
* by looping through it with the {@link #parseutils.asyncTasks} array
* @param {string} text - the text of the file to analyze
* @returns {object} - cache object
**/
=======
/*
we pass in the text ... |
<<<<<<<
// describe('Test number one', () => {
// it('is yinyan a chinese' , function () {
// expect(true).to.equal(true);
// })
// it('is yinyan a chinese' , function () {
// cy.server();
// cy.visit('');
// cy.get('.searchbox')
// .type('a')
// .should('have.value', ... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
setChrAndRange: function (chr, start, end, update, force) {
// TODO:
// get proper browser boundaries
// get chromosome length
this.chr = chr;
this.setRange(start, end, update, force);
},
>>>>>>>
<<<<<<<
=======
get... |
<<<<<<<
exports.getRefId = getRefId;
=======
var show = function(filename, callback) {
var gitfs = this;
this.getParentId(function(err, id) {
gitfs.readObject(id.toString(), function(err, commit) {
gitfs.readObject(commit.tree, function(err, tree) {
gitfs.readObject(tree[f... |
<<<<<<<
routes.forEach(function (route) {
makeExpressRoute(router, mountpath, route);
routePath = buildRoutePath(mountpath, route.path);
routesMethod[routePath] = routesMethod[routePath] || [];
routesMethod[routePath].push(route.method.toLowerCase());
});
Object.keys(routesM... |
<<<<<<<
ses.getSendQuota((err, data) => {
if (err) { // Either access keys are wrong here or the request is being placed too quickly
res.status(400).send({ message: 'Please confirm your Amazon SES settings and try again later.' });
} else {
const { Max24HourSend, SentLast24Hour... |
<<<<<<<
app.post('/api/send', apiIsAuth, parseJson, (req, res) => {
sendCampaign(req, res, io, redis);
});
// Stop sending a campaign
app.post('/api/stop', apiIsAuth, parseJson, (req, res) => {
stopCampaignSending(req, res, redis)
=======
app.post('/api/send', apiIsAuth, parseJson, cookieParser, (re... |
<<<<<<<
=======
let userId = '';
const access = campaignPermission(req.cookies.user, req.user.id)
.then(userIdAndCampaigns => {
// userIdAndCampaigns.userId must equal 'Write'
if (userIdAndCampaigns.campaigns === 'Write') {
throw 'Permission denied';
} else {
userId = userI... |
<<<<<<<
// Node 8 supports native async functions - no need to use compiled code!
module.exports =
parseInt(process.versions.node, 10) < 8
? require('../lib/cli')
: require('../src/cli');
=======
#!/usr/bin/env node
require('v8-compile-cache');
const chalk = require('chalk');
const program = require('comma... |
<<<<<<<
options: ParcelOptions
};
=======
cliOpts: CLIOptions
|};
>>>>>>>
options: ParcelOptions
|};
<<<<<<<
return await transformer.generate(input, config, this.options);
=======
return transformer.generate(input, config, this.cliOpts);
>>>>>>>
return transformer.generate(input, c... |
<<<<<<<
FilePath,
ParcelOptions,
=======
CLIOptions,
FilePath,
Namer,
>>>>>>>
FilePath,
Namer,
ParcelOptions,
<<<<<<<
type Opts = {
options: ParcelOptions,
=======
type Opts = {|
cliOpts: CLIOptions,
>>>>>>>
type Opts = {|
options: ParcelOptions,
<<<<<<<
async bundle(graph: AssetGraph) {... |
<<<<<<<
import localRequire from '@parcel/utils/src/localRequire';
=======
import {localResolve} from '@parcel/utils/src/localRequire';
>>>>>>>
import {localResolve} from '@parcel/utils/src/localRequire';
<<<<<<<
let [resolved, pkg] = await localRequire.resolve(pluginName, this.filePath);
=======
let [res... |
<<<<<<<
import type {Bundle, ParcelOptions, Blob, FilePath} from '@parcel/types';
import {report} from './ReporterRunner';
=======
>>>>>>>
import {report} from './ReporterRunner';
<<<<<<<
options: ParcelOptions
};
=======
cliOpts: CLIOptions
|};
>>>>>>>
options: ParcelOptions
|};
<<<<<<<
await writeFi... |
<<<<<<<
const abortError = new Error('Build aborted');
=======
type ParcelOpts = {|
entries: string | Array<string>,
cwd?: string,
cliOpts: CLIOptions,
killWorkers?: boolean,
env?: {[string]: ?string},
config?: ParcelConfig,
defaultConfig?: ParcelConfig
|};
>>>>>>>
<<<<<<<
async init() {
await... |
<<<<<<<
=======
import {PluginLogger} from '@parcel/logger';
import ThrowableDiagnostic, {errorToDiagnostic} from '@parcel/diagnostic';
import path from 'path';
>>>>>>>
<<<<<<<
let result = await resolver.resolve({
filePath,
dependency: dep,
options: this.pluginOptions
});
====... |
<<<<<<<
=======
// Pad a string with spaces on either side
function pad(
text: string,
length: number,
align: 'left' | 'right' = 'left'
): string {
let pad = ' '.repeat(length - stringWidth(text));
if (align === 'right') {
return pad + text;
}
return text + pad;
}
// Count visible characters in a ... |
<<<<<<<
scoresHelper(scores.l, team, body, outData);
=======
buildAndPrintScores(scores.l, team, body);
>>>>>>>
buildAndPrintScores(scores.l, team, body, outData); |
<<<<<<<
const outData = {
json: (standings.json === undefined) ? undefined : standings.json,
csv: (standings.csv === undefined) ? undefined : standings.csv,
dir: (standings.dir === undefined) ? undefined : standings.dir
};
=======
>>>>>>>
const outData = {
json: (standings.json === undefined)... |
<<<<<<<
const fixturesHelper = (league, name, team, body, outData) => {
=======
const buildAndPrintFixtures = (league, name, team, body) => {
>>>>>>>
const buildAndPrintFixtures = (league, name, team, body, outData) => {
<<<<<<<
const scoresHelper = (isLive, team, body, outData) => {
=======
const buildAndPrintSc... |
<<<<<<<
=======
webFrame.setIsolatedWorldHumanReadableName(worldId, cs.extensionName)
webFrame.setIsolatedWorldSecurityOrigin(worldId, `${constants.EXTENSION_PROTOCOL}://${cs.extensionId}`)
const getContentSecurityPolicy = () => ipcRenderer.sendSync('GET_CONTENTSECURITYPOLICY_SYNC');
>>>>>>>
<<<<<<<
const ... |
<<<<<<<
await ECx.load('kbfnbcaeplbcioakkpcpgfkobkghlhen');
=======
// load React for the fun
await ECx.load('fmkadmapgofadopljbjfkapdkoienihi');
>>>>>>>
await ECx.load('kbfnbcaeplbcioakkpcpgfkobkghlhen');
// load React for the fun
await ECx.load('fmkadmapgofadopljbjfkapdkoienihi'); |
<<<<<<<
=======
// TMP Folder
tmpFolder = Settings.tmpLocation,
>>>>>>>
<<<<<<<
win.on('close', function(){
deleteFolder(App.settings.temporaryDirectory);
win.close(true);
});
=======
if(Settings.deleteTmpOnClose) {
win.on('close', function(){
deleteFolder(tmpFolder);
win.clos... |
<<<<<<<
'lt', 'nl', 'no', 'pl', 'pt', 'pt-br', 'ro', 'ru', 'sk', 'sv', 'tr'],
=======
'lt', 'nl', 'no', 'pl', 'pt', 'pt-br', 'ro', 'ru', 'sv', 'tr', 'zh-tw'],
>>>>>>>
'lt', 'nl', 'no', 'pl', 'pt', 'pt-br', 'ro', 'ru', 'sk', 'sv', 'tr', 'zh-tw'], |
<<<<<<<
window.spawnCallback = function (url, subs) {
// Sort sub according lang translation
var subArray = [];
for (lang in subs) {
subArray.push({
'language': Languages[lang],
'sub': subs[lang]
});
}
subArray.sort(function (sub1, sub2) {
return sub1... |
<<<<<<<
var ObjCClass = require('cocoascript-class').default
var EventEmitter = require('events')
var parseWebArguments = require('./parseWebArguments')
var CONSTANTS = require('./constants')
// We create one ObjC class for ourselves here
var NavigationDelegateClass
var WebScriptHandlerClass
// TODO: events
// - 'pag... |
<<<<<<<
this._activeJobs = 0;
this._delayedJobs = new Map();
=======
>>>>>>>
this._delayedJobs = new Map(); |
<<<<<<<
before(Ironium.purgeQueues);
before(function() {
=======
before(() => {
>>>>>>>
before(function() {
<<<<<<<
before(Ironium.purgeQueues);
before(function() {
=======
before(() => {
>>>>>>>
before(function() {
<<<<<<<
before(Ironium.purgeQueues);
before(function(... |
<<<<<<<
function(Obj, Firebug, Xpcom, Console, Css, Win, Arr, Str, BreakpointStore,
ErrorMessageObj, Eventsm, ErrorStackTraceObserver) {
=======
function(Module, Obj, Firebug, FirebugReps, Xpcom, Console, Css, Win, Arr, Str) {
>>>>>>>
function(Module, Obj, Firebug, FirebugReps, Xpcom, Console, Css, Win, Arr, Str... |
<<<<<<<
function(Firebug, Http, Dom) {
=======
function (Firebug, Http, Dom, Css) {
>>>>>>>
function(Firebug, Http, Dom, Css) {
<<<<<<<
init: function(parentNode, config, callback)
=======
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Initialization... |
<<<<<<<
callback();
=======
this.view = elt;
callback();
}
// Create editor;
this.editorObject = doc.defaultView.CodeMirror(
onEditorCreate.bind(this), config);
>>>>>>>
callback();
<<<<<<<
else if (type == SourceEditor.Events.brea... |
<<<<<<<
function getStackDump()
{
var lines = [];
for (var frame = Components.stack; frame; frame = frame.caller)
lines.push(frame.filename + " (" + frame.lineNumber + ")");
return lines.join("\n");
};
// *********************************************************************************************... |
<<<<<<<
Url, SourceLink, SourceFile, StackFrame, StackTrace, Css, Dom, Win, System,
Xpath, Str, Xml, ToggleBranch, ClosureInspector, Menu, CompilationUnit,
ErrorMessageObj, ErrorCopy, NetUtils) {
=======
Url, SourceLink, StackFrame, Css, Dom, Win, System, Xpath, Str, Xml, ToggleBranch,
ClosureInsp... |
<<<<<<<
=======
"firebug/chrome/module",
"firebug/lib/object",
>>>>>>>
<<<<<<<
function(Firebug, FBTrace, Obj, Events, Wrapper, Arr, Css, Dom, Xml, System, Module, Win,
HighlighterCache, QuickInfoBox) {
"use strict";
=======
function(Module, Obj, Firebug, Firefox, FirebugReps, Locale, Events, Wrapper... |
<<<<<<<
/**
* Select a group
*
* @param {string} name - Name of the group to select
*/
const selectGroup = function selectGroup (name) {
if (isOpen()) {
throw new Error('Ups, I\'m open.')
=======
if (callback) {
callback.call(this)
}
lightbox.dispatchEvent(new Event... |
<<<<<<<
=======
"firebug/chrome/activablePanel",
"firebug/js/breakpoint",
>>>>>>>
"firebug/chrome/activablePanel",
<<<<<<<
Arr, System, Menu, NetUtils, NetProgress, CSSInfoTip, ConditionEditor, TimeInfoTip,
PanelNotification) {
=======
Arr, System, Menu, NetUtils, NetProgress, CSSInfoTip, ... |
<<<<<<<
"firebug/debugger/breakpoints/breakpointGroup",
"firebug/html/htmlEditor",
=======
"firebug/editor/baseEditor",
>>>>>>>
"firebug/editor/baseEditor",
<<<<<<<
CSSSelectorEditor, CSSInfoTip, Module, BreakpointGroup, HTMLEditor) {
=======
CSSSelectorEditor, CSSInfoTip, Module, BaseEdit... |
<<<<<<<
pref("extensions.firebug.DBG_CONNECTION", false); // Connection to the remote browser (for remote debugging)
pref("extensions.firebug.DBG_MENU", false); // Menus and context menus in Firebug
pref("extensions.firebug.DBG_BTI", false); // Browser Tools Interface
pref("extensions.fir... |
<<<<<<<
"firebug/debugger/debuggerLib",
"firebug/debugger/breakpoints/breakpointStore",
=======
"firebug/chrome/activablePanel",
>>>>>>>
"firebug/chrome/activablePanel",
"firebug/debugger/debuggerLib",
"firebug/debugger/breakpoints/breakpointStore",
<<<<<<<
Wrapper, Xpcom, ErrorMessageOb... |
<<<<<<<
function(Firebug, FBTrace, Obj, Arr, Wrapper, Dom, Locale, ClosureInspector, FirebugReps) {
=======
function(Firebug, Obj, Arr, Wrapper, Dom, FBTrace, Locale, ClosureInspector, PanelActivation,
FirebugReps, DebuggerLib) {
>>>>>>>
function(Firebug, FBTrace, Obj, Arr, Wrapper, Dom, Locale, ClosureInspector... |
<<<<<<<
Firebug.DOMBasePanel.prototype = Obj.extend(Firebug.Panel,
/** @lends Firebug.DOMBasePanel */
=======
Firebug.DOMBasePanel.prototype = Obj.extend(Panel,
/** lends Firebug.DOMBasePanel */
>>>>>>>
Firebug.DOMBasePanel.prototype = Obj.extend(Panel,
/** @lends Firebug.DOMBasePanel */ |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.