conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
Init(drawTo: IDisplayContext): void {
if (!this.Params) {
this.Params = {
playbackRate: 1,
reverse: false,
startPosition: 0,
endPosition: null,
loop: true,
loopStart: 0,
loopEn... |
<<<<<<<
import IDisplayContext = etch.drawing.IDisplayContext;
=======
import {IPowerSource} from './IPowerSource';
>>>>>>>
import IDisplayContext = etch.drawing.IDisplayContext;
import {IPowerSource} from './IPowerSource'; |
<<<<<<<
import Source = require("../Source");
import AudioChain = require("../../Core/Audio/Connections/AudioChain");
import ISketchContext = Fayde.Drawing.ISketchContext;
=======
import {IAudioChain} from '../../Core/Audio/Connections/IAudioChain';
import {IBlock} from '../IBlock';
import {Logic} from './Logic/Logic... |
<<<<<<<
super.Init(drawTo);
=======
this.BlockName = "Momentary Power";
super.Init(sketch);
>>>>>>>
Init(drawTo: IDisplayContext): void {
super.Init(drawTo);
this.BlockName = "Momentary Power";
super.Init(sketch);
<<<<<<<
this.DrawSprite("momentary switch");
... |
<<<<<<<
Init(drawTo: IDisplayContext): void {
if (!this.Params) {
this.Params = {
gain: 1,
monitor: true,
};
}
=======
Init(sketch?: any): void {
this.BlockName = "Microphone";
this.Defaults = {
gain: 1,
... |
<<<<<<<
import Soundcloud = require("../Sources/Soundcloud");
=======
import BlocksSketch = require("../../BlocksSketch");
>>>>>>>
import BlocksSketch = require("../../BlocksSketch");
import Soundcloud = require("../Sources/Soundcloud"); |
<<<<<<<
export class Recorder extends SamplerBase {
=======
import IApp = require("../../IApp");
declare var App: IApp;
class Recorder extends SamplerBase {
>>>>>>>
declare var App: IApp;
export class Recorder extends SamplerBase { |
<<<<<<<
import {AnimationsLayer} from './UI/AnimationsLayer';
import {Audio} from './Core/Audio/Audio';
import {ColorThemes} from './UI/ColorThemes';
import {CommandManager} from './Core/Commands/CommandManager';
import {Commands} from './Commands';
import {CommandHandlerFactory} from './Core/Resources/CommandHandlerFa... |
<<<<<<<
import AudioChain = require("../Core/Audio/Connections/AudioChain");
import DisplayObject = require("../DisplayObject");
import Grid = require("../Grid");
import IBlock = require("./IBlock");
import IDisplayObject = require("../IDisplayObject");
import MainScene = require("../MainScene");
import ObservableColle... |
<<<<<<<
import Grid = require("../../Grid");
import MainScene = require("../../MainScene");
import Source = require("../Source");
import SamplerBase = require("./SamplerBase");
import ISketchContext = Fayde.Drawing.ISketchContext;
=======
import {IApp} from '../../IApp';
import {MainScene} from '../../MainScene';
imp... |
<<<<<<<
public InitJson;
=======
private _Timer: Fayde.ClockTimer;
private _LastVisualTick: number = new Date(0).getTime();
>>>>>>>
public InitJson;
private _Timer: Fayde.ClockTimer;
private _LastVisualTick: number = new Date(0).getTime();
<<<<<<<
var psTween = new TWEEN.Tween({x:pan... |
<<<<<<<
import PostEffect = require("../PostEffect");
import Grid = require("../../../Grid");
import MainScene = require("../../../MainScene");
import ISketchContext = Fayde.Drawing.ISketchContext;
=======
import {MainScene} from '../../../MainScene';
import {PostEffect} from '../PostEffect';
>>>>>>>
import {MainSce... |
<<<<<<<
.forEach((index) => {
// reuse one of the invalid/old elements, or create a new element
const element = invalidElements.pop()
|| this.createAndAddElement()
this.configureElement(this._layout, element, index)
this.getAndApplyElementPosition(this._layout, element, i... |
<<<<<<<
}, contentTypeHeader);
// authentication (petstore_auth) required
// oauth required
if (configuration.accessToken) {
fetchOptions.headers = Object.assign({
"Authorization": "Bearer " + configuration.accessToken,
}, contentTypeHe... |
<<<<<<<
export {default as Dropdown} from "../vue/dropdown.vue";
export {default as File} from "../vue/file.vue";
=======
export {default as Dropdown} from "../vue/dropdown.vue";
export {default as MatrixDropdown} from "../vue/matrixdropdown.vue";
export {default as Errors} from "../vue/errors.vue";
>>>>>>>
export {... |
<<<<<<<
=======
import { assign } from "lodash";
import { AdaptiveElement } from "../../src/action-bar";
>>>>>>>
import { AdaptiveElement } from "../../src/action-bar";
<<<<<<<
model.canGrow = true;
var manager = new ResponsibilityManager(<any>container, <any>model, 5);
=======
model.canGrowValue = true;
... |
<<<<<<<
import { IActionBarItem } from "../../../base";
import { ObjectWrapper } from "../../../utils/objectwrapper";
=======
>>>>>>>
import { IActionBarItem } from "../../../action-bar";
<<<<<<<
export class AdaptiveElement {
=======
export interface IActionBarItem {
/**
* Unique string id
*/
id: strin... |
<<<<<<<
import { JsonObject } from "../src/jsonobject";
import { FlowPanelModel } from "../src/flowpanel";
=======
import { JsonObject, JsonUnknownPropertyError } from "../src/jsonobject";
import { QuestionPanelDynamicModel } from "../src/question_paneldynamic";
>>>>>>>
import { JsonObject, JsonUnknownPropertyError ... |
<<<<<<<
export {default as MultipleText} from "../vue/multipletext.vue";
export {default as Dropdown} from "../vue/dropdown.vue";
=======
export {default as MultipleText} from "../vue/multipletext.vue";
export {default as Matrix} from "../vue/matrix.vue";
>>>>>>>
export {default as MultipleText} from "../vue/multipl... |
<<<<<<<
=======
import { QuestionFactory } from "../src/questionfactory";
import { settings } from "../src/settings";
>>>>>>>
import { settings } from "../src/settings"; |
<<<<<<<
export {default as OtherChoice} from '../vue/otherChoice.vue';
export {default as Comment} from '../vue/comment.vue';
=======
export {default as OtherChoice} from '../vue/otherChoice.vue';
export {default as Rating} from "../vue/rating.vue";
>>>>>>>
export {default as OtherChoice} from '../vue/otherChoice.vu... |
<<<<<<<
// common
export * from '../basetests';
export * from '../choicesRestfulltests';
export * from '../conditionstests';
export * from '../jsonobjecttests';
export * from '../surveyLocalizationTests';
export * from '../surveyquestiontests';
export * from '../surveyserializationtests';
export * from '../surveytests'... |
<<<<<<<
if (element === document.body) {
return <any>window;
}
=======
>>>>>>> |
<<<<<<<
import { SchemaDirectiveVisitor } from 'graphql-tools';
import { ModuleSessionInfo } from '../src/module-session-info';
=======
import { SchemaDirectiveVisitor, makeExecutableSchema } from 'graphql-tools';
>>>>>>>
import { SchemaDirectiveVisitor, makeExecutableSchema } from 'graphql-tools';
import { ModuleSe... |
<<<<<<<
type MockResponse<T> = {
res: EventEmitter,
} & T;
const createMockSession = <T>(customProps?: T): MockResponse<T> => {
=======
type MockSession<T> = { res: EventEmitter } & T;
const createMockSession = <T>(customProps?: T): MockSession<T> => {
>>>>>>>
type MockSession<T> = { res: EventEmitte... |
<<<<<<<
import { IResolvers, makeExecutableSchema, SchemaDirectiveVisitor, mergeSchemas } from 'graphql-tools';
=======
import { IResolvers, makeExecutableSchema, SchemaDirectiveVisitor, ILogger, mergeSchemas } from 'graphql-tools';
>>>>>>>
import { IResolvers, makeExecutableSchema, SchemaDirectiveVisitor, ILogger, ... |
<<<<<<<
import { DependencyModuleNotFoundError, SchemaNotValidError, DependencyModuleUndefinedError, TypeDefNotFoundError } from './errors';
import deepmerge = require('deepmerge');
import { ModuleSessionInfo } from './module-session-info';
import { asArray } from './utils';
import { ModuleContext } from './types';
==... |
<<<<<<<
const keyCode = this.inputService.rawValue.charCodeAt(this.inputService.rawValue.length - 1);
const rawValueLength = this.inputService.rawValue.length;
const rawValueSelectionEnd = this.inputService.inputSelection.selectionEnd;
const storedRawValueLength = this.inputService.store... |
<<<<<<<
import { HighlightPipe } from './classes/highlight.pipe';
import { AnsiColorizePipe } from './classes/ansi-colorize.pipe';
import { RunScriptsDirective } from './classes/run-scripts.directive';
=======
import {PreviewPipe} from "./classes/preview.pipe";
>>>>>>>
import { HighlightPipe } from './classes/highl... |
<<<<<<<
import { Base64ImageComponent } from './base64-image/base64-image.component';
import { CustomMarkdownComponent } from './custom-markdown/custom-markdown.component';
=======
import { PlotlyComponent } from './plotly/plotly.component';
>>>>>>>
import { PlotlyComponent } from './plotly/plotly.component';
import... |
<<<<<<<
import { SnackbarComponent } from './snackbar/snackbar.component';
=======
import { Base64ImageComponent } from './base64-image/base64-image.component';
import { CustomMarkdownComponent } from './custom-markdown/custom-markdown.component';
>>>>>>>
import { SnackbarComponent } from './snackbar/snackbar.compon... |
<<<<<<<
/**
* Copyright 2017 Plexus Interop Deutsche Bank AG
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licens... |
<<<<<<<
/**
* Copyright 2017 Plexus Interop Deutsche Bank AG
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licens... |
<<<<<<<
import { AppConnectedActionParams, PlexusConnectedActionParams, StudioState } from '../model';
=======
import { PlexusConnectedActionParams, StudioState, ConsumedMethodState } from "../model";
>>>>>>>
import { AppConnectedActionParams, PlexusConnectedActionParams, StudioState, ConsumedMethodState } from '../... |
<<<<<<<
export { default as createContentModelGroup } from "./createContentModelGroup";
export { default as createAccessToken } from "./createAccessToken";
=======
export { default as createContentModelGroup } from "./createContentModelGroup";
export { default as createEnvironmentAlias } from "./createEnvironmentAlia... |
<<<<<<<
import { HandlerContextPlugin } from "@webiny/handler/types";
import { HandlerContextDb } from "@webiny/handler-db/types";
import { I18NLocale } from "@webiny/api-i18n/types";
=======
import { ContextPlugin } from "@webiny/handler/types";
import { DbContext } from "@webiny/handler-db/types";
>>>>>>>
import {... |
<<<<<<<
private examineTag(local: INodeVars[], decl: ts.ClassDeclaration, tag: string, attrs: Attribute[], location: StartTagLocationInfo) {
=======
private examineTag(local: INodeVars[], decl: ts.DeclarationStatement, tag: string, attrs: Attribute[], line: number) {
>>>>>>>
private examineTag(local: INo... |
<<<<<<<
=======
this._attachmentService.loadStateForProject(projectId),
this._tagService.loadStateForProject(projectId),
>>>>>>>
this._tagService.loadStateForProject(projectId), |
<<<<<<<
import {unique} from '../../../util/unique';
=======
import {T} from '../../../t.const';
>>>>>>>
import {unique} from '../../../util/unique';
import {T} from '../../../t.const'; |
<<<<<<<
private _value;
private _msValue;
=======
@HostListener('input', ['$event.target.value']) _onInput(value: string) {
const msVal = this._stringToMs.transform(value);
this._value = this._msToString.transform(msVal, this.isAllowSeconds, true);
this._onChangeCallback(msVal);
}
>>>>>>>
<<<<<<... |
<<<<<<<
import { DialogMigrateComponent } from './dialog-migrate/dialog-migrate.component';
=======
import { JiraIssueState } from '../../issue/jira/jira-issue/store/jira-issue.reducer';
import { GitIssueState } from '../../issue/git/git-issue/store/git-issue.reducer';
>>>>>>>
import { DialogMigrateComponent } from ... |
<<<<<<<
import {HueValue} from 'angular-material-css-vars';
=======
import {Tag} from '../tag/tag.model';
>>>>>>>
import {HueValue} from 'angular-material-css-vars';
import {Tag} from '../tag/tag.model';
<<<<<<<
=======
taskTag?: EntityState<Tag>;
issue?: IssueStateMap;
>>>>>>>
taskTag?: EntityState<Tag>; |
<<<<<<<
this.worldService.currentWorld$.subscribe(world => {
this.currentWorld = world;
this.selectWorld();
});
this.worldService.worlds$.subscribe(worlds => {
this.worlds = worlds;
this.selectWorld();
})
}
selectWorld(){
if(this.worlds && this.currentWorld){
this.... |
<<<<<<<
import { ErrorResponse, Response } from "@webiny/graphql";
import { GraphQLFieldResolver } from "@webiny/graphql/types";
import { FormBuilderSettingsCRUD } from "../../types";
=======
import { ErrorResponse, Response } from "@webiny/handler-graphql/responses";
import { GraphQLFieldResolver } from "@webiny/han... |
<<<<<<<
import {Subscriber} from 'rxjs/Subscriber';
import { Subject } from 'rxjs';
=======
import {tap} from 'rxjs/operators';
import * as moment from 'moment';
>>>>>>>
import { Subject } from 'rxjs';
import {tap} from 'rxjs/operators';
import * as moment from 'moment'; |
<<<<<<<
import AlertTriggerConditionThresholdComponent
from '../components/alerts/alert/triggers/conditions/trigger-condition-threshold.component';
import AlertTriggerConditionThresholdRangeComponent
from '../components/alerts/alert/triggers/conditions/trigger-condition-threshold-range.component';
import AlertTrigg... |
<<<<<<<
'picture': application.picture,
'background': application.background
=======
'picture': application.picture,
'disable_membership_notifications': application.disable_membership_notifications,
>>>>>>>
'picture': application.picture,
'disable_membership_notificati... |
<<<<<<<
import * as remark from "remark";
=======
import * as _ from 'lodash';
>>>>>>>
import * as _ from 'lodash';
import * as remark from "remark";
<<<<<<<
let ast = remark.parse(initialValue);
let content = "";
let sectionOpen = false;
this.three_columns = true;
var sectionValue = "";
... |
<<<<<<<
=======
this.$onInit = () => {
this.headersAsList(this.log.clientRequest);
this.headersAsList(this.log.proxyRequest);
this.headersAsList(this.log.clientResponse);
this.headersAsList(this.log.proxyResponse);
};
this.headersAsList = (obj) => {
if (obj) {
obj.h... |
<<<<<<<
this.importApiSpecification('API');
};
this.importWSDL = () => {
this.importApiSpecification('WSDL');
};
this.importApiSpecification = (format) => {
=======
this.error = null;
>>>>>>>
this.importApiSpecification('API');
};
this.importWSDL = () => {
thi... |
<<<<<<<
import * as moment from 'moment';
let defaultStatus = ['ACCEPTED', 'PENDING', 'PAUSED'];
=======
import {IScope} from "angular";
>>>>>>>
import {IScope} from "angular";
import * as moment from 'moment';
let defaultStatus = ['ACCEPTED', 'PENDING', 'PAUSED'];
<<<<<<<
private $state: StateService,
... |
<<<<<<<
renderPredefinedValues?: (params: { form: FormChildrenFunctionParams }) => React.ReactNode;
graphql?: {
queryField?: string;
};
=======
renderPredefinedValues?: (params: {
form: FormChildrenFunctionParams;
getBind: (index?: number) => any;
... |
<<<<<<<
'background': api.background,
=======
'picture_url': api.picture_url,
>>>>>>>
'picture_url': api.picture_url,
'background': api.background, |
<<<<<<<
PortalConfigService.save().then( () => {
NotificationService.show("Configuration saved");
this.formSettings.$setPristine();
=======
PortalConfigService.save(this.settings).then( (response) => {
_.merge(Constants, response.data);
NotificationService.show("Configurati... |
<<<<<<<
this.$state.reload();
=======
this.$scope.formEndpoint.$setPristine();
this.endpoint = _.cloneDeep(this.initialEndpoint);
this.$scope.duplicateEndpointNames = false;
>>>>>>>
this.$scope.duplicateEndpointNames = false;
this.$state.reload();
<<<<<<<
=======
checkEndpointNameUnique... |
<<<<<<<
import { AssessmentsComponent } from './assessments/assessments.component';
=======
import { OrganizationComponent } from './organization/organization.component';
>>>>>>>
import { AssessmentsComponent } from './assessments/assessments.component';
import { OrganizationComponent } from './organization/organiza... |
<<<<<<<
import { Clip, Composition, Effect, Layer, Project } from '../../Entity'
import { EffectPluginMissingException } from '../../Exceptions'
=======
import { mockClip, mockComposition, mockEffect, mockLayer, mockProject } from '../../../spec/mocks'
import { Clip, Effect, Project } from '../../Entity'
import { Eff... |
<<<<<<<
create(snapshot): any
=======
create(snapshot: any, environment?: any): any
>>>>>>>
create(snapshot: any): any
<<<<<<<
abstract create(snapshot): any
abstract is(thing): boolean
=======
abstract create(snapshot: any, environment?: any): any
abstract is(thing: any): boolean
>>>... |
<<<<<<<
mobxShallow,
IChildNodesMap,
convertChildNodesToArray
=======
mobxShallow,
IAnyType
>>>>>>>
mobxShallow,
IChildNodesMap,
convertChildNodesToArray,
IAnyType
<<<<<<<
export class ArrayType<S, T> extends ComplexType<S[], IObservableArray<T>> {
=======
export function array... |
<<<<<<<
export class ArrayType<S, T> extends ComplexType<S[], IObservableArray<T>> {
=======
export function arrayToString(this: IObservableArray<any>) {
return `${getMSTAdministration(this)}(${this.length} items)`
}
export class ArrayType<T> extends ComplexType<T[], IObservableArray<T>> {
>>>>>>>
export functi... |
<<<<<<<
}),
addRow: action(function(){
this.rows.push(Row.create())
}),
=======
},
addRow() {
this.rows.push(Row())
},
>>>>>>>
},
addRow() {
this.rows.push(Row.create())
}, |
<<<<<<<
readonly snapshotSubscribers: ((snapshot) => void)[] = []
=======
private interceptDisposer: IDisposer
readonly snapshotSubscribers: ((snapshot: any) => void)[] = []
>>>>>>>
readonly snapshotSubscribers: ((snapshot: any) => void)[] = []
<<<<<<<
constructor(initialState: any, factory: IF... |
<<<<<<<
computed,
getAtom,
intercept,
IObjectWillChange,
IObservableObject,
=======
computed,
extendObservable,
getAtom,
intercept,
IObjectWillChange,
>>>>>>>
computed,
intercept,
getAtom,
IObjectWillChange,
IObservableObject,
<<<<<<<
IAnyType,
ICh... |
<<<<<<<
import {
IMiddlewareEventType,
runWithActionContext,
getActionContext,
getNextActionId,
fail,
argsToArray
} from "../internal"
// based on: https://github.com/mobxjs/mobx-utils/blob/master/src/async-action.ts
=======
/*
All contents of this file are deprecated.
The term `proc... |
<<<<<<<
import { createNode, getStateTreeNode, isStateTreeNode, IStateTreeNode, Node } from "../../core"
import { Type, IType } from "../type"
import { TypeFlags, isReferenceType, isType } from "../type-flags"
import { IContext, IValidationResult, typeCheckSuccess, typeCheckFailure } from "../type-checker"
import { fai... |
<<<<<<<
// If called too early in es5 environment, this won't throw, but return undefined
// see "it should apply deep patches to maps" test for example
const definition = this.definition()
if (typeof definition !== "object") fail("Late type definition should return objec... |
<<<<<<<
=======
props: {
[key: string]: IFactory<any, any>
} = {}
baseModel: any
initializers: ((target: any) => void)[] = []
finalizers: ((target: any) => void)[] = []
>>>>>>>
<<<<<<<
/**
* The original object definition
*/
baseModel: any
modelConstructor: new () ... |
<<<<<<<
import { GraphQLContextPlugin } from "@webiny/graphql/types";
import authenticate from "./authentication/authenticate";
=======
import {
GraphQLContext,
GraphQLContextPlugin,
GraphQLMiddlewarePlugin,
GraphQLSchemaPlugin
} from "@webiny/graphql/types";
import { shield } from "graphql-shield";
i... |
<<<<<<<
import { reaction, computed, action } from "mobx"
=======
import { reaction, observable, computed, action, getAtom } from "mobx"
>>>>>>>
import { reaction, computed, action } from "mobx"
<<<<<<<
resolveNodeByPathParts,
convertChildNodesToArray,
ModelType,
invalidateComputed
=======
res... |
<<<<<<<
=======
/**
* Middleware can be used to intercept any action is invoked on the subtree where it is attached.
* If a tree is protected (by default), this means that any mutation of the tree will pass through your middleware.
*
* For more details, see the [middleware docs](docs/middleware.md)
*
* @export
... |
<<<<<<<
fail,
=======
extendKeepGetter,
fail, identity,
>>>>>>>
extendKeepGetter,
fail, |
<<<<<<<
this.mediaStarted = true;
if (!this.media.paused) {
this.media.pause();
}
if (!this.element.parentElement.classList.contains('op-ads--active')) {
this.element.parentElement.classList.a... |
<<<<<<<
let twitchhighlighterTreeView: TwitchHighlighterDataProvider;
=======
let twitchhighlighterStatusBar: vscode.StatusBarItem;
let isConnected: boolean = false;
>>>>>>>
let twitchhighlighterTreeView: TwitchHighlighterDataProvider;
let twitchhighlighterStatusBar: vscode.StatusBarItem;
let isConnected: boolean = ... |
<<<<<<<
private static instance: SwaggerService;
private controllerMap: IController[] = [];
private data: ISwagger;
=======
private static instance : SwaggerService;
private controllerMap : any = [];
private definitionsMap : {[key: string]: ISwaggerDefinition} = {};
private data : ISwagge... |
<<<<<<<
import { Http, Response<% if (authenticationType !== 'oauth2') { %>, Headers<% } %> } from '@angular/http';
import { Observable } from 'rxjs/Observable';
import { SERVER_API_URL } from '../../app.constants';
=======
import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http';
import { Observa... |
<<<<<<<
this.eventManager.broadcast({
name: '<%= entityInstance %>ListModification',
content: 'Deleted an <%= entityInstance %>'
});
this.router.navigate([{ outlets: { popup: null }}]);
=======
this.eventManager.broadcast({ name: '<%= ent... |
<<<<<<<
import { Http, Response, URLSearchParams } from '@angular/http';
import { Observable } from 'rxjs/Observable';
import { SERVER_API_URL } from '../../app.constants';
=======
import { HttpClient, HttpParams } from '@angular/common/http';
import { Observable } from 'rxjs/Rx';
>>>>>>>
import { HttpClient, HttpPa... |
<<<<<<<
import { Http, Response } from '@angular/http';
import { Observable } from 'rxjs/Observable';
=======
import { HttpClient, HttpResponse } from '@angular/common/http';
import { Observable } from 'rxjs/Rx';
>>>>>>>
import { HttpClient, HttpResponse } from '@angular/common/http';
import { Observable } from 'rxj... |
<<<<<<<
create(label, seed, scan, password) {
return this.apiService.postWalletCreate(label ? label : 'undefined', seed, scan ? scan : 100, password)
=======
create(label, seed, scan) {
seed = seed.replace(/\r?\n|\r/g, ' ').replace(/ +/g, ' ').trim();
return this.apiService.postWalletCreate(label ? l... |
<<<<<<<
import { SendFormAdvancedComponent } from './components/pages/send-skycoin/send-form-advanced/send-form-advanced.component';
=======
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
import { AppTranslateLoader } from './app.translate-loader';
>>>>>>>
import { SendFormAdvancedComponent ... |
<<<<<<<
private preparingToEdit = false;
private editSubscription: ISubscription;
private confirmSubscription: ISubscription;
=======
>>>>>>>
private editSubscription: ISubscription;
private confirmSubscription: ISubscription; |
<<<<<<<
import { SeedWordDialogComponent } from './components/layout/seed-word-dialog/seed-word-dialog.component';
=======
import { MultipleDestinationsDialogComponent } from './components/layout/multiple-destinations-dialog/multiple-destinations-dialog.component';
>>>>>>>
import { SeedWordDialogComponent } from './... |
<<<<<<<
import { catchError, map } from 'rxjs/operators';
=======
import { AppService } from './app.service';
import { AppConfig } from '../app.config';
>>>>>>>
import { catchError, map } from 'rxjs/operators';
import { AppService } from './app.service';
import { AppConfig } from '../app.config';
<<<<<<<
verifyAd... |
<<<<<<<
import { ExchangeComponent } from './components/pages/exchange/exchange.component';
import { ExchangeService } from './services/exchange.service';
import { ExchangeCreateComponent } from './components/pages/exchange/exchange-create/exchange-create.component';
import { ExchangeStatusComponent } from './component... |
<<<<<<<
import { QrCodeComponent } from '../../../layout/qr-code/qr-code.component';
=======
import { PasswordDialogComponent } from '../../../layout/password-dialog/password-dialog.component';
>>>>>>>
import { QrCodeComponent } from '../../../layout/qr-code/qr-code.component';
import { PasswordDialogComponent } fro... |
<<<<<<<
import { MsgBarService } from '../../../../services/msg-bar.service';
=======
import { ISubscription } from 'rxjs/Subscription';
import { Observable } from 'rxjs/Observable';
>>>>>>>
import { MsgBarService } from '../../../../services/msg-bar.service';
import { ISubscription } from 'rxjs/Subscription';
impor... |
<<<<<<<
import { HwWalletPinService } from './services/hw-wallet-pin.service';
import { HwWalletSeedWordService } from './services/hw-wallet-seed-word.service';
=======
import { LanguageService } from './services/language.service';
import { openChangeLanguageModal } from './utils';
>>>>>>>
import { HwWalletPinServic... |
<<<<<<<
this.processingSubscription = this.walletService.createTransaction(
this.form.value.wallet,
(this.form.value.wallet as Wallet).addresses.map(address => address.address),
null,
[{
address: this.form.value.address,
coins: this.form.value.amount,
}],
{
... |
<<<<<<<
import { parseResponseMessage } from '../../../../utils/index';
import { TranslateService } from '@ngx-translate/core';
=======
import { parseResponseMessage } from '../../../../utils/errors';
>>>>>>>
import { parseResponseMessage } from '../../../../utils/errors';
import { TranslateService } from '@ngx-tran... |
<<<<<<<
import {Vector3} from '../math/Vector3'
import {Color} from './../math/Color'
import {Face3} from './Face3'
import {Vector2} from '../math/Vector2'
import {Vector4} from '../math/Vector4'
import {Box3} from './../math/Box3'
import {Sphere} from './../math/Sphere'
import {Matrix4} from '../math/Matrix4'
import {... |
<<<<<<<
// // if (colors !== undefined) {
// // this.colors.push(new Color().fromArray(colors, i))
// // }
// // }
=======
// if (colors !== undefined) {
// scope.colors.push(new Color().fromArray(colors, i))
// }
// }
/// WRONG should be i32s
// function addFace(a: f32, b: f32, c: f32, ma... |
<<<<<<<
expect<f32>(c.r).toBe(0)
expect<f32>(c.g).toBe(0)
expect<f32>(c.b).toBe(0)
=======
expect(c.r).toBe(0)
expect(c.g).toBe(0)
expect(c.b).toBe(0)
>>>>>>>
expect(c.r).toBe(0)
expect(c.g).toBe(0)
expect(c.b).toBe(0)
<<<<<<<
expect<f32>(c.r).toBe(1)
expect<f32>(c.g).toBe(1)
exp... |
<<<<<<<
import XSAnime from './Xsanime';
import AnimeRush from './AnimeRush';
import TioAnime from './TioAnime';
=======
import Anime8 from './Anime8';
>>>>>>>
import XSAnime from './Xsanime';
import AnimeRush from './AnimeRush';
import TioAnime from './TioAnime';
import Anime8 from './Anime8';
<<<<<<<
export type ... |
<<<<<<<
return copyPasteConnection.startGet(globals.MESSAGE_VERSION);
=======
if (remoteProxyInstance) {
log.warn('Existing proxying session, terminating');
remoteProxyInstance.stop();
remoteProxyInstance = null;
}
return copyPasteConnection.startGet(globals.effectiveMessageVersion(... |
<<<<<<<
},
ready: function() {
this.openingAnchor = '';
this.ui = ui_context.ui;
this.model = ui_context.model;
},
domReady: function() {
this.translateElements();
},
observe: {
'model.globalSettings.language': 'translateElements'
=======
},
computed: {
'opened': '$.faqPanel.op... |
<<<<<<<
import Constants = require('./constants');
=======
import translator_module = require('./translator');
import _ = require('lodash');
>>>>>>>
import Constants = require('./constants');
import translator_module = require('./translator');
import _ = require('lodash');
<<<<<<<
export var SHARE_FAILED_MSG :strin... |
<<<<<<<
core.getInitialState();
=======
var ready :browser_connector.Payload = {
cmd: 'emit',
type: uproxy_core_api.Command.GET_INITIAL_STATE,
promiseId: 0
}
this.send(ready);
this.emit('core_connect');
>>>>>>>
core.getInitialState();
this.emit('core_... |
<<<<<<<
= {description : 'My Computer',
stunServers : this.DEFAULT_STUN_SERVERS_.slice(0),
newToUproxy : true};
=======
= {description : '',
stunServers : this.DEFAULT_STUN_SERVERS_.slice(0)};
>>>>>>>
= {description : '',
stunServers : this.DEFAULT_STUN_SERVERS_.... |
<<<<<<<
var checkConnectivityIntervalId: number;
=======
var checkConnectivityIntervalId : number;
>>>>>>>
var checkConnectivityIntervalId : number;
<<<<<<<
checkConnectivityIntervalId = setInterval(this.browserApi.checkConnectivity, 5 * 60 * 1000);
=======
clearInterval(checkConnectivityI... |
<<<<<<<
// If we were getting access from some other instance
// turn down the connection.
if (this.instanceGettingAccessFrom_ &&
this.instanceGettingAccessFrom_ != instanceId) {
this.core.stop(this.getInstancePath_(this.instanceGettingAccessFrom_));
}
=======
>>>>>>>
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.