conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
const restoreOptions = { acceptTextOnly: true, encoding: 'utf-8' };
resolveBackupPromise = this.textFileService.resolveTextContent(restoreResource, restoreOptions).then(backup => {
// The first line of a backup text file is the file name
return backup.value.lines.slice(1).join('\n');
... |
<<<<<<<
import { isFalsyOrEmpty } from 'vs/base/common/arrays';
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
import { CommandsRegistry, ICommandHandlerDescription } from 'vs/platform/commands/com... |
<<<<<<<
import {isEmptyElement} from 'vs/languages/html/common/htmlEmptyTagsShared';
=======
import nls = require('vs/nls');
var emptyElements:string[] = ['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr'];
export function isEmptyElem... |
<<<<<<<
return this.backupFileService.hasBackup(this.resource).then(backupExists => {
let resolveBackupPromise: TPromise<string | IRawText>;
=======
return this.backupFileService.loadBackupResource(this.resource).then(backupResource => {
let resolveBackupPromise: TPromise<IRawText>;
>>>>>>>
ret... |
<<<<<<<
let createTestKeybindingService: (items: ResolvedKeybindingItem[], contextValue?: any) => TestKeybindingService = null;
let currentContextValue: any = null;
=======
let createTestKeybindingService: (items: NormalizedKeybindingItem[], contextValue?: any) => TestKeybindingService = null;
let currentContextV... |
<<<<<<<
private onConfigurationUpdated(config: IConfiguration): void {
let newMenuBarVisibility = config && config.window && config.window.menuBarVisibility;
if (newMenuBarVisibility !== this.currentMenuBarVisibility) {
this.currentMenuBarVisibility = newMenuBarVisibility;
this.setMenuBarVisibility(newMenu... |
<<<<<<<
'var ignoredCtrlCmdKeys = [67 /* c */];',
'var ignoredShiftKeys = [9 /* tab */];',
=======
'var ignoredCtrlCmdKeys = [65 /* a */, 67 /* c */];',
>>>>>>>
'var ignoredCtrlCmdKeys = [65 /* a */, 67 /* c */];',
'var ignoredShiftKeys = [9 /* tab */];', |
<<<<<<<
super(lifecycleService, contextService, configurationService, telemetryService, editorGroupService, editorService, fileService, untitledEditorService, instantiationService, backupService);
=======
super(lifecycleService, contextService, configurationService, telemetryService, editorGroupService, fileServi... |
<<<<<<<
import {EventType} from 'vs/editor/common/editorCommon';
=======
import {EventType, IModeSupportChangedEvent, IConfigurationChangedEvent} from 'vs/editor/common/editorCommon';
import {SuggestRegistry} from 'vs/editor/common/modes';
>>>>>>>
import {EventType, IConfigurationChangedEvent} from 'vs/editor/common... |
<<<<<<<
// SCM Service
serviceCollection.set(ISCMService, this.instantiationService.createInstance(SCMService));
// Backup Model Service
serviceCollection.set(IBackupModelService, this.instantiationService.createInstance(BackupModelService));
=======
>>>>>>>
// SCM Service
serviceCollection.set(ISCMSer... |
<<<<<<<
public userRoles(user: User): string[] | null {
return [user.role] || null;
=======
public userRoles(user: NetlifyIdentityWidget.User): string[] | null {
return user.app_metadata.roles;
>>>>>>>
public userRoles(user: User): string[] | null {
return user.app_metadata.roles; |
<<<<<<<
picker.onDidAccept(() => {
const ctx = "LookupProvider:onAccept";
// NOTE: unfortunate hack
if (getStage() === "test") {
return;
}
this.onDidAccept(picker, opts).catch((err) => {
Logger.error({
ctx,
err: new DendronError({
friendl... |
<<<<<<<
export const WRAPPED_NFT_FACTORY_ADDRESS_MAINNET = '0x861d83016128d40f234852c1d25d59b1aadaf7ff'
export const WRAPPED_NFT_FACTORY_ADDRESS_RINKEBY = '0x94c71c87244b862cfd64d36af468309e4804ec09'
export const WRAPPED_NFT_LIQUIDATION_PROXY_ADDRESS_MAINNET = '0x393c3c6e6B46ADFF50B363c84a8CA5429B6385A9'
export const W... |
<<<<<<<
=======
@Input()
set shareButton(value: string | number) {
this._provider = Helper.getEnumValue(value, ShareProvider);
if (typeof this._provider === 'undefined') {
throw new Error('[shareButton] attribute must be set to one of the values (numeric or string) of ShareProvid... |
<<<<<<<
public score: Score | null
=======
public readonly goingBack: boolean
>>>>>>>
public score: Score | null
public readonly goingBack: boolean |
<<<<<<<
type: 'cacheClear'
}
| {
=======
type: 'setViewport'
options: DeviceMetrics
}
| {
>>>>>>>
type: 'cacheClear'
}
| {
type: 'setViewport'
options: DeviceMetrics
}
| { |
<<<<<<<
import { Client, Cookie, PdfOptions, BoxModel, Viewport } from './types'
=======
import { Client, Cookie, DeviceMetrics, PdfOptions } from './types'
import * as CDP from 'chrome-remote-interface'
>>>>>>>
import { Client, Cookie, DeviceMetrics, PdfOptions, BoxModel, Viewport } from './types'
import * as CDP f... |
<<<<<<<
writeToFile,
isS3Configured,
uploadToS3,
=======
setFileInput,
>>>>>>>
setFileInput,
writeToFile,
isS3Configured,
uploadToS3, |
<<<<<<<
viewport(options: DeviceMetrics): Chromeless<T> {
this.queue.enqueue({type: 'viewport', options})
return this
=======
setHtml(html: string): Chromeless<T> {
this.queue.enqueue({type: 'setHtml', html})
return this
}
viewport(width: number, height: number): Chromeless<T> {
throw n... |
<<<<<<<
type: 'cacheClear'
}
| {
=======
type: 'setUserAgent'
useragent: string
}
| {
>>>>>>>
type: 'cacheClear'
}
| {
type: 'setUserAgent'
useragent: string
}
| { |
<<<<<<<
import { injectable, inject } from 'inversify';
=======
import { injectable, inject, multiInject, unmanaged } from 'inversify';
import { KeyCode, Accelerator } from './keys';
>>>>>>>
import { injectable, inject, unmanaged } from 'inversify';
import { KeyCode, Accelerator } from './keys';
<<<<<<<
export cons... |
<<<<<<<
return {status: 400, customHeaders: new Map(), content: ''};
=======
await page.close();
return {status: 400, content: ''};
>>>>>>>
await page.close();
return {status: 400, customHeaders: new Map(), content: ''};
<<<<<<<
return {status: 403, customHeaders: new Map(), cont... |
<<<<<<<
import study from './ui/study'
=======
import about from './ui/about'
>>>>>>>
import study from './ui/study'
import about from './ui/about' |
<<<<<<<
export * from "./IProductVariantsAttributes";
export * from "./IImage";
=======
export * from "./IProductVariantsAttributes";
export * from "./ITaxedMoney";
>>>>>>>
export * from "./IProductVariantsAttributes";
export * from "./IImage";
export * from "./ITaxedMoney"; |
<<<<<<<
export * from "./Attribute";
export * from "./Label";
export * from "./InputLabel";
export * from "./DropdownSelect";
=======
export * from "./Attribute";
export * from "./PlaceholderImage";
>>>>>>>
export * from "./Attribute";
export * from "./Label";
export * from "./InputLabel";
export * from "./DropdownS... |
<<<<<<<
QUnit.test('valueOr', assert => {
assert.strictEqual(Maybe.just(10).valueOr(20), 10);
assert.strictEqual(Maybe.nothing<number>().valueOr(20), 20);
});
=======
QUnit.test('sequence', assert => {
assert.ok(Maybe.sequence({
ten: Maybe.just(10),
tw... |
<<<<<<<
container: HTMLElement;
=======
content?: React.ReactNode | ((key: OptionsObject['key']) => React.ReactNode);
>>>>>>>
container: HTMLElement;
content?: React.ReactNode | ((key: OptionsObject['key']) => React.ReactNode); |
<<<<<<<
m('li.list_item.nav', {
key: 'theme',
oncreate: helper.ontapY(utils.f(router.set, '/settings/theme'))
}, `${i18n('theming')}`),
m('li.list_item.nav', {
=======
h('li.list_item.nav', {
>>>>>>>
h('li.list_item.nav', {
key: 'theme',
oncreate: helper.... |
<<<<<<<
workflow_step?: {
workflow_step_edit_id: string;
workflow_id: string;
step_id: string;
};
}
/**
* A Slack view_submission Workflow Step event
*
* This describes the additional JSON-encoded body details for a step's view_submission event
*/
export interface ViewWorkflowStepSubmitAction exte... |
<<<<<<<
import { Override, wrapToResolveOnFirstCall } from '../test-helpers';
=======
import { Override, delay, wrapToResolveOnFirstCall, createFakeLogger } from '../test-helpers';
>>>>>>>
import { Override, wrapToResolveOnFirstCall, createFakeLogger } from '../test-helpers';
<<<<<<<
import { SlashCommand } from '.... |
<<<<<<<
import { ErrorResponse } from '../../http'
=======
import { build as makeTree, ops as treeOps, path as treePath, TreeWrapper, Tree } from '../shared/tree'
>>>>>>>
import { ErrorResponse } from '../../http'
import { build as makeTree, ops as treeOps, path as treePath, TreeWrapper, Tree } from '../shared/tree'... |
<<<<<<<
import { ChatPostMessageArguments } from '@slack/web-api';
// TODO: remove the following pragma after TSLint to ESLint transformation is complete
/* tslint:disable:completed-docs */
=======
import bodyParser = require("body-parser");
import { ChatPostMessageArguments } from '@slack/client';
>>>>>>>
import... |
<<<<<<<
it('should fail without a token for single team authorization, authorize callback, nor oauth installer', async () => {
=======
it('should succeed with an orgAuthorize callback', async () => {
// Arrange
const authorizeCallback = sinon.fake();
const App = await importApp(); // eslint-... |
<<<<<<<
import I18n from 'tinymce/core/api/util/I18n';
=======
import { Editor } from 'tinymce/core/api/Editor';
import I18n from '../../../../../../core/main/ts/api/util/I18n';
import { UiFactoryBackstageProviders } from '../../backstage/Backstage';
>>>>>>>
import I18n from 'tinymce/core/api/util/I18n';
import { Ed... |
<<<<<<<
import { Pipeline, Log } from '@ephox/agar';
import { UnitTest } from '@ephox/bedrock-client';
=======
import { Log, Pipeline } from '@ephox/agar';
import { UnitTest } from '@ephox/bedrock';
>>>>>>>
import { Log, Pipeline } from '@ephox/agar';
import { UnitTest } from '@ephox/bedrock-client';
<<<<<<<
impor... |
<<<<<<<
import { AddEventsBehaviour, AlloyComponent, AlloyEvents, AlloyTriggers, Behaviour, EventFormat, FormField as AlloyFormField, Keying, NativeEvents, Replacing, Representing, SimulatedEvent, SketchSpec, SystemEvents, Tabstopping, } from '@ephox/alloy';
=======
import { AddEventsBehaviour, AlloyComponent, AlloyE... |
<<<<<<<
const init = (dragApi: BlockerDragApi<TouchEvent>): AlloyEvents.AlloyEventRecord => {
return AlloyEvents.derive([
// When the user taps on the blocker, something has probably gone slightly
// wrong, so we'll just drop for safety. The blocker should really only
// be there when their finger is alre... |
<<<<<<<
list: all as Array<AlloyBehaviour<any, any>>,
data: Obj.map(validated, (optBlobThunk: () => Option<BehaviourConfigAndState<any, () => BehaviourStateInitialiser<any>>>) => {
=======
list: all as AlloyBehaviour<any,any>[],
data: Obj.map(validated, (optBlobThunk) => {
>>>>>>>
list: all as Ar... |
<<<<<<<
UnitTest.asynctest('browser.tinymce.plugins.textpattern.TextPatternPluginTest', (success, failure) => {
=======
UnitTest.asynctest('browser.tinymce.plugins.textpattern.TextPatternPluginTest', (success, failure) => {
>>>>>>>
UnitTest.asynctest('browser.tinymce.plugins.textpattern.TextPatternPluginTest', (suc... |
<<<<<<<
import { UnitTest } from '@ephox/bedrock-client';
=======
import { UnitTest } from '@ephox/bedrock';
import { document } from '@ephox/dom-globals';
>>>>>>>
import { UnitTest } from '@ephox/bedrock-client';
import { document } from '@ephox/dom-globals'; |
<<<<<<<
const getOffset = <I extends SelectionAnchor>(component: AlloyComponent, origin: OriginAdt, anchorInfo: I): Option<SugarPosition> => {
const win = Traverse.defaultView(anchorInfo.root).dom();
=======
const getOffset = <I extends SelectionAnchor | NodeAnchor>(component: AlloyComponent, origin: OriginAdt, anc... |
<<<<<<<
UnitTest.test('stylecontainer is shadow root for shadow root', () => {
withShadowElement((sr) => {
Assert.eq('Should be shadow root', sr, ShadowDom.getStyleContainer(sr), tElement);
=======
if (ShadowDom.isSupported()) {
UnitTest.test('stylecontainer is shadow root for shadow root', () => {
withSh... |
<<<<<<<
const setSize = (name: string, normalizeCss: CssNormalizer) => (image: HTMLElement, name: string, value: string) => {
if (image.style[name]) {
image.style[name] = Utils.addPixelSuffix(value);
normalizeStyle(image, normalizeCss);
} else {
setAttrib(image, name, value);
}
=======
const setSize... |
<<<<<<<
maximized?: boolean;
=======
disabled?: boolean;
>>>>>>>
maximized?: boolean;
disabled?: boolean;
<<<<<<<
placeholder?: Option<string>;
maximized: boolean;
=======
placeholder: Option<string>;
disabled: boolean;
>>>>>>>
maximized: boolean;
placeholder: Option<string>;
disabled: bool... |
<<<<<<<
import CameraControlWrapper from '@/script/modules/three/CameraControlWrapper';
import GizmoWrapper from '@/script/modules/three/GizmoWrapper';
=======
import CameraControls from 'camera-controls';
import { Controls } from '@/script/modules/Controls';
>>>>>>>
import CameraControlWrapper from '@/script/modul... |
<<<<<<<
import { isSplitToolbar, useFixedContainer, fixedContainerElement } from '../api/Settings';
=======
import { getToolbarDrawer, ToolbarDrawer } from '../api/Settings';
>>>>>>>
import { ModeRenderInfo, RenderArgs, RenderUiComponents, RenderUiConfig } from '../Render';
import OuterContainer from '../ui/general/... |
<<<<<<<
import * as EditorSettings from 'tinymce/core/EditorSettings';
import Theme from 'tinymce/themes/silver/Theme';
import { UnitTest } from '@ephox/bedrock-client';
=======
>>>>>>> |
<<<<<<<
import DOMUtils from 'tinymce/core/api/dom/DOMUtils';
import * as Size from './Size';
=======
import Writer from 'tinymce/core/api/html/Writer';
>>>>>>>
import Writer from 'tinymce/core/api/html/Writer';
<<<<<<<
start(name, attrs, empty) {
switch (name) {
case 'video':
case 'object... |
<<<<<<<
const calculateDelta = <E extends Event>(mode: DragModeDeltas<E, T>, nu: T): Option<T> => {
const result = previous.map((old) => {
return mode.getDelta(old, nu);
});
=======
const calculateDelta = (mode: DragModeDeltas<T>, nu: T): Option<T> => {
const result = previous.map((old) => mode.... |
<<<<<<<
const repeatUntil = function <T, U>(label: string, repeatStep: Step<T, T>, successStep: Step<T, U>, numAttempts: number) {
return Step.raw((value: T, next: NextFn<U>, die: DieFn, logs: TestLogs) => {
const again = function (num: number) {
if (num <= 0) {
die(label + '\nRan out of attempts', ... |
<<<<<<<
text: 'Remove color',
icon: getIcon('remove'),
=======
text: 'Remove',
icon: 'color-swatch-remove-color',
>>>>>>>
text: 'Remove color',
icon: 'color-swatch-remove-color',
<<<<<<<
text: 'Custom color',
icon: getIcon('custom'),
=======
text: 'Custom',
icon: 'color-pic... |
<<<<<<<
=======
import { HTMLTableCellElement, Range } from '@ephox/dom-globals';
>>>>>>> |
<<<<<<<
const lazyThrobber = () => lazyOuterContainer.bind((container) => {
return OuterContainer.getThrobber(container);
}).getOrDie('Could not find throbber element');
=======
const lazyToolbar = () => lazyOuterContainer.bind((container) => {
return OuterContainer.getToolbar(container);
}).getOrDie... |
<<<<<<<
=======
import RangeUtils from 'tinymce/core/api/dom/RangeUtils';
import Tools from 'tinymce/core/api/util/Tools';
import * as Settings from '../api/Settings';
import * as Utils from './Utils';
>>>>>>>
import Tools from 'tinymce/core/api/util/Tools';
import * as Settings from '../api/Settings';
import * as U... |
<<<<<<<
import { Fun, Option } from '@ephox/katamari';
import { EventArgs } from '@ephox/sugar';
=======
import { Option } from '@ephox/katamari';
>>>>>>>
import { Option } from '@ephox/katamari';
import { EventArgs } from '@ephox/sugar';
<<<<<<<
const handlers = (dragConfig: MouseDraggingConfig, dragState: Draggin... |
<<<<<<<
import { AlloyComponent } from '../../api/component/ComponentApi';
import { SimulatedEvent } from '../../events/SimulatedEvent';
import { SpecSchemaStruct } from '../../spec/SpecSchema';
import { Arr } from '@ephox/katamari';
=======
>>>>>>>
import { Arr } from '@ephox/katamari';
<<<<<<<
const partRedirects... |
<<<<<<<
text: () => string;
level: () => Option<'info' | 'warn' | 'error' | 'success'>;
icon: () => Option<string>;
onAction: () => Function;
progress: () => Boolean;
iconProvider: () => IconProvider;
translationProvider: () => (text: Untranslated) => TranslatedString;
=======
text: string;
level: O... |
<<<<<<<
import { PlatformDetection } from '@ephox/sand';
=======
import { LazyPlatformDetection } from '@ephox/sand';
>>>>>>>
import { LazyPlatformDetection, PlatformDetection } from '@ephox/sand';
<<<<<<<
=======
import { UiFactoryBackstage } from 'tinymce/themes/silver/backstage/Backstage';
import ItemResponse ... |
<<<<<<<
editor.shortcuts.add('alt+F9', 'focus menubar', function () {
OuterContainer.focusMenubar(outerContainer);
});
=======
lazyOuterContainer = Option.some(outerContainer);
>>>>>>>
lazyOuterContainer = Option.some(outerContainer);
editor.shortcuts.add('alt+F9', 'focus menubar', function () {
... |
<<<<<<<
import { UnitTest } from '@ephox/bedrock-client';
import { document } from '@ephox/dom-globals';
=======
>>>>>>>
import { UnitTest } from '@ephox/bedrock-client'; |
<<<<<<<
import { Assertions, Chain, Pipeline, Guard, Log } from '@ephox/agar';
import { UnitTest } from '@ephox/bedrock-client';
=======
import { Assertions, Chain, Guard, Log, Pipeline } from '@ephox/agar';
import { UnitTest } from '@ephox/bedrock';
>>>>>>>
import { Assertions, Chain, Guard, Log, Pipeline } from '@... |
<<<<<<<
import { Cell, Fun } from '@ephox/katamari';
import { PlatformDetection } from '@ephox/sand';
import { EventArgs, Position } from '@ephox/sugar';
=======
import { Cell, Fun } from '@ephox/katamari';
>>>>>>>
import { Cell, Fun } from '@ephox/katamari';
import { EventArgs, Position } from '@ephox/sugar';
<<<<... |
<<<<<<<
//transform可能已经被删除
const boundingTransform = this.getBoundingTransform();
if(boundingTransform){
boundingTransform.unregisterObserver(this);
}
super.uninitialize();
=======
if (this.boneTexture) {
... |
<<<<<<<
const control = function <T, U, V>(chain: Chain<T, U>, guard: ChainGuard<T, U, V>) {
return on(function (input: T, next: NextFn<V>, die: DieFn, logs: TestLogs) {
guard(chain.runChain, input, function (v: V, newLogs: TestLogs) {
=======
const control = <T, U, V>(chain: Chain<T, U>, guard: ChainGuard<T, U... |
<<<<<<<
import { Sidebar } from '../sidebar/Sidebar';
import { renderMoreToolbar, renderToolbarGroup } from '../toolbar/CommonToolbar';
=======
import * as Sidebar from '../sidebar/Sidebar';
import { renderToolbar, renderToolbarGroup } from '../toolbar/CommonToolbar';
>>>>>>>
import * as Sidebar from '../sidebar/Sid... |
<<<<<<<
import { Annotator } from 'tinymce/core/api/Annotator';
=======
import { HTMLElement, Document, Window } from '@ephox/dom-globals';
>>>>>>>
import { Annotator } from 'tinymce/core/api/Annotator';
import { HTMLElement, Document, Window } from '@ephox/dom-globals'; |
<<<<<<<
import { HexColour, RgbaColour } from '@ephox/acid';
import { Menu, Toolbar } from '@ephox/bridge';
import { Cell, Option, Strings } from '@ephox/katamari';
=======
import { Menu, Toolbar, Types } from '@ephox/bridge';
import { Cell, Option } from '@ephox/katamari';
>>>>>>>
import { HexColour, RgbaColour } f... |
<<<<<<<
import { AlloyComponent, Attachment, Docking, Boxes, SplitFloatingToolbar } from '@ephox/alloy';
import { Option, Cell } from '@ephox/katamari';
import { Css, Element, Height } from '@ephox/sugar';
=======
import { AlloyComponent, Attachment, Docking } from '@ephox/alloy';
import { Option } from '@ephox/katam... |
<<<<<<<
=======
layouts?: {
onLtr: (elem: Element) => AnchorLayout[];
onRtl: (elem: Element) => AnchorLayout[];
};
>>>>>>>
<<<<<<<
=======
layouts: () => {
onLtr: () => (elem: Element) => AnchorLayout[];
onRtl: () => (elem: Element) => AnchorLayout[];
};
>>>>>>>
<<<<<<<
export interface ... |
<<<<<<<
const failed = function (label, expected, step: Step<any, any>) {
return Step.raw(function (value, next, die, initLogs) {
step.runStep(value, function (v, newLogs) {
=======
const failed = (label, expected, step: Step<any, any>) =>
Step.raw((value, next, die, initLogs) => {
step(value, (v, newLogs... |
<<<<<<<
private readonly _defaultMaterial: Material = egret3d.DefaultMaterials.MESH_BASIC.clone().setDepth(false, false); // TODO copy shader
private readonly _renderState: WebGLRenderState = paper.GameObject.globalGameObject.getOrAddComponent(WebGLRenderState);
=======
private readonly _copyM... |
<<<<<<<
import { Arr } from '@ephox/katamari';
=======
import * as DomEvent from 'ephox/sugar/api/events/DomEvent';
import * as Remove from 'ephox/sugar/api/dom/Remove';
import * as Attr from 'ephox/sugar/api/properties/Attr';
>>>>>>>
import * as DomEvent from 'ephox/sugar/api/events/DomEvent';
import * as Remove fr... |
<<<<<<<
import { ApproxStructure } from '@ephox/agar';
import { Unicode } from '@ephox/katamari';
=======
import { ApproxStructure, StructAssert } from '@ephox/agar';
>>>>>>>
import { ApproxStructure, StructAssert } from '@ephox/agar';
import { Unicode } from '@ephox/katamari';
<<<<<<<
const sAssertNbspStruct = App... |
<<<<<<<
asyncOperation.runStep(lastLink, function (x, newLogs) {
callAsync(function () { nextStep(x, newLogs); });
=======
asyncOperation(lastLink, (x, newLogs) => {
callAsync(() => { nextStep(x, newLogs); });
>>>>>>>
asyncOperation.runStep(lastLink, (x, newLogs) => {
... |
<<<<<<<
return get(win).fold(
() => {
const doc = Element.fromDom(win.document);
const html = win.document.documentElement;
const scroll = Scroll.get(doc);
// Don't use window.innerWidth/innerHeight here, as we don't want to include scrollbars
// since the right/bottom position is ba... |
<<<<<<<
import { Arr, Fun } from '@ephox/katamari';
import { Compare, Insert, Replication, SelectorFind, SugarElement, SugarFragment, SugarNode, Traverse } from '@ephox/sugar';
=======
import { HTMLLIElement, HTMLOListElement, HTMLTableCellElement, HTMLTableElement, Node, Range } from '@ephox/dom-globals';
import { A... |
<<<<<<<
import { fireListEvent } from '../api/Events';
import { ListAction } from '../core/ListAction';
=======
import { createTextBlock } from '../core/TextBlock';
>>>>>>>
import { createTextBlock } from '../core/TextBlock';
import { fireListEvent } from '../api/Events';
import { ListAction } from '../core/ListActi... |
<<<<<<<
import * as GradientActions from '../common/GradientActions';
=======
import { SliderDetail } from '../../ui/types/SliderTypes';
import * as SliderActions from './SliderActions';
>>>>>>>
import { SliderDetail } from '../../ui/types/SliderTypes';
import * as GradientActions from '../common/GradientActions';
... |
<<<<<<<
const getNewRoute = (comp: AlloyComponent, transConfig: TransitioningConfig, transState: Stateless, destination: string): TransitionRoute => {
return {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
start: Attr.get(comp.element(), transConfig.stateAttr)!,
destination
};
};
... |
<<<<<<<
async function computeImage(
container: cloud.Container,
repository: aws.ecr.Repository | undefined): Promise<ImageOptions> {
=======
async function computeImage(container: cloud.Container): Promise<ImageOptions> {
const environment: { name: string, value: string }[] = ecsEnvironmentFromMap(contai... |
<<<<<<<
=======
import { document, window } from '@ephox/dom-globals';
import { Cleaner } from '../../module/ephox/alloy/test/Cleaner';
>>>>>>>
import { Cleaner } from '../../module/ephox/alloy/test/Cleaner';
<<<<<<<
const page = Element.fromHtml(
`<div class="gui-events-test-container">
<input class="t... |
<<<<<<<
import Settings from '../api/Settings';
=======
import { Fun, Arr } from '@ephox/katamari';
>>>>>>>
import { Fun, Arr } from '@ephox/katamari';
import Settings from '../api/Settings'; |
<<<<<<<
import { Css, DomEvent, SugarElement, SugarPosition, SugarShadowDom } from '@ephox/sugar';
=======
import { Event } from '@ephox/dom-globals';
import { Css, DomEvent, Element, Position, ShadowDom } from '@ephox/sugar';
>>>>>>>
import { Css, DomEvent, SugarElement, SugarPosition, SugarShadowDom } from '@ephox... |
<<<<<<<
const padding = key === Keys.space() ? '\u00a0' : '';
const extraOffset = padding === '' ? 0 : 1;
return Logger.t(`Set content and press ${key}`, GeneralSteps.sequence([
tinyApis.sSetContent('<p>' + content + padding + '</p>'),
=======
return GeneralSteps.sequence([
tinyApis.sSetCo... |
<<<<<<<
import { SelectComponent } from './select/select.component';
=======
import { RadioComponent } from './radio/radio.component';
import { DatepickerComponent } from './datepicker/datepicker.component';
import { SliderComponent } from './slider/slider.component';
import { SlidetoggleComponent } from './slidetogg... |
<<<<<<<
import { ListComponent } from './list/list.component';
=======
import { StepperComponent } from './stepper/stepper.component';
import { ExpansionPanelComponent } from './expansion-panel/expansion-panel.component';
>>>>>>>
import { ListComponent } from './list/list.component';
import { StepperComponent } fro... |
<<<<<<<
{
"name": "Filtering",
"icon": "filter_list",
"link": "tables/filter",
"open" : false,
},
{
"name"... |
<<<<<<<
let data = params.data;
if (this.options.uploadToStorage) {
const docPath = r.collection.doc(id).path;
data = this.parseDataAndUpload(docPath, data);
}
=======
const currentUserEmail = await this.getCurrentUserEmail();
>>>>>>>
const currentUserEmail = await this.getCurrentUser... |
<<<<<<<
const audioPath = resolveAudioFilePath(options.audioFile);
TNS_Player_Log('audioPath', audioPath);
if (!this._player) {
TNS_Player_Log('android mediaPlayer is not initialized, creating new instance');
this._player = new android.media.MediaPlayer();
}
... |
<<<<<<<
import * as settingsHelper from './settingsHelper';
=======
import * as utils from './helpers';
import * as ta from './testAgent';
>>>>>>>
import * as settingsHelper from './settingsHelper';
import * as utils from './helpers';
import * as ta from './testAgent';
<<<<<<<
//Modify settings file to enab... |
<<<<<<<
import kubectlutility = require("utility-common/kubectlutility");
import path = require('path');
import tl = require('vsts-task-lib/task');
import yaml = require('js-yaml');
import { IExecSyncResult } from 'vsts-task-lib/toolrunner';
=======
import * as utils from "./../utilities";
import { IExecSyncResult } ... |
<<<<<<<
import './elements/svg/svg.test.js';
=======
import './elements/svg/rectangle.test.js';
>>>>>>>
import './elements/svg/svg.test.js';
import './elements/svg/rectangle.test.js'; |
<<<<<<<
gb.arg(inputTasks);
gb = sqGradle.applyEnabledSonarQubeArguments(gb);
=======
gb.arg(tl.getDelimitedInput('tasks', ' ', true));
>>>>>>>
gb.arg(inputTasks);
gb = sqGradle.applyEnabledSonarQubeArguments(gb);
gb.arg(tl.getDelimitedInput('tasks', ' ', true)); |
<<<<<<<
var result = "";
=======
var telemetry = {
registryType: registryType,
command: action !== "Run a Docker command" ? action : tl.getInput("customCommand", true)
};
console.log("##vso[telemetry.publish area=%s;feature=%s]%s",
"TaskEndpointId",
"DockerV0",
JSON.stringify(telemetry));
>>>>>>... |
<<<<<<<
import codeAnalysis = require('./CodeAnalysis/mavencodeanalysis');
=======
>>>>>>>
<<<<<<<
var isSonarQubeEnabled:boolean = false;
var summaryFile: string = null;
var reportDirectory: string = null;
var reportPOMFile: string = null;
var execFileJacoco: string = null;
var ccReportTask: string = null;
======... |
<<<<<<<
import {IDerivation, IDerivationState, trackDerivedFunction, clearObserving, shouldCompute, CaughtException} from "./derivation";
import {IObservable} from "./observable";
=======
import {IDerivation, IDerivationState, trackDerivedFunction, clearObserving, shouldCompute} from "./derivation";
import {IObservab... |
<<<<<<<
addHiddenFinalProp
=======
addHiddenFinalProp,
addHiddenProp,
invariant,
deprecated
>>>>>>>
addHiddenFinalProp
<<<<<<<
export interface IObservableArray<T> extends Array<T> {
=======
// Detects bug in safari 9.1.1 (or iOS 9 safari mobile). See #364
const safariPrototypeSetterInheri... |
<<<<<<<
private _keys: IObservableArray<string> = <any> new ObservableArray(null, ValueMode.Reference, ".keys()");
=======
private _keys: IObservableArray<string> = <any> new ObservableArray(null, ValueMode.Reference, false, {
name: ".keys()",
object: this
});
>>>>>>>
private _keys: IObservableArray<string>... |
<<<<<<<
// TODO: just extend Map? See also https://gist.github.com/nestharus/13b4d74f2ef4a2f4357dbd3fc23c1e54
export class ObservableMap<K, V>
=======
export class ObservableMap<K = any, V = any>
>>>>>>>
// TODO: just extend Map? See also https://gist.github.com/nestharus/13b4d74f2ef4a2f4357dbd3fc23c1e54
export clas... |
<<<<<<<
import {isComputingView, transaction, runAfterTransaction, IObservable} from './dnode';
import {Lambda, IObservableArray, IObservableValue, IArrayChange, IArraySplice, IObjectChange} from './interfaces';
import {isPlainObject, once, deepEquals} from './utils';
import {DerivedValue, ObservableValue} from './dnod... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.