conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
import { markdownLinkBuilder } from '../../../../../../../storybook-utilities/markdownLinkBuilder';
=======
import { SprkMastheadAccordionComponent } from './sprk-masthead-accordion/sprk-masthead-accordion.component';
import { SprkMastheadAccordionItemComponent } from './sprk-masthead-accordion-item/sprk-mast... |
<<<<<<<
import { SprkLabelDirective } from './directives/inputs/sprk-label/sprk-label.directive';
import { SprkSelectionLabelDirective } from './directives/inputs/sprk-selection-label/sprk-selection-label.directive';
import { SprkInputDirective } from './directives/inputs/sprk-input/sprk-input.directive';
import { Sprk... |
<<<<<<<
import { dismissAlert } from '@sparkdesignsystem/spark-core/es5/alerts';
=======
>>>>>>>
import { dismissAlert } from '@sparkdesignsystem/spark-core/es5/alerts'; |
<<<<<<<
import { SparkTabbedNavigationComponent } from './components/sprk-tabbed-navigation/sprk-tabbed-navigation.component';
import { SprkTabbedNavigationTabDirective } from './directives/tabbed-navigation/sprk-tabbed-navigation-tab/sprk-tabbed-navigation-tab.directive';
import { SprkTabbedNavigationPanelDirective } ... |
<<<<<<<
import { NavigationDocsComponent } from './navigation-docs/navigation-docs.component';
=======
import { DividerDocsComponent } from './divider-docs/divider-docs.component';
>>>>>>>
import { DividerDocsComponent } from './divider-docs/divider-docs.component';
import { NavigationDocsComponent } from './navigat... |
<<<<<<<
import { InputDocsComponent } from './input-docs/input-docs.component';
=======
import { CardDocsComponent } from './card-docs/card-docs.component';
import { StackDocsComponent } from './stack-docs/stack-docs.component';
>>>>>>>
import { InputDocsComponent } from './input-docs/input-docs.component';
import {... |
<<<<<<<
let dropdownElement: HTMLElement;
let dropdownIconElement: HTMLElement;
let dropdownComponent: SprkMastheadSelectorComponent;
let dropdownTriggerElement: HTMLElement;
=======
let mastheadSelectorElement: HTMLElement;
let mastheadSelectorTriggerTextElement: HTMLElement;
let mastheadSelectorIconEl... |
<<<<<<<
import { InputDocsComponent } from './input-docs/input-docs.component';
=======
import { MastheadDocsComponent } from './masthead-docs/masthead-docs.component';
>>>>>>>
import { MastheadDocsComponent } from './masthead-docs/masthead-docs.component';
import { InputDocsComponent } from './input-docs/input-docs... |
<<<<<<<
import { FormsModule } from '@angular/forms'
import { ReactiveFormsModule } from '@angular/forms';
=======
import { RouterModule } from '@angular/router';
>>>>>>>
import { RouterModule } from '@angular/router';
import { FormsModule } from '@angular/forms'
import { ReactiveFormsModule } from '@angular/forms';... |
<<<<<<<
import { Inject, Injectable, forwardRef } from "@angular/core";
import { AccessToken, AccessTokenCache, ServerError } from "@batch-flask/core";
import { fetch, log } from "@batch-flask/utils";
=======
import { AccessToken, ServerError } from "@batch-flask/core";
import { log } from "@batch-flask/utils";
>>>>... |
<<<<<<<
import { ServerError } from "@batch-flask/core";
import { FileSystemService } from "@batch-flask/electron";
=======
import { ServerError, isNotNullOrUndefined } from "@batch-flask/core";
import { FileSystemService } from "@batch-flask/ui/electron";
>>>>>>>
import { ServerError, isNotNullOrUndefined } from "@... |
<<<<<<<
import { Observable } from "rxjs";
import { TaskCreateBasicDialogComponent, TerminateTaskDialogComponent } from "../action";
=======
import { Observable } from "rxjs/Observable";
import { TaskCreateBasicDialogComponent } from "../action";
>>>>>>>
import { Observable } from "rxjs";
import { TaskCreateBasicDia... |
<<<<<<<
private _initializer: BatchLabsInitializer;
=======
private _initializer = new BatchLabsInitializer(this);
private _currentlyAskingForCredentials: Promise<any>;
>>>>>>>
private _initializer: BatchLabsInitializer;
private _currentlyAskingForCredentials: Promise<any>;
<<<<<<<
ipcM... |
<<<<<<<
import { fillsPreprocessor } from '../helpers/fillsPreprocessor';
=======
import { saveStyleMixin } from '../mixins/saveStyleMixin';
>>>>>>>
import { fillsPreprocessor } from '../helpers/fillsPreprocessor';
import { saveStyleMixin } from '../mixins/saveStyleMixin'; |
<<<<<<<
import { InstanceProps } from './src/components/component/Instance';
import { ComponentProps } from './src/components/component/Component';
import { StarProps } from './src/components/star/Star';
import { VectorProps } from './src/components/vector/Vector';
import { SliceProps } from './src/components/slice/Sli... |
<<<<<<<
import { saveStyleMixin } from '../mixins/saveStyleMixin';
=======
import { propsAssign } from '../helpers/propsAssign';
const textNodeProps = [
'textAlignHorizontal',
'textAlignVertical',
'textAlignVertical',
'textAutoResize',
'paragraphIndent',
'paragraphSpacing',
'autoRename',
... |
<<<<<<<
import { ATNConfigSet } from './atn/Stub_ATNConfigSet';
import { BitSet } from './misc/BitSet';
import { DFA } from './dfa/Stub_DFA';
=======
import { ATNConfigSet } from './atn/ATNConfigSet';
import { BitSet } from './misc/Stub_BitSet';
import { DFA } from './dfa/DFA';
>>>>>>>
import { ATNConfigSet } from '... |
<<<<<<<
comparator: AbstractEqualityComparator<T> = null,
initialCapacity: number = INITAL_CAPACITY,
initialBucketCapacity: number = INITAL_BUCKET_CAPACITY) {
=======
comparator: EqualityComparator<T> = null,
initialCapacity: number = Array2DHashSet.INITAL_CAPACITY,
initialBucketCapacity: number ... |
<<<<<<<
// By the way...
//
// This file is just an experiment, not a well-thought out concept
//
// It was convenient for ConvertTo-TS to write these reexport declarations
// while processing a file, so I did it. I'm not sure we'll need it in the end.
//
export * from './ErrorNode';
export * from './ParseTree';
... |
<<<<<<<
import { ATNConfigSet } from './atn/Stub_ATNConfigSet';
import { BitSet } from './misc/BitSet';
import { DFA } from './dfa/Stub_DFA';
=======
import { ATNConfigSet } from './atn/ATNConfigSet';
import { BitSet } from './misc/Stub_BitSet';
import { DFA } from './dfa/DFA';
>>>>>>>
import { ATNConfigSet } from '... |
<<<<<<<
import { Arrays } from "../misc/Arrays";
=======
import { ATN } from '../atn/Stub_ATN';
import { Parser } from '../Stub_Parser';
import { ParserRuleContext } from '../Stub_ParserRuleContext';
import { NotNull } from "../Decorators";
import {Arrays} from "../misc/Arrays";
import {RuleNode} from "./RuleNode";
i... |
<<<<<<<
getText(): string {
return this.getTextFromInterval(Interval.of(0, this.size() - 1));
}
=======
getText(interval?: Interval | RuleContext): string {
if (interval === undefined) {
this.fill();
interval = Interval.of(0, this.size - 1);
} else if (!(interval instanceof Interval)) {
// Note: the... |
<<<<<<<
declare module "util/IAspectExports" {
export interface IAspectExports {
__call(pointer: number): void;
}
}
=======
declare module "test/IWarning" {
export interface IWarning {
type: string;
message: string;
stackTrace: string;
}
}
>>>>>>>
declare module "util/... |
<<<<<<<
import { IAspectExports } from "../util/IAspectExports";
=======
import { IWarning } from "./IWarning";
>>>>>>>
import { IAspectExports } from "../util/IAspectExports";
import { IWarning } from "./IWarning";
<<<<<<<
public run(wasm: ASUtil & IAspectExports): void {
=======
public run(wasm: ASUtil): vo... |
<<<<<<<
public fit_transform(doc: string[] = []): number[] {
=======
public fit_transform(doc: string[]): number[][] {
>>>>>>>
public fit_transform(doc: string[] = []): number[][] {
<<<<<<<
public transform(doc: string[] = []): number[] {
=======
public transform(doc: string[]): number[][] {
>>>>>>>
... |
<<<<<<<
l = (l)eave a breadcrumb
Calls the leaveBreadcrumb() method.
o = calling notify with an (o)n error callback
Runs custom logic before an event is sent. This contrived example will
pseudo-randomly prevent 50% of the events from sending.
=======
b = calling notify with a (b)efore send callback... |
<<<<<<<
orientationBreadcrumbsEnabled?: boolean;
=======
// options for all bundled expo plugins
consoleBreadcrumbsEnabled?: boolean;
networkBreadcrumbsEnabled?: boolean;
navigationBreadcrumbsEnabled?: boolean;
connectivityBreadcrumbsEnabled?: boolean;
>>>>>>>
// options for all bundled e... |
<<<<<<<
import {
AppInsightsService,
BlobStorageService,
BotService,
ConnectedService,
CosmosDbService,
DispatchService,
EndpointService,
FileService,
GenericService,
LuisService,
QnaMakerService
} from './models';
import {
IAppInsightsService,
IBlobStorageService,
... |
<<<<<<<
export * from './numberWithUnits';
export * from './qnamaker-interfaces/index'
=======
export * from './numberWithUnits';
export * from './ordinalV2';
>>>>>>>
export * from './numberWithUnits';
export * from './qnamaker-interfaces/index'
export * from './ordinalV2'; |
<<<<<<<
const defaultTextColor = new Color(options.android.color || '#000');
const defaultTextNativeColor = defaultTextColor.android
? defaultTextColor.android
: android.graphics.Color.BLACK;
const defaultDetailsNativeColor = new Color(
255 * 0.8,
defaultTextColor.r,
defaultTex... |
<<<<<<<
<div *ngIf="formList.enabled && !readonly" class="remove-icon">
<i ct-tooltip="Delete" class="fa fa-trash clickable" data-test="base-command-remove" (click)="removeEntry(i)"></i>
=======
<div *ngIf="formControl.enabled && !readonly" class="remove-icon">
... |
<<<<<<<
import {EventHubService} from "../../../../services/event-hub/event-hub.service";
import {OpenInputInspector} from "../../../../action-events/index";
import {CommandLineToolModel} from "cwlts/models/d2sb";
import {FormSectionComponent} from "../../../form-section/form-section.component";
=======
import {Comma... |
<<<<<<<
import {WorkboxTab} from "../core/workbox/workbox-tab.interface";
import {ProceedToEditingModalComponent} from "../core/modals/proceed-to-editing-modal/proceed-to-editing-modal.component";
=======
>>>>>>>
import {ProceedToEditingModalComponent} from "../core/modals/proceed-to-editing-modal/proceed-to-editing... |
<<<<<<<
import {CommandOutputParameterModel as OutProperty} from "cwlts/models/d2sb";
import {CommandOutputBindingModel} from "cwlts/models/d2sb/CommandOutputBindingModel";
import {DirectiveBase} from "../../../../util/directive-base/directive-base";
=======
import {ComponentBase} from "../../../../components/common/... |
<<<<<<<
import {CommandOutputParameterModel as OutputProperty, SBDraft2ExpressionModel, SBDraft2CommandInputParameterModel} from "cwlts/models/d2sb";
=======
import {ComponentBase} from "../../../../components/common/component-base";
import {CommandInputParameterModel} from "cwlts/models";
import {SBDraft2ExpressionM... |
<<<<<<<
=======
AppExecutionContextModalComponent,
AppExecutionPreviewComponent,
AppInfoComponent,
BlankToolStateComponent,
CommonDocumentControlsComponent,
CommonReportPanelComponent,
CommonStatusControlsComponent,
>>>>>>>
AppExecutionContextModalCompo... |
<<<<<<<
import {ContextService} from "../../core/ui/context/context.service";
=======
import {GuidService} from "../../services/guid.service";
import {IpcService} from "../../services/ipc.service";
import {LocalDataSourceService} from "../../sources/local/local.source.service";
import {PublicAppService} from "../../p... |
<<<<<<<
import {CompactListComponent} from "../components/compact-list/compact-list.component";
import {EditableDirective} from "../directives/editable.directive";
import {FileDefInspectorComponent} from "./sections/file-def-list/file-def-inspector.component";
import {LiteralExpressionInputComponent} from "./sections/f... |
<<<<<<<
import {HTTP_PROVIDERS} from '@angular/http';
=======
import {FileStateService} from "../../state/file.state.service";
>>>>>>>
import {HTTP_PROVIDERS} from '@angular/http';
import {FileStateService} from "../../state/file.state.service";
<<<<<<<
StateUpdates,
UrlValidator,
HTTP_PROVI... |
<<<<<<<
<button type="button" data-test="get-support-btn" class="btn btn-outline-primary"
(click)="openFeedbackModal()">
=======
<button type="button" class="btn btn-secondary" (click)="openFeedbackModal()">
>>>>>>>
<button type... |
<<<<<<<
<button type="button" class="btn btn-secondary" data-test='cancel-button'
(click)="closeModal()">Cancel
</button>
<button type="button" class="btn btn-success" data-test='send-button'
[disabled]="!feedbackTextContro... |
<<<<<<<
import {GettingStartedComponent} from "./onboarding/getting-started.component";
import {WelcomeTabComponent} from "./onboarding/welcome.component";
=======
import {UpdatePlatformModalComponent} from "./modals/update-platform-modal/update-platform-modal.component";
import {GettingStartedComponent} from "./onbo... |
<<<<<<<
import {Component, OnInit, ElementRef, ViewChild, Input, OnDestroy, Output} from "@angular/core";
import {Subscription, Observable, Subject} from "rxjs/Rx";
=======
import {Component, OnInit, ElementRef, ViewChild, Input, OnDestroy} from "@angular/core";
import {FileModel} from "../../store/models/fs.models";... |
<<<<<<<
private update<T extends RepositoryType>(profile: string,
data: Partial<T>,
callback: (err?: Error, data?: T) => void = () => {
}) {
=======
private getUpdateDiff(main... |
<<<<<<<
import {StandaloneCodeEditorComponent} from "./app/components/standalone-code-editor/standalone-code-editor.component"
import {QuickPickComponent} from "./app/components/quick-pick/quick-pick.component";
import {CompactListComponent} from "./app/components/compact-list/compact-list.component";
import {EditableD... |
<<<<<<<
} from "../../action-events";
import {
CommandInputParameterModel as InputProperty,
CommandLineToolModel
} from "cwlts/models/d2sb";
=======
} from "../../action-events/index";
import {CommandLineToolModel} from "cwlts/models/d2sb";
>>>>>>>
} from "../../action-events/index";
import {CommandInputPar... |
<<<<<<<
import {ReplaySubject, BehaviorSubject, Observable} from "rxjs/Rx";
=======
import {FormGroup, FormBuilder} from "@angular/forms";
import {ReplaySubject, BehaviorSubject} from "rxjs/Rx";
import {CommandLinePart} from "cwlts/models/helpers/CommandLinePart";
>>>>>>>
import {FormGroup, FormBuilder} from "@angu... |
<<<<<<<
import {Component, Input} from "@angular/core";
=======
import {Component, Input, OnInit} from "@angular/core";
>>>>>>>
import {Component, Input} from "@angular/core";
<<<<<<<
import {EventHubService} from "../../services/event-hub/event-hub.service";
import {
OpenInputInspector,
OpenExpressionEdito... |
<<<<<<<
import {Component, OnDestroy} from "@angular/core";
import {DynamicState} from "../runtime-compiler/dynamic-state.interface";
=======
import {Component, OnInit, Input} from "@angular/core";
>>>>>>>
import {Component, OnInit, Input} from "@angular/core";
<<<<<<<
selector: 'tab-manager',
providers: [W... |
<<<<<<<
import {CommandLineBindingModel} from "cwlts/models/d2sb/CommandLineBindingModel";
import {EditorInspectorService} from "../../../editor-common/inspector/editor-inspector.service";
=======
import {Validation} from "cwlts/models/helpers/validation";
>>>>>>>
import {CommandLineBindingModel} from "cwlts/models/... |
<<<<<<<
<inputs-ports-form [@formPosition]="formPosition"
class="input-form"></inputs-ports-form>
=======
<inputs-ports-form @formPosition="formPosition"
class="input-form"
[cltModel]=... |
<<<<<<<
import {LocalRepositoryService} from "../../../repository/local-repository.service";
import {Subject} from "rxjs/Subject";
=======
import {AppHelper} from "../../helpers/AppHelper";
>>>>>>>
import {LocalRepositoryService} from "../../../repository/local-repository.service";
import {Subject} from "rxjs/Subjec... |
<<<<<<<
import {StandaloneCodeEditorComponent} from "./app/components/standalone-code-editor/standalone-code-editor.component"
import {QuickPickComponent} from "./app/components/quick-pick/quick-pick.component";
=======
import {StandaloneCodeEditorComponent} from "./app/components/standalone-code-editor/standalone-co... |
<<<<<<<
import {TreeNodeIconComponent} from "./app/components/tree-view/tree-node-icon.component";
=======
import {QuickPickComponent} from "./app/components/quick-pick/quick-pick.component";
import {CompactListComponent} from "./app/components/compact-list/compact-list.component";
import {EditableDirective} from "./... |
<<<<<<<
import {ToggleComponent} from "./components/toggle-slider/toggle-slider.component";
import {ExpressionInputComponent} from "./components/expression-input/expression-input.component";
=======
import {CoreModule} from "../core/core.module";
import {ModelExpressionEditorComponent} from "./expression-editor/model... |
<<<<<<<
import {Component, OnInit, Input, OnDestroy} from "@angular/core";
=======
import {Component, Input} from "@angular/core";
>>>>>>>
import {Component, OnInit, Input, OnDestroy} from "@angular/core";
<<<<<<<
providers: [WebWorkerService],
directives: [CodeEditorComponent, ToolContainerComponent],
===... |
<<<<<<<
<input #checkbox type="checkbox" [checked]="isChecked" (change)="toggleCheck()">
<div class="slider round" [class.disabled]="isDisabled"></div>
=======
<input type="checkbox" [checked]="value" (change)="toggleCheck()">
<div class="slider round"></div>
>>>>>>>
... |
<<<<<<<
import {BaseCommandService, BaseCommand} from "../../../../services/base-command/base-command.service";
import {BehaviorSubject} from "rxjs/BehaviorSubject";
import {ExpressionModel} from "cwlts/models/d2sb";
=======
import {FormSectionComponent} from "../../../form-section/form-section.component";
>>>>>>>
i... |
<<<<<<<
import {SBDraft2ExpressionModel} from "cwlts/models/d2sb";
=======
import {ExpressionModel} from "cwlts/models";
import {ComponentBase} from "../../../components/common/component-base";
>>>>>>>
import {ExpressionModel} from "cwlts/models"; |
<<<<<<<
import {Component, Input, OnInit, OnDestroy} from "@angular/core";
import {FormGroup, REACTIVE_FORM_DIRECTIVES, FORM_DIRECTIVES, Validators, FormControl} from "@angular/forms";
=======
import {Component, Input, OnInit, OnDestroy, Output} from "@angular/core";
import {FormGroup, REACTIVE_FORM_DIRECTIVES, FORM_... |
<<<<<<<
import {ToolContainerComponent} from "../tool-container/tool-container.component";
import {FileTreeComponent} from "../file-tree/file-tree.component";
=======
import {TabManagerComponent} from "../tab-manager/tab-manager.component";
>>>>>>>
import {TabManagerComponent} from "../tab-manager/tab-manager.compon... |
<<<<<<<
// TODO: Account changes pending
private user: User;
=======
>>>>>>>
<<<<<<<
=======
// Set the callback
this.tokenReceivedCallback = callback;
>>>>>>>
// Set the callback
this.tokenReceivedCallback = callback;
<<<<<<<
=======
>>>>>>> |
<<<<<<<
import {CompactListComponent} from "./components/compact-list/compact-list.component";
import {EditableDirective} from "./directives/editable.directive";
import {ExpressionModelListComponent} from "./components/expression-model-list/expression-model-list.componen";
=======
import {ValidationComponent} from ".... |
<<<<<<<
import {Component} from "@angular/core";
=======
import {Component, OnDestroy} from "@angular/core";
import {InputProperty} from "../../../../models/input-property.model";
>>>>>>>
import {Component, OnDestroy} from "@angular/core";
<<<<<<<
import {CommandInputParameterModel as InputProperty} from "cwlts/lib... |
<<<<<<<
modal.appID = this.dataModel.id;
const originalSubmit = modal.onSubmit;
modal.onSubmit = (...args: any[]) => {
return originalSubmit.apply(modal, args).then(appID => {
=======
>>>>>>>
modal.appID = this.dataModel.id; |
<<<<<<<
<expression-input class="col-sm-11"
[context]="context"
*ngIf="baseCommandForm.controls['baseCommand' + i]"
[(expression)]="baseCommandFormList[i]"
[contr... |
<<<<<<<
import {BasicInputSectionComponent} from "./object-inspector/basic-section/basic-input-section.component";
import {InputTypeSelectComponent} from "./common/type-select/type-select.component";
import {ReactiveFormsModule, FormsModule} from "@angular/forms";
import {InputDescriptionComponent} from "./object-inspe... |
<<<<<<<
constructor(private toolValidator: ToolValidator) { }
ngOnInit(): void {
this.isValidTool = this.toolValidator.isSupportedFileFormat(this.file);
}
changeViewMode(viewMode: string): void {
=======
private changeViewMode(viewMode: string) {
>>>>>>>
private changeViewMode(viewM... |
<<<<<<<
import {ComponentBase} from "../common/component-base";
import {IpcService} from "../../services/ipc.service";
=======
import {MenuItem} from "../menu/menu-item";
import {ComponentBase} from "../common/component-base";
>>>>>>>
import {ComponentBase} from "../common/component-base";
import {IpcService} from "... |
<<<<<<<
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/require-await */
=======
>>>>>>>
<<<<<<<
import { Constructable, DI, IContainer, ILogConfig, LoggerConfiguration, LogLevel, Registration, Writable } from '@aurelia/kernel';
import {
CustomElement,
custom... |
<<<<<<<
=======
* Mesh 渲染组件。
*/
class MeshRenderer extends paper.BaseRenderer {
protected static readonly _helpRay: Ray;
protected readonly _materials: Material[];
uninitialize(): void;
recalculateAABB(): void;
raycast(p1: Readonly<egret3d.Ray>, p2?: boolean | egr... |
<<<<<<<
import { nextId } from '@aurelia/kernel';
import { INode, IRenderLocation } from '../../dom';
import { LifecycleFlags, State } from '../../flags';
import { IController, IViewFactory } from '../../lifecycle';
import { templateController } from '../custom-attribute';
import { bindable } from '../../templating/bin... |
<<<<<<<
toArray,
=======
toArray,
Key,
ILogger,
>>>>>>>
toArray,
Key,
ILogger,
<<<<<<<
IDOM,
CustomElement
=======
IDOM,
BindingMode,
Bindable,
CustomElement,
>>>>>>>
IDOM,
BindingMode,
Bindable,
CustomElement,
<<<<<<<
@IAttrSyntaxTransformer private readonly attrSyntaxModi... |
<<<<<<<
// KEEP THIS!
public match(current) {
// const rootScope = this.router['rootScope'];
// const match = rootScope.routeTable.findMatchingRoute(current.path);
// console.log('matching route', match);
// let routes = rootScope.routeTable.routes;
// for (const route of routes) {
// co... |
<<<<<<<
import { IStartTaskManager } from '../lifecycle-task';
import { ComputedWatcher, ExpressionWatcher } from '../observation/computed-observer';
import { IObserverLocator } from '../observation/observer-locator';
import { IExpressionParser, BindingType } from '../binding/expression-parser';
import { AccessScopeExp... |
<<<<<<<
Registration,
InstanceProvider
=======
Registration,
>>>>>>>
Registration,
InstanceProvider
<<<<<<<
rootProvider: InstanceProvider<CompositionRoot<T>>,
=======
enhance: boolean = false,
>>>>>>>
rootProvider: InstanceProvider<CompositionRoot<T>>,
enhance: boolean = false,
<<<<<<... |
<<<<<<<
import { IProjections } from './custom-elements/au-slot';
=======
import { Controller } from '../templating/controller';
>>>>>>>
import { IProjections } from './custom-elements/au-slot';
import { Controller } from '../templating/controller'; |
<<<<<<<
const viewport = new ViewportContent(router.createViewportInstruction('global'), null, router.container as unknown as IRenderContext);
=======
const viewport = new ViewportContent(new ViewportInstruction('global'), null, router.container);
>>>>>>>
const viewport = new ViewportContent(router... |
<<<<<<<
public get $state(): State {
return this.binding.$state;
=======
public get part(): string | undefined {
return this.binding.part;
}
public get isBound(): boolean {
return this.binding.isBound;
>>>>>>>
public get isBound(): boolean {
return this.binding.isBound; |
<<<<<<<
callContextToDebounce: LifecycleFlags,
delay: number,
timeoutId: any,
oldValue: any
}
=======
callContextToDebounce: BindingFlags;
delay: number;
timeoutId: any;
oldValue: any;
};
>>>>>>>
callContextToDebounce: LifecycleFlags;
delay: number;
timeoutId: any;
... |
<<<<<<<
import { ILifecycle } from '../lifecycle';
import { CollectionKind, ICollectionObserver, IObservedSet, LifecycleFlags } from '../observation';
// tslint:disable:no-reserved-keywords
=======
import { BindingFlags, CollectionKind, IChangeSet, ICollectionObserver, IObservedSet } from '../observation';
>>>>>>>
i... |
<<<<<<<
const { toView } = BindingMode;
=======
import type { Scope } from '../observation/binding-context';
const { toView, oneTime } = BindingMode;
>>>>>>>
import type { Scope } from '../observation/binding-context';
const { toView } = BindingMode;
<<<<<<<
public updateTarget(value: unknown, flags: LifecycleFl... |
<<<<<<<
public bind(flags: LifecycleFlags, scope: IScope, binding: ThrottleableBinding, delay = 200) {
=======
public bind(flags: BindingFlags, scope: IScope, binding: ThrottleableBinding, delay: number = 200): void {
>>>>>>>
public bind(flags: LifecycleFlags, scope: IScope, binding: ThrottleableBinding, delay... |
<<<<<<<
slowTestThreshold: 5,
snapshotResolver: undefined,
=======
slowTestThreshold: 75,
snapshotResolver: null,
>>>>>>>
slowTestThreshold: 75,
snapshotResolver: undefined, |
<<<<<<<
readonly projections?: CustomElementDefinition[];
=======
readonly enhance?: boolean;
>>>>>>>
readonly enhance?: boolean;
readonly projections?: CustomElementDefinition[];
<<<<<<<
public readonly projections: CustomElementDefinition[],
=======
public readonly enhance: boolean,
>>>>>>>
... |
<<<<<<<
State,
=======
>>>>>>>
<<<<<<<
public $bind(flags: LifecycleFlags, scope: IScope, hostScope: IScope | null): void {
if (this.$state & State.isBound) {
=======
public $bind(flags: LifecycleFlags, scope: IScope, part?: string): void {
if (this.isBound) {
>>>>>>>
public $bind(flags: Lifecycl... |
<<<<<<<
import { AuSlotContentType } from './resources/custom-elements/au-slot';
=======
import {
CustomAttributeDefinition,
} from './resources/custom-attribute';
>>>>>>>
import { AuSlotContentType } from './resources/custom-elements/au-slot';
import {
CustomAttributeDefinition,
} from './resources/custom-attri... |
<<<<<<<
public $hostScope: IScope | null = null;
=======
public part?: string;
public $scheduler: IScheduler;
public task: ITask | null = null;
>>>>>>>
public $hostScope: IScope | null = null;
public $scheduler: IScheduler;
public task: ITask | null = null;
<<<<<<<
const previousValue = this.targe... |
<<<<<<<
export interface AuMarker extends INode { }
/*@internal*/
=======
/** @internal */
>>>>>>>
export interface AuMarker extends INode { }
/** @internal */ |
<<<<<<<
IServiceLocator,
=======
Metadata,
DI,
>>>>>>>
IServiceLocator,
Metadata,
DI,
<<<<<<<
if (this.hooks.hasDefine) {
if (this.debug) {
this.logger.trace(`invoking define() hook`);
}
=======
this.scope = Scope.create(flags, this.viewModel!, null);
const hooks = thi... |
<<<<<<<
private saveAccessToken(response: AuthResponse, authority: string, parameters: any, clientInfo: ClientInfo, idTokenObj: IdToken): AuthResponse {
=======
private saveAccessToken(response: AuthResponse, authority: string, parameters: any, clientInfo: string, idTokenObj: IdToken): AuthResponse {
... |
<<<<<<<
ICustomAttributeController,
=======
IHydratedController,
IHydratedParentController,
>>>>>>>
ICustomAttributeController,
IHydratedController,
IHydratedParentController, |
<<<<<<<
import { ChildrenObserver } from './children';
import { RegisteredProjections } from '../resources/custom-elements/au-slot';
type BindingContext<T extends INode, C extends IViewModel<T>> = IIndexable<C & {
create(
controller: IController,
definition: CustomElementDefinition,
parentContainer: ICon... |
<<<<<<<
controllers[i].parent = this;
task = controllers[i].bind(flags, scope);
=======
task = controllers[i].bind(flags, scope, this.part);
>>>>>>>
controllers[i].parent = this;
task = controllers[i].bind(flags, scope, this.part); |
<<<<<<<
public connect(flags: LifecycleFlags, scope: IScope, binding: IConnectableBinding): void { }
=======
public connect(flags: BindingFlags, scope: IScope, binding: IConnectableBinding): void {
return;
}
>>>>>>>
public connect(flags: LifecycleFlags, scope: IScope, binding: IConnectableBinding): void ... |
<<<<<<<
const template = definition.enhance === true
? definition.template as HTMLElement
: factory.createTemplate(definition.template) as HTMLTemplateElement;
=======
const template = factory.createTemplate(definition.template) as HTMLTemplateElement;
processLocalTemplates(template, definitio... |
<<<<<<<
this._sRest!.push(subscriber); // Non-null is implied by else branch of (subscriberFlags & SF.SubscribersRest) === 0
=======
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
this._sr!.push(subscriber); // Non-null is implied by else branch of (subscriberFlags & SF.Subscri... |
<<<<<<<
import { defineHiddenProp, ensureProto, isArray, isMap, isSet } from '../utilities-objects';
=======
>>>>>>>
import { defineHiddenProp, ensureProto } from '../utilities-objects';
<<<<<<<
=======
private forCollection(collection: Collection): ICollectionObserver<CollectionKind> {
const obsLocator = ... |
<<<<<<<
private parser: IExpressionParser;
constructor(parser: IExpressionParser) {
this.parser = parser;
}
=======
public static register: IRegistry['register'];
constructor(private parser: IExpressionParser) {}
>>>>>>>
public static register: IRegistry['register'];
private parser: IExpressionP... |
<<<<<<<
for (const instructionTest of instructions) {
const { instruction, viewportInstruction } = instructionTest;
=======
it(`parses viewport instruction: ${instruction}`, async function () {
const { host, router, tearDown } = await createFixture();
>>>>>>>
for (const instructionTest of ins... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.