conflict_resolution
stringlengths
27
16k
<<<<<<< var ct: Kiwi.Geom.Transform = camera.transform; ======= // Draw raw bounds and raw center >>>>>>> var ct: Kiwi.Geom.Transform = camera.transform; // Draw raw bounds and raw center <<<<<<< ctx.strokeRect(this.r...
<<<<<<< let formattedShader = this._beautify(sourceEventArg.state.value); // let formattedShader = sourceEventArg.state.value; ======= const formattedShader = this.beautify(sourceEventArg.state.value); >>>>>>> const formattedShader = this._beautify(sour...
<<<<<<< import { GraphNode } from './graph/graphNodes'; import { CosmosDBAccountNode, INode } from './nodes'; ======= import { CosmosDBAccountNode, INode, IDocumentNode, LoadMoreNode } from './nodes'; >>>>>>> import { CosmosDBAccountNode, INode, IDocumentNode, LoadMoreNode } from './nodes'; <<<<<<< import { GraphVi...
<<<<<<< release || notImplemented("public flash.net.SharedObject::static getDiskUsage"); return; ======= somewhatImplemented("public flash.net.SharedObject::static getDiskUsage"); return 0; >>>>>>> release || somewhatImplemented("public flash.net.SharedObject::static getDiskUsage"); ret...
<<<<<<< import somewhatImplemented = Shumway.Debug.somewhatImplemented; import throwError = Shumway.AVM2.Runtime.throwError; import TextFieldType = flash.text.TextFieldType; import TextFieldAutosize = flash.text.TextFieldAutoSize; ======= import asCoerceString = Shumway.AVM2.Runtime.asCoerceString; >>>>>>>...
<<<<<<< stack = [this]; var transformStack: Matrix []; var calculateTransform = !!transform; if (calculateTransform) { transformStack = [transform]; } var flagsStack: FrameFlags [] = [flags]; while (stack.length > 0) { frame = stack.pop(); if (calculate...
<<<<<<< var character = DisplayObject.createAnimatedDisplayObject(state, false); this.addChildAtDepth(character, state.depth); if (state.symbol.isAS2Object) { this._initAvm1Bindings(character, state); } } } _initAvm1Bindings(instance: DisplayObject, state: Shumwa...
<<<<<<< return this._loaderUrl; ======= if (!this._loader) { // For the instance of the main class of the SWF file, this URL is the // same as the SWF file's own URL. // The loaderURL value can be changed by player settings. var service: IRootElementService = Shumway.AVM2....
<<<<<<< PathPaymentOperation: { destinationAccount: resolvers.account, destinationAsset: resolvers.asset, sourceAsset: resolvers.asset, path: resolvers.asset }, CreatePassiveSellOfferOperation: { assetBuying: resolvers.asset, assetSelling: resolvers.asset }, ManageSellOfferOperation: {...
<<<<<<< ======= if (hasBits & UpdateFrameTagBits.HasColorTransform) { frame.colorMatrix = this._readColorMatrix(); } if (hasBits & UpdateFrameTagBits.HasMiscellaneousProperties) { frame.blendMode = input.readInt(); // TODO: Should make a proper flag for this. input.re...
<<<<<<< operations(first: Int, after: String, last: Int, before: String, order: Order): OperationConnection ======= operation(id: String): Operation operations(first: Int, after: String, last: Int, before: String): OperationConnection >>>>>>> operations(first: Int, after: String, last: Int, before: S...
<<<<<<< child.dispatchEvent(addedEvent); // ADDED event handlers may remove the child from the stage, in such cases // we should not dispatch the ADDED_TO_STAGE event. ======= child.dispatchEvent(Event.getInstance(Event.ADDED, true)); >>>>>>> child.dispatchEvent(Event.getInstance(Event....
<<<<<<< static staticBindings: string [] = null; // []; static bindings: string [] = null; // []; constructor(font: string = null, size: ASObject = null, color: ASObject = null, bold: ASObject = null, italic: ASObject = null, underline: ASObject = null, url: string = null, t...
<<<<<<< this._server = new Remoting.Server(this._frameContainer); this._keyboardEventDispatcher = new KeyboardEventDispatcher(); ======= this._context = new Shumway.Remoting.Server.ChannelDeserializerContext(this._frameContainer); >>>>>>> this._keyboardEventDispatcher = new KeyboardEventDispa...
<<<<<<< public events: any [] = null, public variableName: string = null) { ======= public events: any [] = null) { if (matrix && symbol instanceof TextSymbol) { this.matrix = this.matrix.clone(); this.matrix.translate(-40, -40); } >>>>>>> ...
<<<<<<< ======= import notImplemented = Shumway.Debug.notImplemented; import asCoerceString = Shumway.AVM2.Runtime.asCoerceString; >>>>>>> <<<<<<< static staticBindings: string [] = null; static bindings: string [] = null; constructor() { super(); ======= // List of static symbols ...
<<<<<<< static classInitializer: any = function () { Event = flash.events.Event; }; static initializer: any = null; ======= static classInitializer: any = null; static initializer: any = function () { var self: DisplayObjectContainer = this; self._tabChildren = true; self....
<<<<<<< _dirty() { if (this._parent) { this._propagateFlags(DisplayObjectFlags.DirtyChild, Direction.Upward); } } /** * WIP */ ======= >>>>>>> _dirty() { if (this._parent) { this._propagateFlags(DisplayObjectFlags.DirtyChild, Direction.Upward); } ...
<<<<<<< ======= import notImplemented = Shumway.Debug.notImplemented; import asCoerceString = Shumway.AVM2.Runtime.asCoerceString; >>>>>>> <<<<<<< static staticBindings: string [] = null; static bindings: string [] = null; constructor() { super(); ======= // List of static symbols ...
<<<<<<< ======= import notImplemented = Shumway.Debug.notImplemented; import asCoerceString = Shumway.AVM2.Runtime.asCoerceString; >>>>>>> <<<<<<< static staticBindings: string [] = null; static bindings: string [] = null; constructor() { super(); ======= // List of static symbols ...
<<<<<<< import { Colors, Layout } from "../../../../style"; ======= import layout from "../../../../style/layout"; >>>>>>> import { Layout } from "../../../../style"; <<<<<<< }, track: { height: 2, borderRadius: 1 }, thumb: { width: SIZE_THUMB_SLIDER, height: SIZE_THUMB_SLIDER, borderRad...
<<<<<<< import { Balance, ITrade, Operation, PaymentOperations, Transaction } from "../../model"; ======= import { IHorizonOperationData, IHorizonTradeData, IHorizonTransactionData } from "../../datasource/types"; import { IBalance, Operation, Trade, Transaction } from "../../model"; >>>>>>> import { IBalance, ITra...
<<<<<<< this.glTexture.dispose(WebGLCapabilities.webgl); ======= if (this._isBuiltin) { return; } this.glTexture.dispose(WebGLKit.webgl); >>>>>>> if (this._isBuiltin) { return; } this.glTexture.dispos...
<<<<<<< textAlignmentProperty, textTransformProperty ======= >>>>>>> <<<<<<< import { TextAlignment } from '@nativescript/core/ui/text-base'; ======= import { TextTransform, textTransformProperty } from '@nativescript/core/ui/text-base'; >>>>>>> import { TextTransform, textAlignmentProperty , textTransfo...
<<<<<<< ======= type SortOrder = "desc" | "asc"; interface IForwardPagingParams { first: number; after: string; } interface IBackwardPagingParams { last: number; before: string; } type PagingParams = IForwardPagingParams & IBackwardPagingParams; >>>>>>> interface IForwardPagingParams { first: number; ...
<<<<<<< /** * Document common VT features here that are currently unsupported */ // @vt: unsupported DCS SIXEL "SIXEL Graphics" "DCS Ps ; Ps ; Ps ; q Pt ST" "Draw SIXEL image starting at cursor position." // @vt: unsupported CSI SL "Scroll Left" "CSI Ps SP @" "Scroll viewport `Ps` times to th...
<<<<<<< export * from "./assets"; export * from "./operations"; export * from "./payments"; export * from "./trades"; export * from "./transactions"; ======= export * from "./effects"; export * from "./order_book"; export * from "./pathfinding"; export * from "./trades"; >>>>>>> export * from "./trades";
<<<<<<< ======= import { NULL_CELL_CHAR, NULL_CELL_CODE, NULL_CELL_WIDTH, CHAR_DATA_CHAR_INDEX, CHAR_DATA_ATTR_INDEX, DEFAULT_ATTR } from './Buffer'; >>>>>>> import { CHAR_DATA_CHAR_INDEX, CHAR_DATA_ATTR_INDEX, DEFAULT_ATTR } from './Buffer';
<<<<<<< import { ITheme, IMarker, IDisposable, ISelectionPosition, ILinkProvider } from 'xterm'; import { DomRenderer } from './renderer/dom/DomRenderer'; ======= import { ITheme, IMarker, IDisposable, ISelectionPosition } from 'xterm'; import { DomRenderer } from 'browser/renderer/dom/DomRenderer'; >>>>>>> import {...
<<<<<<< import { IParsingState, IDcsHandler, IEscapeSequenceParser } from 'common/parser/Types'; import { NULL_CELL_CODE, NULL_CELL_WIDTH, Attributes, FgFlags, BgFlags, Content } from 'common/buffer/Constants'; ======= import { IParsingState, IDcsHandler, IEscapeSequenceParser, IParams } from 'common/parser/Types'; i...
<<<<<<< private _screenDprMonitor: ScreenDprMonitor; ======= private _isPaused: boolean = false; private _needsFullRefresh: boolean = false; >>>>>>> private _screenDprMonitor: ScreenDprMonitor; private _isPaused: boolean = false; private _needsFullRefresh: boolean = false; <<<<<<< this._screenDprMo...
<<<<<<< import { IEventEmitter } from 'xterm'; import { IEvent, EventEmitter2 } from './EventEmitter2'; import { IDeleteEvent, IInsertEvent } from './CircularList'; ======= export interface IDisposable { dispose(): void; } export interface IEventEmitter { on(type: string, listener: (...args: any[]) => void): voi...
<<<<<<< import { MockCoreService, MockBufferService, MockDirtyRowService, MockOptionsService, MockLogService, MockCoreMouseService, MockUnicodeService } from 'common/TestUtils.test'; ======= import { MockCoreService, MockBufferService, MockDirtyRowService, MockOptionsService, MockLogService, MockCoreMouseService, Moc...
<<<<<<< import { CircularList, IInsertEvent } from './common/CircularList'; import { ITerminal, IBuffer, IBufferLine, BufferIndex, IBufferStringIterator, IBufferStringIteratorResult, ICellData } from './Types'; ======= import { CircularList, IInsertEvent, IDeleteEvent } from './common/CircularList'; import { ITermina...
<<<<<<< import { listenOffers, orderBook } from "./service/dex"; ======= import { OperationsStorage, TransactionsStorage } from "./storage"; >>>>>>> import { listenOffers, orderBook } from "./service/dex"; import { OperationsStorage, TransactionsStorage } from "./storage"; <<<<<<< assets: HorizonAssetsDataSource;...
<<<<<<< import { BaseHorizonDataSource, HorizonOperationsDataSource, HorizonPaymentsDataSource, HorizonTradesDataSource, HorizonTransactionsDataSource } from "./datasource/horizon"; ======= >>>>>>> <<<<<<< context: ({ req, connection }) => { // initialize datasources manually only for subscripti...
<<<<<<< code * charAtlasCellWidth, colorIndex * charAtlasCellHeight, charAtlasCellWidth, this._scaledCharHeight, x * this._scaledCellWidth + this._scaledCharLeft, y * this._scaledCellHeight + this._scaledCharTop, this._scaledCharWidth, this...
<<<<<<< import { IEvent } from 'common/EventEmitter'; ======= import { IEvent } from 'common/EventEmitter2'; import { IBuffer, IBufferSet } from 'common/buffer/Types'; >>>>>>> import { IEvent } from 'common/EventEmitter'; import { IBuffer, IBufferSet } from 'common/buffer/Types';
<<<<<<< import { Disposable } from 'common/Lifecycle'; ======= import { IBufferSet, IBuffer } from 'common/buffer/Types'; >>>>>>> import { Disposable } from 'common/Lifecycle'; import { IBufferSet, IBuffer } from 'common/buffer/Types'; <<<<<<< ======= this._bufferService = new BufferService(this.optionsServic...
<<<<<<< import { BufferLine, CellData } from './BufferLine'; ======= import { FILL_CHAR_DATA } from './Buffer'; import { BufferLine } from './BufferLine'; >>>>>>> import { BufferLine, CellData } from './BufferLine'; <<<<<<< import { NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE, DEFAULT_ATTR } from './Buffer'; =...
<<<<<<< import { BufferLine, CellData } from './BufferLine'; import { reflowLargerApplyNewLayout, reflowLargerCreateNewLayout, reflowLargerGetLinesToRemove, reflowSmallerGetNewLineLengths, getWrappedLineTrimmedLength } from './BufferReflow'; ======= import { BufferLine, CellData, AttributeData } from './BufferLine'; ...
<<<<<<< import { Params } from 'common/parser/Params'; ======= import { MockCoreService } from 'common/TestUtils.test'; >>>>>>> import { Params } from 'common/parser/Params'; import { MockCoreService } from 'common/TestUtils.test';
<<<<<<< getBlankLine(attr: number, isWrapped?: boolean): IBufferLine; ======= stringIndexToBufferIndex(lineIndex: number, stringIndex: number): number[]; iterator(trimRight: boolean, startIndex?: number, endIndex?: number): IBufferStringIterator; >>>>>>> getBlankLine(attr: number, isWrapped?: boolean): IBuff...
<<<<<<< reverseWraparound: false, ======= sendFocus: false, >>>>>>> reverseWraparound: false, sendFocus: false,
<<<<<<< import { CircularList, IInsertEvent, IDeleteEvent } from './common/CircularList'; import { CharData, ITerminal, IBuffer, IBufferLine, BufferIndex, IBufferStringIterator, IBufferStringIteratorResult, IBufferLineConstructor } from './Types'; ======= import { CircularList } from './common/CircularList'; import {...
<<<<<<< self._keyUp(ev); }, true); ======= }, true)); >>>>>>> self._keyUp(ev); }, true)); <<<<<<< this.element.addEventListener('mousedown', (e: MouseEvent) => this.selectionManager.onMouseDown(e)); this.selectionManager.on('refresh', data => this.renderer.onSelectionChanged(data.s...
<<<<<<< import { HorizonAssetsDataSource } from "../../src/datasource/horizon"; import { Account, AccountData, Offer, TrustLine } from "../../src/orm/entities"; ======= import { Account } from "../../src/orm/entities/account"; import { AccountData } from "../../src/orm/entities/account_data"; >>>>>>> import { Offer,...
<<<<<<< function addRow(html: string) { const element = document.createElement('div'); element.innerHTML = html; container.appendChild(element); rows.push(element); } ======= describe('before attachToDom', () => { it('should allow link matcher registration', done => { assert.doesNotThr...
<<<<<<< let fitAddon: FitAddon; let searchAddon: SearchAddon; let serializeAddon: SerializeAddon; ======= >>>>>>> <<<<<<< document.getElementById('webgl').addEventListener('click', () => term.loadAddon(new WebglAddon())); document.getElementById('serialize').addEventListener('click', serializeButtonHandler); =...
<<<<<<< import { concat, utf32ToString } from './common/TypedArrayUtils'; import { StringToUtf32, stringFromCodePoint } from './core/input/TextDecoder'; import { CellData } from './BufferLine'; ======= import { concat } from './common/TypedArrayUtils'; import { StringToUtf32, stringFromCodePoint, utf32ToString } from...
<<<<<<< import { IBufferService, ICoreService, ILogService, IOptionsService, ITerminalOptions, IPartialTerminalOptions, IDirtyRowService, ICoreMouseService, IUnicodeService, IUnicodeVersionProvider } from 'common/services/Services'; ======= import { IBufferService, ICoreService, ILogService, IOptionsService, ITermina...
<<<<<<< operations(first: Int, after: String, last: Int, before: String, order: Order): OperationConnection ======= operations(first: Int, after: String, last: Int, before: String): OperationConnection payments(first: Int, after: String, last: Int, before: String): OperationConnection >>>>>>> operati...
<<<<<<< Terminal.applyAddon(winptyCompat); ======= Terminal.applyAddon(webLinks); const isWindows = ['Windows', 'Win16', 'Win32', 'WinCE'].indexOf(navigator.platform) >= 0; if (isWindows) { Terminal.applyAddon(winptyCompat); } >>>>>>> const isWindows = ['Windows', 'Win16', 'Win32', 'WinCE'].indexOf(navigator.platf...
<<<<<<< } export function slice<T extends TypedArray>(array: T, start?: number, end?: number): T { // all modern engines that support .slice if (array.slice) { return array.slice(start, end) as T; } return sliceFallback(array, start, end); } export function sliceFallback<T extends TypedArray>(array: T, st...
<<<<<<< private _reflowLargerAdjustViewport(newCols: number, countRemoved: number): void { const nullCell = this.getNullCell(DEFAULT_ATTR); ======= private _reflowLargerAdjustViewport(newCols: number, newRows: number, countRemoved: number): void { >>>>>>> private _reflowLargerAdjustViewport(newCols: number...
<<<<<<< import { BufferLine, CellData } from './BufferLine'; import { CircularList } from './common/CircularList'; import { IBufferLine } from './Types'; import { NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE, DEFAULT_ATTR } from './Buffer'; ======= import { BufferLine } from './BufferLine'; import { CircularList, ...
<<<<<<< const width = this._cell.width; ======= const attr = this._cell.fg; const width = this._cell.getWidth(); >>>>>>> const width = this._cell.getWidth(); <<<<<<< charElement.textContent = this._cell.chars || WHITESPACE_CELL_CHAR; const swapColor = this._cell.isInverse(); ...
<<<<<<< getCoords(event: { clientX: number, clientY: number }, element: HTMLElement, charMeasure: ICharMeasure, lineHeight: number, colCount: number, rowCount: number, isSelection?: boolean): [number, number]; getRawByteCoords(event: MouseEvent, element: HTMLElement, charMeasure: ICharMeasure, lineHeight: number, c...
<<<<<<< import { RenderDebouncer } from '../utils/RenderDebouncer'; ======= import { ScreenDprMonitor } from '../utils/ScreenDprMonitor'; >>>>>>> import { RenderDebouncer } from '../utils/RenderDebouncer'; import { ScreenDprMonitor } from '../utils/ScreenDprMonitor'; <<<<<<< this._renderDebouncer = new RenderDe...
<<<<<<< setRenderer(renderer: any): void { throw new Error('Method not implemented.'); } ======= onBlur: IEvent<void>; onFocus: IEvent<void>; onA11yChar: IEvent<string>; onA11yTab: IEvent<number>; >>>>>>> setRenderer(renderer: any): void { throw new Error('Method not implemented.'); } onBlu...
<<<<<<< import { ISearchHelper, ISearchAddonTerminal, ISearchOptions, ISearchResult, ISearchIndex } from './Interfaces'; const nonWordCharacters = ' ~!@#$%^&*()+`-=[]{}|\;:"\',./<>?'; ======= import { ISearchHelper, ISearchAddonTerminal, ISearchOptions, ISearchResult } from './Interfaces'; const NON_WORD_CHARACTERS ...
<<<<<<< // TODO: All mouse handling should be pulled into its own file. ======= // TODO: these event listeners should be managed by the disposable, the Terminal reference may // be kept aroud if Terminal.dispose is fired when the mouse is down >>>>>>> // TODO: All mouse handling should be p...
<<<<<<< '<span class="xterm-fg-1 xterm-bg-257">a</span>' + '<span> </span>' ======= '<span class="xterm-fg-1 xterm-bg-15">a</span>' >>>>>>> '<span class="xterm-fg-1 xterm-bg-257">a</span>' <<<<<<< '<span class="xterm-fg-257 xterm-bg-1">a</span>' + '<span> ...
<<<<<<< import { CircularList, IInsertEvent, IDeleteEvent } from './common/CircularList'; import { ITerminal, IBuffer, IBufferLine, BufferIndex, IBufferStringIterator, IBufferStringIteratorResult, ICellData } from './Types'; import { EventEmitter } from './common/EventEmitter'; ======= >>>>>>> import { CircularList,...
<<<<<<< const consoleLog = console.log; ======= const CONSOLE_LOG = console.log; >>>>>>> const consoleLog = console.log; <<<<<<< const cols = 80; const rows = 25; ======= const COLS = 80; const ROWS = 25; >>>>>>> const cols = 80; const rows = 25; <<<<<<< xterm = new Terminal({ cols: cols...
<<<<<<< import { KeyboardResultType, ICharset } from './core/Types'; import { WebglRenderer } from './renderer/webgl/WebglRenderer'; ======= import { KeyboardResultType, ICharset, IBufferLine, IAttributeData } from './core/Types'; >>>>>>> import { WebglRenderer } from './renderer/webgl/WebglRenderer'; import { Keybo...
<<<<<<< // get the buffer index as [absolute row, col] for the match // load the attrs at that pos and underline const bufferIndex = this._terminal.buffer.stringIndexToBufferIndex(rowIndex, stringIndex); const line = this._terminal.buffer.lines.get(bufferIndex[0]); const char = line.get(bu...
<<<<<<< import { BufferLine, CellData } from '../../BufferLine'; import { IBufferLine } from '../../Types'; ======= import { BufferLine } from '../../BufferLine'; import { IBufferLine, ITerminalOptions } from '../../Types'; >>>>>>> import { BufferLine, CellData } from '../../BufferLine'; import { IBufferLine, ITermi...
<<<<<<< before(async function(): Promise<any> { browser = await puppeteer.launch({ headless: process.argv.indexOf('--headless') !== -1, args: [`--window-size=${width},${height}`, `--no-sandbox`] }); page = (await browser.pages())[0]; await page.setViewport({ width, height }); await pag...
<<<<<<< if (!this.mouseEvents) { // Convert wheel events into up/down events when the buffer does not have scrollback, this // enables scrolling in apps hosted in the alt buffer such as vim or tmux. if (!this.buffer.hasScrollback) { const amount = this.viewport.getLinesScrolled(e...
<<<<<<< import { ITerminalOptions } from 'xterm'; import { pollFor, timeout, writeSync, getBrowserType } from './TestUtils'; import { Browser, Page } from 'playwright'; ======= import { pollFor, timeout, writeSync, openTerminal } from './TestUtils'; >>>>>>> import { pollFor, timeout, writeSync, openTerminal, getBrow...
<<<<<<< private static performSymlink(installDirectory: string, previouslyLinkedFiles: string[]): string[] | R2Error { const fs = FsProvider.instance; ======= private static performLink(installDirectory: string, previouslyLinkedFiles: string[]): string[] | R2Error { >>>>>>> private static perform...
<<<<<<< this.eventHub.on("afterRender", () => { this.invokePlugins("afterRender"); }); ======= this.hookPlugins(); >>>>>>> this.hookPlugins(); this.eventHub.on("afterRender", () => { this.invokePlugins("afterRender"); });
<<<<<<< private scale: number = 1; ======= /** Current scale of the document */ private scale = 1; >>>>>>> /** Current scale of the document */ private scale = 1; <<<<<<< this.paper.node.addEventListener("mousewheel", ev => { // Cancel the mousewheel event if a drag event is ...
<<<<<<< const manager = await CustomRulePathManager.create({}); const classpathEntries = await manager.addPathsForLanguage(language, paths); ======= const manager = await CustomRulePathManager.create(); const classpathEntries = await manager.addPathsForLanguage(language, path); >>>>>>> const manager = awai...
<<<<<<< <input class="ng2-flatpickr-input {{ addClass }}" [placeholder]="placeholder" [tabindex]="tabindex" type="text" data-input> </div>`, ======= <input *ngIf="!hideButton" class="ng2-flatpickr-input" [placeholder]="placeholder" type="text" data-input> <ng-content></ng-content> </div> `, >>>>>>> ...
<<<<<<< this.implementation = node.implementation; this.sslVerification = node.sslVerification; this.chainAddress = node.onChainAddress; ======= this.accessKey = node.accessKey; this.implementation = node.implementatio...
<<<<<<< import { Injectable, Inject } from '@angular/core' import { AlertController } from '@ionic/angular' ======= import { StorageProvider, SettingsKey } from './../storage/storage' import { Injectable } from '@angular/core' import { AlertController, Platform } from '@ionic/angular' >>>>>>> import { Injectable, In...
<<<<<<< import { BeaconRequestPage } from './pages/beacon-request/beacon-request.page' import { BeaconRequestPageModule } from './pages/beacon-request/beacon-request.module' ======= import { ExtensionsService } from './services/extensions/extensions.service' >>>>>>> import { BeaconRequestPage } from './pages/beacon-...
<<<<<<< import { supportsDelegation } from 'src/app/helpers/delegation' // import 'core-js/es7/object' ======= import { timer, Subscription } from 'rxjs' >>>>>>> import { supportsDelegation } from 'src/app/helpers/delegation' import { timer, Subscription } from 'rxjs' <<<<<<< private readonly pushBackendProvid...
<<<<<<< public delegateeLabel: string = 'Validator' ======= public airGapDelegatee?: string = 'cosmosvaloper1n3f5lm7xtlrp05z9ud2xk2cnvk2xnzkm2he6er' public delegateeLabel: string = 'delegation-detail-cosmos.delegatee-label' public delegateeLabelPlural: string = 'delegation-detail-cosmos.delegatee-label-plura...
<<<<<<< public delegatedAmount: string private readonly validatorAddress: string = 'cosmosvaloper1sjllsnramtg3ewxqwwrwjxfgc4n4ef9u2lcnj0' public validatorInfo: CosmosValidatorInfo ======= public delegatedAmount: BigNumber public validatorAddress: string = 'cosmosvaloper1sjllsnramtg3ewxqwwrwjxfgc4n4ef9u2lcnj...
<<<<<<< import { ProtocolDelegationExtensions } from './ProtocolDelegationExtensions' const supportedActions = [ SubstrateStakingActionType.BOND_NOMINATE, SubstrateStakingActionType.BOND_EXTRA, SubstrateStakingActionType.CANCEL_NOMINATION, SubstrateStakingActionType.CHANGE_NOMINATION, SubstrateStakingAction...
<<<<<<< const migrateAction: ButtonAction<TezosDelegateActionResult, void> = new ButtonAction( { name: 'account-transaction-list.migrate_label', icon: 'return-down-back-outline', identifier: 'migrate-action' }, ======= const migrateAction = new ButtonAction<void, AirGapTezosMigrateActionContext>( ...
<<<<<<< import moment from 'moment' const hoursPerCycle = 68 ======= import moment from 'moment' >>>>>>> import moment from 'moment' const hoursPerCycle = 68 <<<<<<< public isDelegated: boolean public nextPayout: Date ======= public isDelegated: boolean public nextPayout: Date = moment() .add(476, ...
<<<<<<< import { switchMap, map } from 'rxjs/operators' import { from } from 'rxjs' import { UIAccountSummary } from 'src/app/models/widgets/display/UIAccountSummary' import { ShortenStringPipe } from 'src/app/pipes/shorten-string/shorten-string.pipe' import { TranslateService } from '@ngx-translate/core' const hoursP...
<<<<<<< import { AlertOptions } from '@ionic/core' import { AirGapDelegatorAction } from 'src/app/interfaces/IAirGapCoinDelegateProtocol' ======= import { AlertOptions } from '@ionic/angular/node_modules/@ionic/core' import { TranslateService } from '@ngx-translate/core' >>>>>>> import { AlertOptions } from '@ionic/...
<<<<<<< //TODO this._readRenderTarget = RenderTexture.create({ width: stage.viewport.w, height: stage.viewport.h, depthBuffer: true }).setRepeat(false).retain(); this._writeRenderTarget = RenderTexture.create({ width: stage.viewport.w, height: stage.viewport.h, depthBuffer: true }).s...
<<<<<<< import { ICoinProtocol } from 'airgap-coin-lib' ======= import { Platform } from '@ionic/angular' import { ICoinProtocol, supportedProtocols } from 'airgap-coin-lib' import { SubProtocolType } from 'airgap-coin-lib/dist/protocols/ICoinSubProtocol' import { NetworkType } from 'airgap-coin-lib/dist/utils/Protoc...
<<<<<<< }, { path: 'delegation-detail/:id', resolve: { special: DataResolverService }, loadChildren: () => import('./pages/delegation-detail/delegation-detail.module').then(m => m.DelegationDetailPageModule) ======= }, { path: 'exchange-select', loadChildren: () => import('./page...
<<<<<<< import { WidgetSelector } from './widget-selector/widget-selector' import { WidgetIconText } from './widget-icon-text/widget-icon-text' import { WidgetInputText } from './widget-input-text/widget-input-text' import { WidgetAccount } from './widget-account/widget-account' import { WidgetRewardList } from './wid...
<<<<<<< import { Component } from '@angular/core' import { Events, ModalController } from 'ionic-angular' import { IntroductionPage } from '../introduction/introduction' import { PortfolioPage } from '../portfolio/portfolio' import { ScanPage } from '../scan/scan' import { SettingsPage } from '../settings/settings' im...
<<<<<<< import { ProtocolSymbols } from './../../services/protocols/protocols' import { handleErrorSentry, ErrorCategory } from 'src/app/services/sentry-error-handler/sentry-error-handler' import { DataServiceKey } from './../../services/data/data.service' import { ValidatorService, CosmosValidatorInfo } from './../../...
<<<<<<< let deleteUUid: string = this.stateData.cachePrefabUUid; if (deleteUUid) { let gameObj = Editor.editorModel.getGameObjectByUUid(deleteUUid); ======= let deleteUUid: string = this.data.cachePrefabUUid; let gameObj = this.editor...
<<<<<<< ======= export async function newFolder(data: any){ console.log(data); let file_path = paths.projects + data.currentProject + '/' + data.newFolder; if (await file_manager.directory_exists(file_path)){ data.error = 'failed, folder ' + data.newFolder + ' already exists!'; return; } await file_manag...
<<<<<<< import { AirGapWallet } from '@airgap/coinlib-core' ======= import { AirGapWallet, MessageSignResponse } from 'airgap-coin-lib' >>>>>>> import { AirGapWallet, MessageSignResponse } from '@airgap/coinlib-core'
<<<<<<< import { ProtocolService } from '@airgap/angular-core' import { Component, Input, OnChanges } from '@angular/core' import { IACMessageDefinitionObject, IAirGapTransaction, ICoinProtocol, SignedTransaction, UnsignedTransaction } from '@airgap/coinlib-core' ======= import { ProtocolService, SerializerService } ...
<<<<<<< resetFields: (newValues?: Props) => void; validate: (names?: string | string[], option?: validateOptions) => Promise<any>; validateField: ( ======= resetFields: () => void; validate: <T = any>(names?: string | string[], option?: validateOptions) => Promise<T>; validateField: <T = any>( >>>>>>> ...
<<<<<<< }; /* Fill the address/amount inputs with data from QR code */ export const onQrScan = (parsedUri: ParsedURI, outputId: number) => (dispatch: Dispatch) => { const { address = '', amount } = parsedUri; dispatch(handleAddressChange(outputId, address)); if (amount) dispatch(handleAmountChange(outp...
<<<<<<< import { Discovery, PartialDiscovery, DISCOVERY_STATUS } from '@wallet-reducers/discoveryReducer'; ======= import { add as addNotification } from '@wallet-actions/notificationActions'; import { Discovery, PartialDiscovery, STATUS } from '@wallet-reducers/discoveryReducer'; >>>>>>> import { add as addNotifica...