conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
public static clone(url: string, path: string, progress: (progress: number) => void): Promise<void> {
return GitProcess.exec([ 'clone', url, path ], path)
}
=======
/** Add a new remote with the given URL. */
public static addRemote(path: string, name: string, url: string): Promise<void> {
r... |
<<<<<<<
const withUpdatedGitHubRepository = updatedRepository.withGitHubRepository(
gitHubRepository.withAPI(apiRepo)
=======
return updatedRepository.withGitHubRepository(
updatedGitHubRepository.withAPI(apiRepo)
>>>>>>>
const withUpdatedGitHubRepository = updatedRepository.withGitHubReposit... |
<<<<<<<
stashEntriesCreatedOutsideDesktop: 0,
errorWhenSwitchingBranchesWithUncommmittedChanges: 0,
=======
rebaseCurrentBranchMenuCount: 0,
>>>>>>>
stashEntriesCreatedOutsideDesktop: 0,
errorWhenSwitchingBranchesWithUncommmittedChanges: 0,
rebaseCurrentBranchMenuCount: 0, |
<<<<<<<
/** Change the current image diff type. */
public changeImageDiffType(type: ImageDiffType): Promise<void> {
return this.appStore._changeImageDiffType(type)
}
=======
/** Prompt the user to authenticate for a generic git server. */
public promptForGenericGitAuthentication(
repository: Repos... |
<<<<<<<
declare function requestIdleCallback(fn: () => void, options?: { timeout: number }): number
// these changes should be pushed into the Electron declarations
declare namespace NodeJS {
// tslint:disable-next-line:interface-name
interface Process extends EventEmitter {
once(event: 'uncaughtException', l... |
<<<<<<<
import { git, envForAuthentication, expectedAuthenticationErrors, IGitExecutionOptions } from './core'
=======
import {
git,
envForAuthentication,
expectedAuthenticationErrors,
gitNetworkArguments,
} from './core'
>>>>>>>
import {
git,
envForAuthentication,
expectedAuthenticationErrors,
IGit... |
<<<<<<<
'add-local-repository' | 'create-branch' | 'show-branches' |
'add-repository'
=======
'add-local-repository' | 'create-branch' |
'show-branches' | 'remove-repository'
>>>>>>>
'add-local-rep... |
<<<<<<<
import { Branch } from '../local-git-operations'
=======
import { IAPIUser } from '../../lib/api'
>>>>>>>
import { Branch } from '../local-git-operations'
import { IAPIUser } from '../../lib/api' |
<<<<<<<
/** Should the app check and warn the user about committing large files? */
export function enableFileSizeWarningCheck(): boolean {
return enableDevelopmentFeatures()
}
/** Should the app use the MergeConflictsDialog component and flow? */
export function enableMergeConflictsDialog(): boolean {
return true... |
<<<<<<<
=======
const allSelected = newFiles.every(f => f.include)
const noneSelected = newFiles.every(f => !f.include)
let includeAll: boolean | null = null
if (allSelected) {
includeAll = true
} else if (noneSelected) {
includeAll = false
}
const workingDirectory = new Wor... |
<<<<<<<
initiateAuthRequest(requestUrl: string, params: RedirectParams): Promise<void> {
this.authModule.logger.verbose("RedirectHandler.initiateAuthRequest called");
=======
async initiateAuthRequest(requestUrl: string, params: RedirectParams): Promise<void> {
>>>>>>>
async initiateAuthRequest(r... |
<<<<<<<
import { TokenResponse } from "./RequestInfo";
import { Account } from "./Account";
=======
import { User } from "./User";
>>>>>>>
import { Account } from "./Account";
<<<<<<<
export type tokenReceivedCallback = (errorDesc: string, token: string, error: string, tokenType: string, accountState: string ) => v... |
<<<<<<<
import { DiffSelection, ITextDiff } from '../../models/diff'
=======
import { getTagsToPush, storeTagsToPush } from './helpers/tags-to-push-storage'
>>>>>>>
import { getTagsToPush, storeTagsToPush } from './helpers/tags-to-push-storage'
import { DiffSelection, ITextDiff } from '../../models/diff' |
<<<<<<<
import { ITenantDiscoveryResponse } from './ITenantDiscoveryResponse';
=======
import TelemetryManager from "../telemetry/TelemetryManager";
>>>>>>>
import { ITenantDiscoveryResponse } from './ITenantDiscoveryResponse';
import TelemetryManager from "../telemetry/TelemetryManager"; |
<<<<<<<
const result = await git([ 'log', revisionRange, `--max-count=${limit}`, `--pretty=${prettyFormat}`, '-z', '--no-color', ...additionalArgs ], repository.path)
=======
const result = await git([ 'log', start, `--max-count=${limit}`, `--pretty=${prettyFormat}`, '-z', '--no-color' ], repository.path, { ... |
<<<<<<<
const user = this.getUserForRepository(repository)
=======
>>>>>>> |
<<<<<<<
export async function getRemotes(repository: Repository): Promise<ReadonlyArray<string>> {
const result = await git([ 'remote' ], repository.path, 'getRemotes')
const lines = result.stdout
const rows = lines.split('\n')
return rows.filter(r => r.trim().length > 0)
=======
export async function getRemo... |
<<<<<<<
const promises = []
if (repositories.length > 15) {
=======
const eligibleRepositories = repositories.filter(repo => !repo.missing)
if (eligibleRepositories.length > 15) {
>>>>>>>
if (repositories.length > 15) {
<<<<<<<
for (const repo of repositories) {
promises.push(this.re... |
<<<<<<<
import { RepositorySection, Popup, PopupType, Foldout, FoldoutType } from '../app-state'
=======
import {
RepositorySection,
Popup,
PopupType,
Foldout,
FoldoutType,
} from '../app-state'
import { Action } from './actions'
>>>>>>>
import {
RepositorySection,
Popup,
PopupType,
Foldout,
Fold... |
<<<<<<<
import { withTrampolineEnvForRemoteOperation } from '../trampoline/trampoline-environment'
import { merge } from '../merge'
=======
import { envForRemoteOperation } from './environment'
import { getDefaultBranch } from '../helpers/default-branch'
>>>>>>>
import { withTrampolineEnvForRemoteOperation } from '.... |
<<<<<<<
highlightAppMenuToolbarButton: this.highlightAppMenuToolbarButton,
windowOpen: this.windowOpen,
=======
highlightAccessKeys: this.highlightAccessKeys,
>>>>>>>
highlightAccessKeys: this.highlightAccessKeys,
windowOpen: this.windowOpen, |
<<<<<<<
/** Clone the repository to the path. */
public static clone(url: string, path: string, progress: (progress: string) => void): Promise<void> {
return GitProcess.exec([ 'clone', '--progress', '--', url, path ], __dirname, undefined, process => {
process.stderr.on('data', (chunk: string) => {
... |
<<<<<<<
if (output.length === 0) {
// the merge commit will be empty - this is fine!
return { kind: MergeResultKind.Clean, entries: [] }
}
console.time('parseMergeResult')
const mergeResult = parseMergeResult(output)
console.timeEnd('parseMergeResult')
return mergeResult
=======
return parseMe... |
<<<<<<<
console.log('Parsing license metadata…')
generateLicenseMetadata(outRoot)
=======
moveAnalysisFiles()
>>>>>>>
console.log('Parsing license metadata…')
generateLicenseMetadata(outRoot)
moveAnalysisFiles() |
<<<<<<<
import { IMenuItem } from '../menu-item'
=======
import {
ShowSideBySideDiffDefault,
getShowSideBySideDiff,
setShowSideBySideDiff,
} from '../../ui/lib/diff-mode'
>>>>>>>
import { IMenuItem } from '../menu-item'
import {
ShowSideBySideDiffDefault,
getShowSideBySideDiff,
setShowSideBySideDiff,
} ... |
<<<<<<<
import { Branch } from '../../lib/local-git-operations'
=======
import { Branch } from '../local-git-operations'
>>>>>>>
import { Branch } from '../local-git-operations'
<<<<<<<
/** Rename the branch to a new name. */
public renameBranch(repository: Repository, branch: Branch, newName: string): Promise... |
<<<<<<<
return enableBetaFeatures()
=======
return enableDevelopmentFeatures()
}
/**
* Enables a new UI for the repository picker that supports
* grouping and filtering (GitHub) repositories by owner/organization.
*/
export function enableGroupRepositoriesByOwner(): boolean {
return enableBetaFeatures()
... |
<<<<<<<
/**
* Remove the repositories represented by the given IDs from local storage.
*
* When `moveToTrash` is enabled, only the repositories that were successfully
* deleted on disk are removed from the app. If some failed due to files being
* open elsewhere, an error is thrown.
*/
public async... |
<<<<<<<
public constructor(name: string, owner: Owner, dbID: number | null, private_: boolean | null = null, fork: boolean | null = null, htmlURL: string | null = null, defaultBranch: string | null = 'master', cloneURL: string | null = null) {
=======
/** Create a new GitHubRepository from its data-only represent... |
<<<<<<<
import { ClientTestUtils } from "./ClientTestUtils";
=======
import { ClientTestUtils, MockStorageClass } from "./ClientTestUtils";
import { B2cAuthority } from "../../src/authority/B2cAuthority";
>>>>>>>
import { ClientTestUtils, MockStorageClass } from "./ClientTestUtils";
<<<<<<<
afterEach(() => {
... |
<<<<<<<
RadioCheckboxComponent,
RadioGroupComponent,
=======
Error403Component,
RadioCheckboxComponent,
>>>>>>>
RadioCheckboxComponent,
RadioGroupComponent,
Error403Component, |
<<<<<<<
import { Error403Component } from "../pages/error403/error403.component";
=======
import {RadioCheckboxComponent} from "../primary-components/radio-checkbox/radio-checkbox.component";
>>>>>>>
import { Error403Component } from "../pages/error403/error403.component";
import {RadioCheckboxComponent} from "../pr... |
<<<<<<<
public platform;
=======
public assetType = [];
public assetSelected: any;
>>>>>>>
public platform;
public assetType = [];
public assetSelected: any;
<<<<<<<
=======
if (changedFilter.label === 'ASSET TYPE') {
this.assetSelected = changedFilter.selected.replace(/ /g, "_")
... |
<<<<<<<
api_doc_name: "https://{api_doc_name}.s3.amazonaws.com",
envName: "oss",
multi_env: {multi_env},
slack_support: {slack_support},
serviceTabs: ["{overview}", "{access control}", "{metrics}", "{logs}", "{cost}"],
environmentTabs: ["{env_overview}", "{deployments}", "{code quality}", "{assets}", "{env_... |
<<<<<<<
this.serviceList.serviceCall();
=======
this.servicelist.serviceCall();
this.showToastPending(
'Service is getting ready',
this.toastmessage.customMessage('successPending', 'createService'),
);
>>>>>>>
this.serviceList.serviceCall();
this.showToastPending(
... |
<<<<<<<
deploymentDescriptorTextJava = javaTemplate.template;
deploymentDescriptorTextNodejs = nodejsTemplate.template;
deploymentDescriptorTextgo = goTemplate.template;
deploymentDescriptorTextpython = pythonTemplate.template;
deploymentDescriptorText = this.deploymentDescriptorTextNodejs;
startNew:boolean... |
<<<<<<<
import {OrderByPipe} from '../core/pipes/order-by.pipe';
=======
import { CopyElementComponent } from '../secondary-components/copy-element/copy-element.component';
>>>>>>>
import {OrderByPipe} from '../core/pipes/order-by.pipe';
import { CopyElementComponent } from '../secondary-components/copy-element/cop... |
<<<<<<<
// export { default as useKeyboardJs } from './useKeyboardJs';
export { default as useKeyPress } from './useKeyPress';
export { default as useKeyPressEvent } from './useKeyPressEvent';
export { default as useLifecycles } from './useLifecycles';
export { default as useList } from './useList';
export { default as... |
<<<<<<<
export const off = (obj: any, ...args: any[]) => obj.removeEventListener(...args);
export type FnReturningPromise = (...args: any[]) => Promise<any>;
export type PromiseType<P extends Promise<any>> = P extends Promise<infer T> ? T : never;
=======
export const off = (obj: any, ...args: any[]) => obj.removeE... |
<<<<<<<
this.spaCacheManager.removeAllAccessTokens(this.clientConfig.auth.clientId, authorityUri, "", homeAccountIdentifier);
=======
this.cacheManager.removeAllAccessTokens(this.config.authOptions.clientId, authorityUri, "", homeAccountIdentifier);
>>>>>>>
this.spaCacheManager.removeAllAcces... |
<<<<<<<
import { commands, Disposable, workspace, window, TreeView, ExtensionContext } from "vscode";
import { launchWebDashboard, updatePreferences } from "./DataController";
=======
import { commands, Disposable, workspace, window, TreeView } from "vscode";
import { launchWebDashboard } from "./DataController";
>>... |
<<<<<<<
subscriptions.push(
registerCommand('gatsbyhub.openBrowser', Utilities.openBrowser)
);
=======
subscriptions.push(
createTreeView('commands', {
treeDataProvider: new CommandProvider(),
})
);
>>>>>>>
subscriptions.push(
registerCommand('gatsbyhub.openBrowser', Utilities.openBrowser)
);
subsc... |
<<<<<<<
// eslint-disable-next-line object-curly-newline
import { ExtensionContext, commands, window, workspace, Uri } from 'vscode';
import * as path from 'path';
import GatsbyCli from './commands/gatsbycli';
import PluginProvider from './models/PluginProvider';
=======
import * as vscode from "vscode";
import { Ext... |
<<<<<<<
import * as vscode from "vscode";
import { ExtensionContext, commands, window } from "vscode";
import GatsbyCli from "./commands/gatsbycli";
import StatusBar from "./utils/statusBarItem";
import PluginProvider from "./models/PluginProvider";
import Plugin from "./models/Plugin";
import EachPlugin from "./models... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
this._contextualHost = this._container;
this.disposeModal = this.disposeModal;
=======
this._contextualHost = this._container;
>>>>>>>
this._contextualHost = this._container; |
<<<<<<<
// var button = new fabric.Button(_container, {
// "clickHandler": function(e) {
// }
// }
// );
=======
>>>>>>>
// var button = new fabric.Button(_container, {
// "clickHandler": function(e) {
... |
<<<<<<<
import { PerPageMessageCount, MessageStatus } from '@/utils/constants'
import { delMedia } from '@/utils/util'
=======
import { PerPageMessageCount, MessageStatus, messageType } from '@/utils/constants'
>>>>>>>
import { delMedia } from '@/utils/util'
import { PerPageMessageCount, MessageStatus, messageType }... |
<<<<<<<
getMessagesByIds(messageIds: any) {
return db.prepare(`SELECT * FROM messages WHERE message_id IN (${messageIds.map(() => '?').join(',')})`).all(messageIds)
}
=======
findMessageById(messageId: any, userId: any) {
return db.prepare('SELECT * FROM messages WHERE message_id = ? AND user_id = ?').... |
<<<<<<<
import { remote, nativeImage, ipcRenderer } from 'electron'
import { MimeType } from '@/utils/constants'
=======
import { remote, nativeImage } from 'electron'
import { MimeType, messageType } from '@/utils/constants'
>>>>>>>
import { remote, nativeImage, ipcRenderer } from 'electron'
import { MimeType, mess... |
<<<<<<<
id: `arc-${this.options.id}`,
d: SvgTagsHelper.describeArc(this.coordinates.x, this.coordinates.y, this.radius, startAngle, endAngle),
class: `background-circle ${customCssClass}`,
=======
"id": `arc-${this.options.id}`,
"d": SvgTagsHelper.describeAr... |
<<<<<<<
public drawContainer = (additionalAttributes?: object) => {
=======
public drawContainer = () => {
const {minX, minY, width, height} = this.getViewBoxParams();
>>>>>>>
public drawContainer = (additionalAttributes?: object) => {
const {minX, minY, width, height} = this.getViewBoxP... |
<<<<<<<
id: `arc-${this.options.id}`,
class: `foreground-circle ${customCssClass}`,
d: SvgTagsHelper.describeArc(this.coordinates.x, this.coordinates.y, this.radius, 0, endAngle),
=======
"id": `arc-${this.options.id}`,
"class": "foreground-circle",
... |
<<<<<<<
this.createInstancePropertyDescriptorListener(name);
=======
this.createInstancePropertyDescriptorListener(key, descriptor, prototype);
>>>>>>>
this.createInstancePropertyDescriptorListener(name, descriptor, prototype);
<<<<<<<
const na... |
<<<<<<<
if (interactionType === Constants.interactionTypePopup) {
// Generate a popup window
try {
popUpWindow = this.openPopup("about:blank", "msal", Constants.popUpWidth, Constants.popUpHeight);
// Push popup window handle onto stack for tracking
... |
<<<<<<<
template?: string;
context?: { [name: string]: any; };
transporterName?: string;
=======
template?: string;
context?: {
[name: string]: any;
};
attachments?: {
filename: string,
contents?: any,
path?: string,
contentType?: string
cid: string
}[]
>>>>>>>
t... |
<<<<<<<
config: {[key: string]: any};
fields: Field[];
=======
>>>>>>>
config: {[key: string]: any}; |
<<<<<<<
import { formatError, uniqBy, Predicate, groupBy } from '../common/utils';
import { Repository, RefType, UpstreamRef } from '../typings/git';
=======
import { formatError, uniqBy, Predicate } from '../common/utils';
import { Repository, RefType, UpstreamRef, Branch } from '../typings/git';
>>>>>>>
import { f... |
<<<<<<<
const repository = new GitHubRepository(remote, this._credentialStore, this._telemetry);
await repository.resolveRemote();
=======
const repository = new GitHubRepository(remote, this._credentialStore);
resolveRemotePromises.push(repository.resolveRemote());
>>>>>>>
const repository = new... |
<<<<<<<
import { Repository } from '../git/api';
import { Comment } from './comment';
=======
import { Repository } from '../typings/git';
import { IRawFileChange } from '../github/interface';
>>>>>>>
import { Repository } from '../git/api';
import { IRawFileChange } from '../github/interface'; |
<<<<<<<
import { GitErrorCodes } from './git/api';
=======
import { GitErrorCodes } from './typings/git';
import { Comment } from './common/comment';
import { PullRequestManager } from './github/pullRequestManager';
import { PullRequestModel } from './github/pullRequestModel';
>>>>>>>
import { GitErrorCodes } from '... |
<<<<<<<
import { TimelineEvent, EventType, ReviewEvent } from '../common/timelineEvent';
=======
import { exec } from '../common/git';
import { TimelineEvent, EventType, ReviewEvent, CommitEvent } from '../common/timelineEvent';
>>>>>>>
import { TimelineEvent, EventType, ReviewEvent, CommitEvent } from '../common/ti... |
<<<<<<<
const gitChangeType = getGitChangeType(review.status);
let originalFileExist = false;
=======
let originalFileExist;
>>>>>>>
let originalFileExist = false; |
<<<<<<<
import { IPullRequestModel, IPullRequestManager, ITelemetry } from '../github/interface';
import { Repository, GitErrorCodes, Branch } from '../git/api';
=======
import { ITelemetry } from '../github/interface';
import { Repository, GitErrorCodes, Branch } from '../typings/git';
>>>>>>>
import { ITelemetry }... |
<<<<<<<
export function convertIssuesCreateCommentResponseToComment(comment: Octokit.IssuesCreateCommentResponse | Octokit.IssuesEditCommentResponse, githubRepository: GitHubRepository): IComment {
=======
export function convertIssuesCreateCommentResponseToComment(comment: Octokit.IssuesCreateCommentResponse | Octok... |
<<<<<<<
import { IPullRequestManager, IPullRequestModel, IPullRequestsPagingOptions, PRType, ReviewEvent, ITelemetry, IPullRequestEditData, IRawPullRequest, IRawFileChange } from './interface';
=======
import { IPullRequestsPagingOptions, PRType, ReviewEvent, ITelemetry, IPullRequestEditData, PullRequest, IRawFileCha... |
<<<<<<<
import Github = require('@octokit/rest');
=======
import * as Octokit from '@octokit/rest';
>>>>>>>
import Octokit = require('@octokit/rest'); |
<<<<<<<
import { Configuration } from '../authentication/configuration';
import { formatError } from '../common/utils';
import { GitHubManager } from '../authentication/githubserver';
=======
import { Configuration } from "../configuration";
import { formatError, uniqBy } from '../common/utils';
>>>>>>>
import { Con... |
<<<<<<<
import { AuthResponse, buildResponseStateOnly, setResponseIdToken } from "./AuthResponse";
// default authority
=======
import { AuthResponse, buildResponseStateOnly } from "./AuthResponse";
import TelemetryManager from "./telemetry/TelemetryManager";
import { TelemetryPlatform, TelemetryConfig } from './tel... |
<<<<<<<
export type RefreshTokenRequest = {
scopes: Array<string>;
=======
export type RefreshTokenRequest = BaseAuthRequest & {
>>>>>>>
export type RefreshTokenRequest = BaseAuthRequest & {
<<<<<<<
redirectUri?: string;
authority?: string;
};
=======
};
>>>>>>>
redirectUri?: string;
}; |
<<<<<<<
import { Type } from "@thi.ng/malloc";
import * as assert from "assert";
import { AttribPool } from "../src/attrib-pool";
=======
import { Type } from "@thi.ng/api";
import { AttribPool } from "../src/attrib-pool";
// import * as assert from "assert";
>>>>>>>
import { Type } from "@thi.ng/api";
import * as a... |
<<<<<<<
import { MatOpM } from "./api";
import { invert33, invert44 } from "./invert";
import { mat44to33 } from "./m44-m33";
import { transpose33, transpose44 } from "./transpose";
=======
import { MatOpMU } from "./api";
import { invert33 } from "./invert";
import { mat44to33 } from "./m44-m33";
import { transpose3... |
<<<<<<<
path: '', data: { preload: true, }, loadChildren: './components/components/components.module#ComponentsModule',
}, {
// preload: true loads the module immediately
path: '', data: { preload: true, }, loadChildren: './components/echarts/components.module#ComponentsModule',
}, {
path: '**', red... |
<<<<<<<
import { BuildComponent } from './build/build.component';
=======
import { ProjectService } from './project.service';
>>>>>>>
import { BuildComponent } from './build/build.component';
import { ProjectService } from './project.service'; |
<<<<<<<
import { primaryColor } from '../../build/config/lessModifyVars';
=======
import { primaryColor, themeMode } from '../../build/config/themeConfig';
import { isProdMode } from '/@/utils/env';
>>>>>>>
import { primaryColor, themeMode } from '../../build/config/themeConfig'; |
<<<<<<<
export { CommonAuthorizationUrlRequest } from "./request/CommonAuthorizationUrlRequest";
export { CommonAuthorizationCodeRequest } from "./request/CommonAuthorizationCodeRequest";
export { CommonRefreshTokenRequest } from "./request/CommonRefreshTokenRequest";
export { CommonClientCredentialRequest } from "./re... |
<<<<<<<
url = URLToolkit.buildAbsoluteURL(self.location.href, url, { alwaysNormalize: true });
=======
this.stopLoad();
const media = this.media;
if (media && this.url) {
this.detachMedia();
this.attachMedia(media);
}
url = URLToolkit.buildAbsoluteURL(window.location.href, url, { a... |
<<<<<<<
this.media = media;
this.emit(Events.MEDIA_ATTACHING, { media: media });
=======
this._media = media;
this.trigger(HlsEvents.MEDIA_ATTACHING, { media: media });
>>>>>>>
this._media = media;
this.emit(Events.MEDIA_ATTACHING, { media: media });
<<<<<<<
this.emit(Events.MEDIA_DETACH... |
<<<<<<<
private _trySkipBufferHole (partial: Fragment | null): number {
const { hls, media } = this;
=======
private _trySkipBufferHole (partial: Fragment | null) {
const { config, hls, media } = this;
>>>>>>>
private _trySkipBufferHole (partial: Fragment | null): number {
const { config, hls, medi... |
<<<<<<<
private unparsedVttFrags: Array<FragLoadedData | FragDecryptedData> = [];
private cueRanges: Record<string, Array<[number, number]>> = {};
=======
private unparsedVttFrags: Array<{ frag: Fragment, payload: ArrayBuffer }> = [];
>>>>>>>
private unparsedVttFrags: Array<FragLoadedData | FragDecryptedData... |
<<<<<<<
import { BufferHelper } from '../utils/buffer-helper';
=======
import EventHandler from '../event-handler';
import { BufferHelper, Bufferable } from '../utils/buffer-helper';
>>>>>>>
import { BufferHelper, Bufferable } from '../utils/buffer-helper';
<<<<<<<
import Hls from '../hls';
import { FragLoadingData... |
<<<<<<<
import { logger } from '../utils/logger';
import type { TimelineController } from '../controller/timeline-controller';
import type { CaptionScreen } from './cea-608-parser';
=======
import { CaptionScreen } from './cea-608-parser';
import type TimelineController from '../controller/timeline-controller';
>>>... |
<<<<<<<
export type BufferInfo = {
len: number,
start: number,
end: number,
nextStart?: number,
};
=======
const noopBuffered: TimeRanges = {
length: 0,
start: () => 0,
end: () => 0
};
>>>>>>>
export type BufferInfo = {
len: number,
start: number,
end: number,
nextStart?: number,
};
const no... |
<<<<<<<
onSubtitleFragProcessed (event: Events.SUBTITLE_FRAG_PROCESSED, data: SubtitleFragProcessed) {
const { frag } = data;
=======
onSubtitleFragProcessed (data: SubtitleFragProcessed) {
const { frag, success } = data;
>>>>>>>
onSubtitleFragProcessed (event: Events.SUBTITLE_FRAG_PROCESSED, data: Sub... |
<<<<<<<
async handleServerTokenResponse(
serverTokenResponse: ServerAuthorizationTokenResponse,
authority: Authority,
cachedNonce?: string,
cachedState?: string,
requestScopes?: string[],
oboAssertion?: string,
handlingRefreshTokenResponse?: boolean): Promise<... |
<<<<<<<
code = {
templateInterpolationExercise: displayAngularComponentWithHtml(baseCode, `<h1>Hello, {{user.firstName}}</h1>`),
parentComponentSkeleton: {
code: `import { Component } from '@angular/core';
@Component({
selector: 'parent',
template: '<child>...</child>'
})
export class ParentCompo... |
<<<<<<<
if (active) {
setTimeout(() => introJs().start(), 1000);
=======
// check if both tours ran TODO: unhardcode this check
if (active && localStorage.numTours <= 2) {
setTimeout(() => introJs().start(), 2000);
localStorage.numTours = +localStorage.numTours + 1;
>>>>>>>
... |
<<<<<<<
import {Component, ElementRef, HostListener, Input} from '@angular/core';
=======
import {Component, ElementRef, HostListener, OnInit} from '@angular/core';
>>>>>>>
import {Component, ElementRef, HostListener, OnInit, Input} from '@angular/core';
<<<<<<<
export class ResizeComponent {
@Input() isVertical... |
<<<<<<<
import { SimpleTestsProgressComponent } from '@codelab/utils/src/lib/test-results/simple-tests-progress/simple-tests-progress.component';
=======
import { DirectivesModule } from '../directives/directives.module';
import { SimpleTestsProgressComponent } from './tests-progress/simple-tests-progress.component'... |
<<<<<<<
import { AngularFireModule } from 'angularfire2';
import { AngularFireDatabaseProvider } from 'angularfire2/database';
=======
import { NgModule } from '@angular/core';
>>>>>>>
import { AngularFireModule } from 'angularfire2';
import { AngularFireDatabaseProvider } from 'angularfire2/database';
import { NgMo... |
<<<<<<<
declarations: [FeedbackPageComponent, DateRangeComponent],
providers: [GithubService],
=======
declarations: [FeedbackPageComponent],
>>>>>>>
declarations: [FeedbackPageComponent, DateRangeComponent], |
<<<<<<<
const accessTokenValue = new AccessTokenValue(parameters[Constants.accessToken], idTokenObj.rawIdToken, expiresIn, clientInfo);
=======
const accessTokenValue = new AccessTokenValue(parameters[Constants.accessToken], response.idToken.rawIdToken, expiration.toString(), clientInfo);
>>>>>>>
c... |
<<<<<<<
const USER_ENDPOINT: IDBEndpoint = 'v3_users' as any
=======
// TODO - fix links to main repo and handle with prefix_endpoint type checking
const USER_ENDPOINT = 'v3_users'
>>>>>>>
const USER_ENDPOINT: IDBEndpoint = 'v3_users' as any
// TODO - fix links to main repo and handle with prefix_endpoint type check... |
<<<<<<<
const testResource = "https://login.contoso.com/endpt";
expect(() => spaResponseHandler.createTokenResponse(testServerParams, `${Constants.DEFAULT_AUTHORITY}/`, testResource, RANDOM_TEST_GUID)).to.throw(ClientAuthErrorMessage.invalidIdToken.desc);
expect(() => spaResponseHand... |
<<<<<<<
login: `${CA_BASE_URL}/tods/api/lgn`,
logout: `${CA_BASE_URL}/tods/api/lgout`,
list: `${CA_BASE_URL}/tods/api/vhcllst`,
lock: `${CA_BASE_URL}/tods/api/drlck`,
unlock: `${CA_BASE_URL}/tods/api/drulck`,
start: `${CA_BASE_URL}/tods/api/rfon`,
stop: `${CA_BASE_URL}/tods/api/rfoff`,
myAccount: `${CA_... |
<<<<<<<
expect(html).not.toContain('<div id="marp-vscode" data-zoom="1">')
expect(html).not.toContain('<style id="marp-vscode-style">')
expect(html).not.toContain('svg')
expect(html).not.toContain('img')
=======
for (const markdown of [baseMd, confusingMd]) {
const html = extendM... |
<<<<<<<
import { isPrimitive } from '../utils/objects';
import * as stateManager from '../state-manager'
=======
import * as gate from './gate'
import { mergeValidationRules, showValidationErrorsFromServer } from '../validation/validation';
import { DotvvmPostbackError } from '../shared-classes';
>>>>>>>
import * as... |
<<<<<<<
_initialUrl: string
=======
_initialUrl: string,
_validationRules: ValidationRuleTable,
_stateManager: StateManager<RootViewModel>
>>>>>>>
_initialUrl: string,
_stateManager: StateManager<RootViewModel>
<<<<<<<
replaceTypeInfo(thisViewModel.typeMetadata);
const viewModel: Ro... |
<<<<<<<
const allEvents = { ...dotvvm.events, ...validationEvents };
for (const event of keys(allEvents)) {
if ("subscribe" in (allEvents as any)[event]) {
function h(args: any) {
if (consoleOutput) {
console.debug("Event " + event, args.postbackId ?? "")
... |
<<<<<<<
constructor(public sender: HTMLElement | undefined, public viewModel: any, public viewModelName: string, public validationTargetPath: any, public serverResponseObject: any, public postbackClientId: number) {
=======
constructor(public sender: HTMLElement, public viewModel: any, public viewModelName: s... |
<<<<<<<
export const postbackHandlersStarted = new DotvvmEvent<{}>("dotvvm.events.postbackHandlersStarted");
export const postbackHandlersCompleted = new DotvvmEvent<{}>("dotvvm.events.postbackHandlersCompleted");
export const postbackResponseReceived = new DotvvmEvent<{}>("dotvvm.events.postbackResponseReceived");
exp... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.