conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
import { TextureUnit, OvrFlags } from "./RenderFlags";
=======
import { TextureUnit } from "./RenderFlags";
import { debugPrint } from "./debugPrint";
>>>>>>>
import { TextureUnit, OvrFlags } from "./RenderFlags";
import { debugPrint } from "./debugPrint"; |
<<<<<<<
import { DisclosedTileTreeSet, LRUTileList, Tile, TileLoadStatus, TileRequest, TileTree, TileTreeOwner, TileUsageMarker } from "./internal";
import { NativeApp } from "../NativeApp";
=======
import { Tile, TileLoadStatus, TileRequest, TileTree, TileTreeOwner, TileTreeSet, TileUsageMarker } from "./internal";
... |
<<<<<<<
import { AccessToken, ChangeSet, IModel as HubIModel } from "@bentley/imodeljs-clients";
=======
import { AccessToken, MultiCode, CodeState } from "@bentley/imodeljs-clients";
import { ChangeSet } from "@bentley/imodeljs-clients";
>>>>>>>
import { AccessToken, ChangeSet, IModel as HubIModel } from "@bentley/... |
<<<<<<<
import { Decorations, RenderTarget, RenderPlan, Pixel, GraphicList } from "./render/System";
import { UpdatePlan } from "./render/UpdatePlan";
=======
import { Decorations, DecorationList, RenderTarget, RenderPlan, Pixel } from "./render/System";
>>>>>>>
import { Decorations, RenderTarget, RenderPlan, Pixel,... |
<<<<<<<
channelCache: Record<string, ChannelState | undefined> = {};
=======
channelCache: Record<string, ChannelState> = {};
budgetCache?: SiteBudget;
>>>>>>>
channelCache: Record<string, ChannelState | undefined> = {};
budgetCache?: SiteBudget; |
<<<<<<<
public async createPrimitiveProperty(name: string, primitiveType: PrimitiveType, label?: string, description?: string, isReadOnly?: boolean, priority?: number, extendedTypeName?: string, minLength?: number, maxLength?: number, minValue?: number, maxValue?: number): Promise<PrimitiveProperty>;
public async c... |
<<<<<<<
import { IndexedPrimitiveParamsFeatures, PolylineParamVertex, PolylineParam } from "../../frontend/render/webgl/Graphic";
import { Graphic, GraphicList } from "../../frontend/render/Graphic";
import { FeatureIndexType, FeatureIndex } from "../../frontend/render/webgl/FeatureIndex";
import { IModelConnection } f... |
<<<<<<<
protected _precision: number;
protected _presentationUnits: FormatUnitSpec[];
protected _persistenceUnit: FormatUnitSpec;
get precision() { return this._precision; }
get presentationUnits() { return this._presentationUnits; }
get persistenceUnit() { return this._persistenceUnit; }
=======
pub... |
<<<<<<<
import { CodeSpec, CodeSpecNames } from "../../common/Code";
import { ViewDefinitionProps } from "../../common/ViewProps";
import { DrawingViewState, OrthographicViewState, ViewState } from "../../frontend/ViewState";
import { IModelConnection, IModelConnectionElements, IModelConnectionModels } from "../../fron... |
<<<<<<<
import { ToolRegistry } from "./tools/Tool";
import { I18N, I18NNamespace, I18NOptions } from "./Localization";
=======
import { ToolRegistry, ToolGroup } from "./tools/Tool";
import { FeatureGates } from "../common/FeatureGates";
import * as selectTool from "./tools/SelectTool";
import * as viewTool from ".... |
<<<<<<<
const briefcases = await BriefcaseManager.hubClient!.getBriefcases(accessToken, iModelId);
briefcases.forEach((briefcase: HubBriefcase) => {
=======
const briefcases = await BriefcaseManager.hubClient.getBriefcases(accessToken, iModelId);
briefcases.forEach((briefcase: Briefcase) => {
>>>>>>>... |
<<<<<<<
const projectId = url.split("/").find((val: string) => val.includes("--"))!.split("--")[1];
const tilesId = url.split("/").find((val: string) => /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(val));
const json = await realityDataServiceClient.getRootDocumentJ... |
<<<<<<<
=======
import { AxisAlignedBox3d } from "../common/geometry/Primitives";
import { IModelDbLinkTableRelationships, LinkTableRelationship } from "./LinkTableRelationship";
>>>>>>>
import { IModelDbLinkTableRelationships, LinkTableRelationship } from "./LinkTableRelationship"; |
<<<<<<<
if (SCHEMAURL3_2 !== jsonObj.$schema) {
throw new ECObjectsError(ECObjectsStatus.MissingSchemaUrl, "Schema namespace '$(jsonObj.$schema)' is not supported.");
}
=======
if (Schema.ec32 && SCHEMAURL3_2 !== jsonObj.$schema)
throw new ECObjectsError(ECObjectsStatus.MissingSchemaUrl);
... |
<<<<<<<
try {
const json = await this._iModel.getDgnDb().getElement(JSON.stringify(opts));
const stream: IElement = JSON.parse(json) as IElement;
stream._iModel = this._iModel;
let el = EcRegistry.create(stream) as Element | undefined;
if (el === undefined) {
await EcRegistry.g... |
<<<<<<<
import { IModelTestUtils } from "./IModelTestUtils";
import { MockAssetUtil } from "./MockAssetUtil";
=======
import { IModelTestUtils, TestUsers } from "./IModelTestUtils";
>>>>>>>
import { IModelTestUtils, TestUsers } from "./IModelTestUtils";
import { MockAssetUtil } from "./MockAssetUtil";
<<<<<<<
class... |
<<<<<<<
public displayLogoImage(context: SceneContext) {
const logoImage: HTMLImageElement | undefined = this._provider!.getCopyrightImage();
=======
private displayLogoImage(context: SceneContext) {
const logoImage: HTMLImageElement | undefined = this.provider!.getCopyrightImage();
>>>>>>>
private dis... |
<<<<<<<
import { IModelConnection, IModelApp, Viewport } from "@bentley/imodeljs-frontend";
import { Target, UpdatePlan, PerformanceMetrics/*, System*/ } from "@bentley/imodeljs-frontend/lib/rendering";
import { IModelApi } from "./IModelApi";
import { ProjectApi } from "./ProjectApi";
// import { CONSTANTS } from "../... |
<<<<<<<
const testIModelName: string = "assets/datasets/Properties_60InstancesWithUrl2.ibim";
=======
initialize();
const testIModelName: string = "assets/datasets/1K.bim";
>>>>>>>
initialize();
const testIModelName: string = "assets/datasets/Properties_60InstancesWithUrl2.ibim"; |
<<<<<<<
import { AccessToken, Briefcase as HubBriefcase, IModelHubClient, ChangeSet, IModel as HubIModel, ContainsSchemaChanges, SeedFile, SeedFileInitState, IModelHubResponseError, IModelHubResponseErrorId } from "@bentley/imodeljs-clients";
=======
import {
AccessToken, Briefcase as HubBriefcase, IModelHubClient,... |
<<<<<<<
return IModelDb.create(briefcaseEntry, contextId);
=======
return await IModelDb.create(briefcaseInfo, contextId);
>>>>>>>
return IModelDb.create(briefcaseEntry, contextId);
<<<<<<<
/** See Model.buildResourcesRequest */
public buildResourcesRequestForModel(req: BriefcaseManager.ResourcesReq... |
<<<<<<<
=======
@MultiTierExecutionHost("@bentley/imodeljs-core/IModel")
class DgnDbNativeCode {
private static dbs = new Map<string, any>(); // services tier only
/**
* Open the Db.
* @param fileName The name of the db file.
* @param mode The open mode
* @returns Promise that resolves to an... |
<<<<<<<
directives: [ CORE_DIRECTIVES, ROUTER_DIRECTIVES, BUTTON_COMPONENTS, Material, SubscribeButton, Comments ]
=======
directives: [ CORE_DIRECTIVES, ROUTER_DIRECTIVES, Material, SubscribeButton, Comments, MindsBanner ]
>>>>>>>
directives: [ CORE_DIRECTIVES, ROUTER_DIRECTIVES, BUTTON_COMPONENTS, Material, ... |
<<<<<<<
RelatedChart,
CategoryWithEntries,
PageType,
EntryNode,
FullPost,
} from "../clientUtils/owidTypes"
let knexInstance: Knex
=======
CountryProfileSpec,
countryProfileSpecs,
} from "site/server/countryProfileProjects"
import { getContentGraph, GraphType } from "site/server/contentGr... |
<<<<<<<
=======
logIndicatorExplorerViewError(error: any, info: any) {
this.logToAmplitude(EventNames.indicatorExplorerViewError, {
error,
info,
})
this.logToGA(
Categories.GrapherError,
EventNames.indicatorExplorerViewError
)
}
... |
<<<<<<<
=======
var testResult : ifm.TestRunResult = <ifm.TestRunResult> {
state: "Completed",
computerName: hostName,
resolutionState: null,
testCasePriority: 1,
failureType: null,
... |
<<<<<<<
constructor(projectUrl: string, handler: ifm.IRequestHandler) {
this.projectUrl = projectUrl;
this.httpClient = new httpm.HttpClient('vso-build-api', handler);
this.restClient = new restm.RestClient(projectUrl, '2.0-preview', this.httpClient);
=======
constructor(collectionUrl:... |
<<<<<<<
import {MemoryChannelStoreEntry} from './memory-channel-storage';
export interface SiteBudget {
site: string;
hubAddress: string;
forAsset: Record<string, AssetBudget>;
}
export interface BudgetItem {
playerAmount: BigNumber;
hubAmount: BigNumber;
}
export interface AssetBudget {
assetHolderAddress... |
<<<<<<<
import cm = require('../common');
=======
import ctxm = require('../context');
import cm = require('../common');
>>>>>>>
import cm = require('../common');
<<<<<<<
export function getProvider(ctx: cm.IExecutionContext, targetPath: string): scmm.IScmProvider {
=======
export function getProvider(ctx: ctxm.J... |
<<<<<<<
import { BlendShapePresetName, LookAtTypeName } from '../types';
import { CurveMapper } from './CurveMapper';
=======
import { VRMSchema } from '../types';
import { CurveMapper, DEG2RAD } from './CurveMapper';
>>>>>>>
import { VRMSchema } from '../types';
import { CurveMapper } from './CurveMapper';
<<<<<<<... |
<<<<<<<
vrmExt.firstPerson && blendShapeMaster && humanoid
? this.loadLookAt(vrmExt.firstPerson, blendShapeMaster, humanoid)
: undefined;
=======
blendShapeProxy && humanoid
? await this._lookAtImporter.import(vrmExt.firstPerson, blendShapeProxy, humanoid)
: undefined;
... |
<<<<<<<
import { RawVrmMeta } from './types';
=======
import { RawVector3, RawVector4, RawVrmMeta, VRMPose } from './types';
>>>>>>>
import { RawVrmMeta } from './types';
<<<<<<<
public readonly humanoid?: VRMHumanoid;
=======
/**
* Contains [[VRMHumanBones]] of the VRM.
* You can move or rotate these ... |
<<<<<<<
import { VRMHumanBones } from '../humanoid';
import { GLTFMesh, GLTFNode, VRMSchema } from '../types';
=======
import { VRMHumanoid } from '../humanoid';
import { GLTFMesh, GLTFNode, HumanBone, RawVrmFirstPerson } from '../types';
>>>>>>>
import { VRMHumanoid } from '../humanoid';
import { GLTFMesh, GLTFNode... |
<<<<<<<
import { GLTF, GLTFNode, RawVector3, RawVector4, RawVrmMeta, VRMPose } from './types';
=======
import { RawVrmMeta, VRMPose } from './types';
>>>>>>>
import { RawVector3, RawVector4, RawVrmMeta, VRMPose } from './types';
<<<<<<<
/**
* Create a [[VRM]] from a parsed result of GLTF taken from GLTFLoader.... |
<<<<<<<
import { LookAtTypeName } from '../types';
=======
import { VRMSchema } from '../types';
>>>>>>>
import { VRMSchema } from '../types';
<<<<<<<
public abstract readonly type: LookAtTypeName;
=======
public lookAtHorizontalOuter: VRMSchema.FirstPersonDegreeMap;
public lookAtVerticalDown: VRMSchema.Fir... |
<<<<<<<
import { GLTFMesh, GLTFPrimitive, RawVrm, RawVrmMaterial } from '../types';
import { MToonMaterial, MToonMaterialOutlineWidthMode, MToonMaterialRenderMode } from './MToonMaterial';
import { VRMUnlitMaterial, VRMUnlitMaterialRenderType } from './VRMUnlitMaterial';
=======
import { GLTFMesh, GLTFPrimitive, VRMS... |
<<<<<<<
lookAtImporter?: VRMLookAtImporter;
=======
firstPersonImporter?: VRMFirstPersonImporter;
>>>>>>>
lookAtImporter?: VRMLookAtImporter;
firstPersonImporter?: VRMFirstPersonImporter;
<<<<<<<
protected readonly _lookAtImporter: VRMLookAtImporter;
=======
protected readonly _firstPersonImporter: VR... |
<<<<<<<
import { VRMFirstPerson } from '../firstperson';
import { VRMHumanBones } from '../humanoid';
=======
import { VRMHumanoid } from '../humanoid';
>>>>>>>
import { VRMFirstPerson } from '../firstperson';
import { VRMHumanoid } from '../humanoid';
<<<<<<<
schemaFirstPerson: Raw.RawVrmFirstPerson,
first... |
<<<<<<<
import { VRMBlendShapeImporter, VRMBlendShapeMaster } from './blendshape';
import { VRMFirstPersonImporter } from './firstperson';
import { VRMHumanBones } from './humanoid';
=======
import { BlendShapeController, BlendShapeMaster, VRMBlendShapeProxy } from './blendshape';
import { VRMFirstPersonImporter } fr... |
<<<<<<<
import { VRMHumanBones } from '../humanoid';
import { GLTFNode } from '../types';
import { LookAtTypeName } from '../types';
import { CurveMapper } from './CurveMapper';
=======
import { VRMHumanoid } from '../humanoid';
import { GLTFNode, VRMSchema } from '../types';
import { CurveMapper, DEG2RAD } from './C... |
<<<<<<<
import { VRMBlendShapeMaster } from './blendshape';
import { VRMBlendShapeImporter } from './blendshape/VRMBlendShapeImporter';
import { RendererFirstPersonFlags, VRMFirstPerson } from './firstperson';
=======
import { BlendShapeController, BlendShapeMaster, VRMBlendShapeProxy } from './blendshape';
import { ... |
<<<<<<<
firstPerson && blendShapeProxy && humanBones
? await this._lookAtImporter.import(vrmExt.firstPerson, firstPerson, blendShapeProxy, humanBones)
=======
blendShapeProxy && humanoid
? await this._lookAtImporter.import(vrmExt.firstPerson, blendShapeProxy, humanoid)
>>>>>>>
first... |
<<<<<<<
import * as THREE from 'three'
import * as GLTFJSON from './GLTF'
import * as VRMExtension from './VRM'
/**
* It represents a parsed result of GLTF taken from GLTFLoader.
* Please note that this is not a complete type definition of that. (We are too lazy to do this...)
*
* See: https://threejs.org/docs/#ex... |
<<<<<<<
/**
* Readonly boolean that indicates this is a MToon material.
*/
public isVRMMToon: boolean = true;
=======
public readonly isVRMMToon: boolean = true;
>>>>>>>
/**
* Readonly boolean that indicates this is a MToon material.
*/
public readonly isVRMMToon: boolean = true; |
<<<<<<<
import { VRMHumanBones } from '../humanoid';
import { GLTFNode, VRMSchema } from '../types';
=======
import { VRMHumanoid } from '../humanoid';
import { GLTFNode, HumanBone } from '../types';
import { LookAtTypeName, RawVrmFirstPersonDegreemap } from '../types';
>>>>>>>
import { VRMHumanoid } from '../humano... |
<<<<<<<
import { VRMFirstPerson } from '../firstperson';
import { VRMHumanBones } from '../humanoid';
import * as Raw from '../types/VRM';
import { CurveMapper } from './CurveMapper';
=======
import { VRMHumanoid } from '../humanoid';
import { VRMSchema } from '../types';
>>>>>>>
import { VRMFirstPerson } from '../f... |
<<<<<<<
vrmExt.firstPerson && firstPerson && blendShapeProxy && humanoid
? await this._lookAtImporter.import(vrmExt.firstPerson, firstPerson, blendShapeProxy, humanoid)
=======
blendShapeProxy && humanoid
? (await this._lookAtImporter.import(gltf, blendShapeProxy, humanoid)) || undefined
... |
<<<<<<<
import { DataType, findModule, getProcesses, ModuleObject, openProcess, ProcessObject, readBuffer, readMemory as readMemoryRaw, findPattern as findPatternRaw } from 'memoryjs';
=======
import {
DataType,
findModule,
getProcesses,
ModuleObject,
openProcess,
ProcessObject,
readBuffer,
readMemory as read... |
<<<<<<<
haunting: boolean;
=======
meetingOverlay: boolean;
overlayPosition: 'left' | 'right' | 'hidden';
localLobbySettings: ILobbySettings;
}
export interface ILobbySettings {
maxDistance: number;
>>>>>>>
meetingOverlay: boolean;
overlayPosition: 'left' | 'right' | 'hidden';
localLobbySettings: ILobbySett... |
<<<<<<<
import axios, { AxiosError } from 'axios';
import { createCheckers } from 'ts-interface-checker';
import TI from './hook-ti';
import { existsSync, readFileSync } from 'fs';
import { IOffsets } from './IOffsets';
import { IpcHandlerMessages, IpcRendererMessages, IpcSyncMessages } from '../common/ipc-messages';
... |
<<<<<<<
* @name tabindex
* @desc pass through the specified tabindex to the input
* @type {string}
*/
@Input() public tabindex: string = undefined;
/**
=======
* @name disabled
* @type {boolean}
*/
@Input() public disabled = undefined;
/**
>>>>>>>
* @name tab... |
<<<<<<<
{destination: convertAddressToBytes32(destinationA), amount: "12"},
{destination: convertAddressToBytes32(destinationB), amount: "12"}
=======
{destination: destinationA, amount: "0x12"},
{destination: destinationB, amount: "0x12"}
>>>>>>>
... |
<<<<<<<
import { IRange } from "./interfaces/IValidation";
=======
import {
IRange,
IValidationError,
IValidationResponse
} from "./interfaces/IValidation";
import { IValidationAPIAdapter } from "./interfaces/IValidationAPIAdapter";
>>>>>>>
import { IRange } from "./interfaces/IValidation";
<<<<<<<
import { c... |
<<<<<<<
=======
const body = new URLSearchParams();
const validation = {
id,
validationInputs: inputs
};
this.addRunningValidation(validation);
>>>>>>>
<<<<<<<
const outputs = await this.adapter(input);
this.handleCompleteValidation(id, outputs... |
<<<<<<<
import { createValidationInput } from "./helpers/fixtures";
=======
import { validateDirtyRangesCommand } from "../commands";
import { createInitialState } from "../state";
import { Node } from "prosemirror-model";
import { Mapping } from "prosemirror-transform";
import { doesNotReject } from "assert";
>>>>>... |
<<<<<<<
export default async function(ledger: AssetLedger, state: AssetLedgerTransferState) {
const abi = xcertAbi.find((a) => (
a.name === 'setPause' && a.type === 'function'
));
return ledger.provider.send({
method: 'eth_sendTransaction',
params: [
{
from: ledger.provider.accountId,
... |
<<<<<<<
import { failure, pretty, Store, success } from '../..';
import { MachineFactory, getDataAndInvoke } from '../../machine-utils';
=======
import { Store, failure, pretty, success } from '../..';
import { MachineFactory } from '../../machine-utils';
>>>>>>>
import { failure, Store, success } from '../..';
impo... |
<<<<<<<
/**
* Gas price multiplier. Defaults to 1.1.
*/
gasPriceMultiplier?: number;
=======
/**
* Sandbox mode. False by default.
*/
sandbox?: Boolean;
>>>>>>>
/**
* Gas price multiplier. Defaults to 1.1.
*/
gasPriceMultiplier?: number;
/**
* Sandbox mode. False by default.
... |
<<<<<<<
data: encodeFunctionCall(abi, [receiverId, id, proof]),
=======
data: encodeFunctionCall(abi, [receiverId, id, imprint]),
gas: 6000000,
>>>>>>>
data: encodeFunctionCall(abi, [receiverId, id, imprint]), |
<<<<<<<
export default async function(ledger: AssetLedger, accountId: string, assetId: string, proof: string) {
const abi = xcertAbi.find((a) => (
a.name === 'mint' && a.type === 'function'
));
return ledger.provider.send({
method: 'eth_sendTransaction',
params: [
{
from: ledger.provid... |
<<<<<<<
playerA.channelWallet.workflows[0].machine.onTransition(state => {
if (state.value === 'confirmingWithUser') {
state.children.invokeCreateChannelConfirmation.send({type: 'USER_APPROVES'});
}
});
=======
playerA.channelWallet.workflows[0].service.send({type: 'USER_APPROVES'});
>>>>>>>
p... |
<<<<<<<
splittedLink?: boolean;
=======
srcImage?: string;
>>>>>>>
splittedLink?: boolean;
srcImage?: string; |
<<<<<<<
import * as rxjs from 'rxjs';
import { State } from '@statechannels/nitro-protocol';
import { getStateSignerAddress, signState } from '@statechannels/nitro-protocol/lib/src/signatures';
=======
import { State, getStateSignerAddress, signState } from '@statechannels/nitro-protocol';
>>>>>>>
import * as rxjs f... |
<<<<<<<
=======
private joinLinesInElements(elements: Element[]): Element[] {
const withLines: Element[] = [];
this.getElementsWithLines(elements, withLines);
withLines.forEach(element => {
const lines = this.getLinesInElement(element);
const interLinesSpaces = this.getInterLinesSpace(lines);
const jo... |
<<<<<<<
public startSpan(name?: string, type?: string, parentSpanId?: string) {
=======
public startSpan(name: string, type: string) {
if (!this.started) {
debug('calling %s.startSpan() on un-started %s %o',
this._className, this._className,
{ id: this.id, n... |
<<<<<<<
import { bip32, ECPair, networks as NETWORKS, payments, Psbt } from '..';
=======
import {
bip32,
ECPair,
networks as NETWORKS,
Psbt,
Signer,
SignerAsync,
} from '..';
>>>>>>>
import {
bip32,
ECPair,
networks as NETWORKS,
payments,
Psbt,
Signer,
SignerAsync,
} from '..'; |
<<<<<<<
let web3: IEtheriumProvider = new Web3(new Web3.providers.HttpProvider(config.web3.provider))
=======
console.log('reset web3')
let web3 = new Web3(
new Web3.providers.HttpProvider(
(config.binance)
? config.web3.binance_provider
: config.web3.provider
)
)
>>>>>>>
console.log('reset web3'... |
<<<<<<<
{
title: 'Scroll Bar',
route: '/interface/scrollBar',
},
=======
{
title: 'Toggle Buttons',
route: '/interface/toggleButtons',
},
>>>>>>>
{
title: 'Scroll Bar',
route: '/interface/scrollBar',
},
{
title: 'Toggle... |
<<<<<<<
export const FacebookIconColor: string = '#3b5998';
// other colors
export const Orange: string = '#ffa500';
=======
export const FacebookIconColor: string = ' #3b5998';
// Box shadow
export const boxShadowColor: string = 'rgba(0, 0, 0, 0.05)';
>>>>>>>
export const FacebookIconColor: string = '#3b5998';
... |
<<<<<<<
CreateIcon = 'CreateIcon',
ClearIcon = 'ClearIcon',
LocationOnIcon = 'LocationOnIcon',
=======
QuestionAnswerIcon = 'QuestionAnswerIcon',
>>>>>>>
CreateIcon = 'CreateIcon',
ClearIcon = 'ClearIcon',
LocationOnIcon = 'LocationOnIcon',
QuestionAnswerIcon = 'QuestionAnswerIcon', |
<<<<<<<
export const getThumbnails = (url):string => {
if (!url) {
return '';
}
let video = youtubeId(url)
return 'http://img.youtube.com/vi/' + video + '/0.jpg';
};
=======
>>>>>>> |
<<<<<<<
import {AuthGuard} from "../auth-guard";
import {TranslatorService} from "../../providers/translator.service";
import {MixpanelService} from '../../providers/analytics/mixpanel.service';
=======
import {Analytics} from '../../providers/analytics';
>>>>>>>
import {MixpanelService} from '../../providers/analyt... |
<<<<<<<
import {MixpanelService} from "../../providers/analytics/mixpanel.service";
=======
import {Analytics} from "../../providers/analytics";
import { Patient } from "../../dto/patient";
>>>>>>>
import {MixpanelService} from "../../providers/analytics/mixpanel.service";
import {Patient} from "../../dto/patient";
... |
<<<<<<<
public change: Function
public highlight: any
=======
public i18next: any
>>>>>>>
public i18next: any
public highlight: any |
<<<<<<<
import Undo from './undo/index'
import Redo from './redo/index'
=======
import Table from './table/index'
>>>>>>>
import Undo from './undo/index'
import Redo from './redo/index'
import Table from './table/index'
<<<<<<<
undo: Undo,
redo: Redo,
=======
table: Table,
>>>>>>>
undo: Undo,
... |
<<<<<<<
import Undo from './undo-redo'
=======
import initFullScreen, { setUnFullScreen, setFullScreen } from './init-fns/set-full-screen'
>>>>>>>
import initFullScreen, { setUnFullScreen, setFullScreen } from './init-fns/set-full-screen'
import Undo from './undo-redo' |
<<<<<<<
import pasteConfig from './paste'
=======
import cmdConfig from './cmd'
>>>>>>>
import pasteConfig from './paste'
import cmdConfig from './cmd'
<<<<<<<
pasteFilterStyle: boolean
pasteIgnoreImg: boolean
pasteTextHandle: Function
=======
styleWithCSS: boolean
>>>>>>>
pasteFilterStyle: b... |
<<<<<<<
import List from './list/index'
=======
import LineHeight from './lineHeight/index'
>>>>>>>
import List from './list/index'
import LineHeight from './lineHeight/index'
<<<<<<<
list: List,
=======
lineHeight: LineHeight,
>>>>>>>
list: List,
lineHeight: LineHeight, |
<<<<<<<
'image',
=======
'video',
>>>>>>>
'image',
'video', |
<<<<<<<
import constConfig from './const'
=======
import langConfig from './lang'
>>>>>>>
import constConfig from './const'
import langConfig from './lang'
<<<<<<<
imageConfig,
constConfig
=======
imageConfig,
langConfig
>>>>>>>
imageConfig,
constConfig,
langConfig |
<<<<<<<
import BackColor from './back-color/index'
import FontColor from './font-color/index'
import Image from './img/index'
=======
import backColor from './back-color/index'
import fontColor from './font-color/index'
import Video from './video/index'
>>>>>>>
import BackColor from './back-color/index'
import FontC... |
<<<<<<<
import Strikethrough from './strikethrough/index'
=======
import Underline from './underline/index'
>>>>>>>
import Underline from './underline/index'
import Strikethrough from './strikethrough/index'
<<<<<<<
strikethrough: Strikethrough,
=======
underline: Underline,
>>>>>>>
underline: Underl... |
<<<<<<<
=======
/*****************************
**********COMMENT************
*****************************/
>>>>>>>
<<<<<<<
})()
function fiberWalk(entry) {
let output = [], globalID = 0;
function recurse(root, level, id) {
=======
})();
function fiberWalk(entry: any) {
... |
<<<<<<<
private async _update() {
const rawData = await this._runPuppeteer();
this._panel.webview.html = this._getHtmlForWebview(rawData);
=======
private async _update() {
const rawReact = await this._runPuppeteer();
this._panel.webview.html = this._getHtmlForWebview(rawReact);
>>>>>>>
private async ... |
<<<<<<<
import TreeNode from './TreeNode';
=======
>>>>>>>
import TreeNode from './TreeNode'; |
<<<<<<<
import {concat, of, Observable} from 'rxjs';
=======
import _ from 'lodash';
>>>>>>>
import {concat, of, Observable} from 'rxjs';
import _ from 'lodash'; |
<<<<<<<
=======
protected get TextureGroupName() {
return "TextureCube";
}
>>>>>>> |
<<<<<<<
=======
import {
Channel,
ensureExists,
MachineFactory,
Store,
success,
getEthAllocation,
FINAL,
} from '../..';
import { Outcome, Allocation } from '@statechannels/nitro-protocol';
>>>>>>>
import {
Channel,
ensureExists,
MachineFactory,
Store,
success,
getEthAllocation,
FINAL,
} ... |
<<<<<<<
import JThreeContext = require("../NJThreeContext");
import NodeManager = require('./NodeManager');
import ContextComponents = require('../ContextComponents');
=======
import JThreeContextProxy = require("../../Core/JThreeContextProxy");
import JThreeContext = require("../../NJThreeContext");
import NodeManag... |
<<<<<<<
import J3Object from "../J3Object";
import J3ObjectBase from "../J3ObjectBase";
import InterfaceSelector from "../Static/InterfaceSelector";
import GomlTreeNodeBase from "../../Goml/GomlTreeNodeBase";
import isString from "lodash.isstring";
=======
import J3Object = require("../J3Object");
import J3ObjectBase... |
<<<<<<<
public sharedObject: NamespacedDictionary<any>;
=======
public sharedObject: { [key: string]: any } = {};
public componentsElement: Element;
>>>>>>>
public sharedObject: NamespacedDictionary<any>;
public componentsElement: Element;
<<<<<<<
constructor(recipe: NodeDeclaration, element: Element, c... |
<<<<<<<
this.glExtensionRegistory.checkExtensions(glContext);
let materialManager = JThreeContext.getContextComponent<MaterialManager>(ContextComponents.MaterialManager);
if (materialManager.conditionRegistered) {
let extensionList: string[] = [];
for (let extName in GLExtensionRegistory.require... |
<<<<<<<
import GeometryBuilder = require("./Base/GeometryBuilder");
import BasicGeometry = require("./Base/BasicGeometry");
import Geometry = require("./Base/Geometry");
=======
import GeometryBuilder = require("./GeometryBuilder");
import BasicGeometry = require("./BasicGeometry");
>>>>>>>
import GeometryBuilder = ... |
<<<<<<<
MockAxios.all([]);
=======
MockAxios.all();
MockAxios.head();
MockAxios.options();
>>>>>>>
MockAxios.all([]);
MockAxios.head();
MockAxios.options(); |
<<<<<<<
import { MachineFactory, FINAL, statesEqual, outcomesEqual } from '../..';
import { IStore } from '../../store';
=======
import { MachineFactory, statesEqual } from '../..';
import { IStore, observeChannel } from '../../store';
>>>>>>>
import { MachineFactory, FINAL, statesEqual, outcomesEqual } from '../..'... |
<<<<<<<
join(Config.APP_CLIENT_SRC, '**/*.ts'),
join(Config.APP_CLIENT_SRC, '**/*.html'),
join(Config.APP_CLIENT_SRC, '**/*.css'),
join(Config.APP_CLIENT_SRC, '**/*.json'),
join(Config.APP_CLIENT_SRC, '*.json'),
'!' + join(Config.APP_CLIENT_SRC, '**/*.spec.ts'),
'!' + join(Conf... |
<<<<<<<
'typings/main.d.ts',
join(APP_SRC, '**/*.ts'),
'!' + join(APP_SRC, '**/*.e2e.ts'),
'!' + join(APP_SRC, 'main.ts')
];
=======
join(APP_SRC, '**/*.ts'),
'!' + join(APP_SRC, `${BOOTSTRAP_MODULE}.ts`)
];
>>>>>>>
'typings/main.d.ts',
... |
<<<<<<<
base: Config.TMP_CLIENT_DIR,
=======
base: Config.TMP_DIR,
target: 'es5',
>>>>>>>
base: Config.TMP_CLIENT_DIR,
target: 'es5', |
<<<<<<<
export = () => {
let tsProject: any;
let typings = gulp.src([
Config.TOOLS_DIR + '/manual_typings/**/*.d.ts'
]);
let src = [
join(Config.APP_CLIENT_SRC, '**/*.ts'),
'!' + join(Config.APP_CLIENT_SRC, '**/*.spec.ts'),
'!' + join(Config.APP_CLIENT_SRC, '**/*.e2e-spec.ts'),
'!' + join(Co... |
<<<<<<<
=======
import { enableProdMode } from '@angular/core';
// The browser platform with a compiler
>>>>>>>
import { enableProdMode } from '@angular/core';
// The browser platform with a compiler |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.