conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
cpTitles: [],
=======
cpTitles: [],
cpPlaceholder: [],
>>>>>>>
cpTitles: [],
cpPlaceholder: [],
<<<<<<<
this.processInterpolation(this.element, this.element);
=======
// Update cp placeholder
this.directives.cpPlaceholder.forEach((cpPlacehol... |
<<<<<<<
log(`:fetch() > fetching resource with args: ${JSON.stringify(args)}`)
=======
>>>>>>>
log(`:fetch() > fetching resource with args: ${JSON.stringify(args)}`);
<<<<<<<
// Might move these into a private helper...
cdp.Network.requestWillBeSent((params) => {
=======
cdp.Network.r... |
<<<<<<<
renderOptions: any;
=======
panel: object | undefined;
>>>>>>>
renderOptions: any;
panel: object | undefined; |
<<<<<<<
import WFEncodeMode from './WFEncodeMode';
=======
import WFDeviceDetail from './WFDeviceDetail';
>>>>>>>
import WFDeviceDetail from './WFDeviceDetail';
import WFEncodeMode from './WFEncodeMode'; |
<<<<<<<
import { withUUID } from '../utils';
=======
/** @module actions */
import { withActionOutput } from '../utils';
>>>>>>>
import { withActionOutput } from '../utils'; |
<<<<<<<
import runJavaScriptOnWebPage from './runJavaScriptOnWebPage';
=======
import repeat from './repeat';
import runJavascriptOnWebPage from './runJavascriptOnWebPage';
>>>>>>>
import repeat from './repeat';
import runJavaScriptOnWebPage from './runJavaScriptOnWebPage';
<<<<<<<
runJavaScriptOnWebPage,
======... |
<<<<<<<
=======
/** @module actions */
import Attachment from '../interfaces/WF/Attachment';
>>>>>>>
import Attachment from '../interfaces/WF/Attachment';
<<<<<<<
=======
type SetVariableOptions = {
variable: Attachment;
};
>>>>>>>
<<<<<<<
*
* ```js
* setVariable({
* name: 'My Variable',
* });
* ```... |
<<<<<<<
import formatDate from './formatDate';
=======
import generateHash from './generateHash';
>>>>>>>
import formatDate from './formatDate';
import generateHash from './generateHash';
<<<<<<<
formatDate,
=======
generateHash,
>>>>>>>
formatDate,
generateHash, |
<<<<<<<
import createNote from './createNote';
import date from './date';
=======
import deletePhotos from './deletePhotos';
import detectLanguageWithMicrosoft from './detectLanguageWithMicrosoft';
>>>>>>>
import createNote from './createNote';
import date from './date';
import deletePhotos from './deletePhotos';
im... |
<<<<<<<
hosted_on_the_osf: 'Hosted on the Open Science Framework',
settings: 'Settings',
project: 'project',
component: 'component',
=======
hosted_on_the_osf: 'Hosted on OSF',
>>>>>>>
settings: 'Settings',
project: 'project',
component: 'component',
... |
<<<<<<<
| 'com.apple.mobilenotes.SharingExtension'
| 'com.burbn.instagram.openin'
| 'is.workflow.actions.appendvariable'
=======
>>>>>>>
| 'com.apple.mobilenotes.SharingExtension'
| 'com.burbn.instagram.openin'
| 'is.workflow.actions.appendvariable'
<<<<<<<
| 'is.workflow.actions.format.date'
=======... |
<<<<<<<
import { withUUID } from '../utils';
=======
/** @module actions */
import { withActionOutput } from '../utils';
>>>>>>>
import { withActionOutput } from '../utils'; |
<<<<<<<
import randomNumber from './randomNumber';
=======
import openInBooks from './openInBooks';
import print from './print';
import quickLook from './quickLook';
>>>>>>>
import openInBooks from './openInBooks';
import print from './print';
import quickLook from './quickLook';
import randomNumber from './randomNu... |
<<<<<<<
export * from './storage/query';
export * from './storage/storageBase';
export * from './storage/storageLocalStorage';
export * from './storage/storageMemory';
// export * from './storage/storageSqlite'; // doesn't work in browsers
export * from './storage/storageToAsync';
export * from './sync/syncWithChannel... |
<<<<<<<
import { Component, OnInit, Output, EventEmitter, Input } from '@angular/core';
import { listAnimation } from '../animations/animations';
=======
import { Component, OnInit, Output, EventEmitter } from '@angular/core';
import { trigger, state, style, transition, animate } from '@angular/animations';
>>>>>>>
... |
<<<<<<<
import {RenameView} from "../views/renameView"
import {SemanticViewPane} from "../views/semanticView"
=======
>>>>>>>
import {SemanticViewPane} from "../views/semanticView"
<<<<<<<
renameView: RenameView
semanticView: SemanticViewPane
=======
>>>>>>>
semanticView: SemanticViewPane |
<<<<<<<
import {execFile} from "child_process"
import {CommandEvent, TextEditorElement} from "atom"
=======
import {BufferedNodeProcess} from "atom"
>>>>>>>
import {BufferedNodeProcess} from "atom"
import {CommandEvent, TextEditorElement} from "atom" |
<<<<<<<
import {SemanticViewPane} from "../views/semanticViewPane"
import {FileSymbolsView} from "../views/symbolsViewMain"
=======
>>>>>>>
import {FileSymbolsView} from "../views/symbolsViewMain"
<<<<<<<
semanticView: SemanticViewPane
fileSymbolsView: FileSymbolsView
=======
>>>>>>>
fileSymbolsView: FileS... |
<<<<<<<
import { assertSingleResourceDoc } from '@cardstack/core/jsonapi';
import { Card } from '@cardstack/core/card';
import { SingleResourceDoc } from 'jsonapi-typescript';
=======
import { Entry, readCard, crawl } from '@cardstack/core/card-file';
import { statSync, Stats } from 'fs-extra';
import { inject } from... |
<<<<<<<
import { TestRunStartedEvent, TestRunFinishedEvent, TestSuiteEvent, TestEvent, TestSuiteInfo } from "vscode-test-adapter-api";
import { TestExplorerHelper } from './workers/test-explorer/test-explorer-helper';
import * as vscode from "vscode";
=======
import { TestRunStartedEvent, TestRunFinishedEvent, TestSu... |
<<<<<<<
if (clonedTcModel.isValid()) {
this.tcModel = clonedTcModel;
if (this.tcModelChangeEventCallback) {
this.tcModelChangeEventCallback();
}
} else {
throw new Error(ValidationMessages.TC_MODEL_INVALID);
}
=======
this.tcModel = clonedTcModel;
this.tcMode... |
<<<<<<<
/**
* Creates a clone of this GVL
* @return {GVL}
*/
public clone(): GVL {
return this._clone(this);
}
=======
/**
* emptyLanguageCache
*
* @param {string} [lang] - Optional ISO 639-1 langauge code to remove from
* the cache. If a falsy value is passed it will empty the en... |
<<<<<<<
=======
it('ping works', (done): void => {
const callback: PingCallback = (pingReturn: Ping | null): void => {
assert.isNotNull(pingReturn, 'Ping returned null');
done();
};
win[API_FUNCTION_NAME]('ping', 2, callback);
});
it('setTCModel work... |
<<<<<<<
module(rootElement: Element, module: MithrilModule): Object;
=======
module(rootElement: Node, module: MithrilModule): void;
>>>>>>>
module(rootElement: Node, module: MithrilModule): Object; |
<<<<<<<
/* If the status is OK and a new status comes in (e.g. from a
* deserialization failure), that new status takes priority */
if (this.finalStatus === null || this.finalStatus.code === Status.OK) {
=======
/* Once endCall is called, we are definitely not using the http2 stream
* anymore, s... |
<<<<<<<
export function load(filename: string | string[], options?: Options): Promise<PackageDefinition> {
=======
export function load(
filename: string, options?: Options): Promise<PackageDefinition> {
>>>>>>>
export function load(
filename: string | string[], options?: Options): Promise<PackageDefinition>... |
<<<<<<<
import { UI, Snippet } from '../actions';
import { Strings } from '../helpers';
=======
import { UI, Snippet, GitHub } from '../actions';
import isEmpty = require('lodash/isEmpty');
>>>>>>>
import { UI, Snippet, GitHub } from '../actions';
import isEmpty = require('lodash/isEmpty');
import { Strings } from ... |
<<<<<<<
settings.snippets.notify().subscribe(() => this.render());
settings.settings.notify().subscribe(() => this.renderLastOpened());
=======
storage.settings.notify().subscribe(() => this.renderLastOpened());
storage.snippets.notify().subscribe(() => this.render());
this._... |
<<<<<<<
export * from './jdbc-note-plugin';
export * from './rupert-note-plugin';
=======
export * from './jdbc-note-plugin';
export * from './bigquery-note-plugin';
>>>>>>>
export * from './jdbc-note-plugin';
export * from './rupert-note-plugin';
export * from './bigquery-note-plugin'; |
<<<<<<<
static deserialize (rawCommand: Buffer) {
const properties = {
productIdentifier: Util.bufToNullTerminatedString(rawCommand, 0, 40),
model: Util.parseEnum<Enums.Model>(rawCommand[40], Enums.Model)
=======
properties: {
deviceName: string
model: number
}
deserialize (rawCommand: Buffer) {
th... |
<<<<<<<
export { default as Provider } from "./components/Provider";
export { TextField } from "./components/TextField/TextField";
=======
export {
default as SearchField,
Props as SearchFieldProps,
} from "./components/SearchField/SearchField";
export { default as Provider } from "./components/Provider";
>>>>>>... |
<<<<<<<
import { AppService, DEFAULT_APP_COLOR } from './app.service';
=======
import cuid from 'cuid';
import {
AppService,
INITIAL_COMMIT_MESSAGE,
DEFAULT_APP_COLOR,
DEFAULT_ENVIRONMENT_NAME,
DEFAULT_APP_DATA
} from './app.service';
>>>>>>>
import cuid from 'cuid';
import {
AppService,
INITIAL_COMMIT... |
<<<<<<<
@service i18n;
max = 3;
nodeId?: string;
useLink?: boolean;
contributors = defaultTo(this.contributors, A([]));
=======
@service i18n!: I18N;
contributors: Contributor[] = defaultTo(this.contributors, A([]));
>>>>>>>
@service i18n!: I18N;
max = 3;
nodeId?: string;
... |
<<<<<<<
import {
DELETE_ONE_USER_ENTITY_ERROR_MESSAGE,
EntityService,
NAME_VALIDATION_ERROR_MESSAGE
} from './entity.service';
=======
import {
EntityPendingChange,
EntityService,
NAME_VALIDATION_ERROR_MESSAGE
} from './entity.service';
>>>>>>>
import {
DELETE_ONE_USER_ENTITY_ERROR_MESSAGE,
EntityPen... |
<<<<<<<
ALL_ATTRIBUTES_ALLOWED,
=======
ALL_ATTRIBUTES_MATCHER,
>>>>>>>
ALL_ATTRIBUTES_ALLOWED,
<<<<<<<
attributes: ALL_ATTRIBUTES_ALLOWED,
=======
attributes: ALL_ATTRIBUTES_MATCHER,
resource: EXAMPLE_ENTITY.name,
role: EXAMPLE_APP_ROLE.name,
};
const EXAMPLE_ROLE_CREATE_GRANT_WITH_EXCLUDED_FIELD: ... |
<<<<<<<
if (entity.lockedByUserId) {
return this.userService.user({
where: {
id: entity.lockedByUserId
}
});
} else {
return null;
}
=======
return this.userService.findUser({
where: {
id: entity.lockedByUserId
}
});
>>>>>>>
if ... |
<<<<<<<
if (entity.lockedByUserId) {
return this.userService.user({
where: {
id: entity.lockedByUserId
}
});
} else {
return null;
}
=======
return this.userService.findUser({
where: {
id: entity.lockedByUserId
}
});
>>>>>>>
if (... |
<<<<<<<
CreateOneEntityVersionArgs
} from './dto';
=======
CreateOneEntityVersionArgs,
FindManyEntityVersionArgs,
DeleteOneEntityArgs
} from '../../dto/args';
>>>>>>>
CreateOneEntityVersionArgs,
FindManyEntityVersionArgs,
DeleteOneEntityArgs
} from './dto'; |
<<<<<<<
import { AccessControlModule, RolesBuilder } from "nest-access-control";
import { MorganModule } from "nest-morgan";
=======
>>>>>>>
import { MorganModule } from "nest-morgan"; |
<<<<<<<
export function createPrismaFields(
field: EntityField,
entity: Entity,
fieldNamesCount: Record<string, number> = {}
):
| [PrismaSchemaDSL.ScalarField]
| [PrismaSchemaDSL.ObjectField]
| [PrismaSchemaDSL.ObjectField, PrismaSchemaDSL.ScalarField] {
=======
export function createPrismaField(
field:... |
<<<<<<<
app.use(oakCors());
// // const url = "https://api.spacex.land/graphql"
// // const query = ` query {
// // launch(id: "1") {
// // mission_name
// // launch_success
// // launch_year
// // }
// // }`
// // const query = `
// // query {
// // Lift(id: "panorama") {
// // name
... |
<<<<<<<
import BreakBlot from '../leaf/break';
import Observable from '../observable';
=======
>>>>>>>
import Observable from '../observable';
<<<<<<<
class BlockBlot extends ParentBlot implements Observable {
static nodeName = 'block';
=======
class BlockBlot extends ParentBlot {
static blotName = 'block';
... |
<<<<<<<
=======
import { getContractWrappers } from '../../services/contract_wrappers';
import { getWeb3Wrapper } from '../../services/web3_wrapper';
import { DefaultTheme } from '../../themes/default_theme';
>>>>>>>
import { DefaultTheme } from '../../themes/default_theme';
<<<<<<<
export const startToggleTokenLoc... |
<<<<<<<
export const getNotifications = (state: StoreState) => state.ui.notifications;
export const getHasUnreadNotifications = (state: StoreState) => state.ui.hasUnreadNotifications;
=======
export const getStepsModalPendingSteps = (state: StoreState) => state.ui.stepsModal.pendingSteps;
export const getStepsModalDo... |
<<<<<<<
=======
import { TX_DEFAULTS } from '../../common/constants';
import { INSUFFICIENT_ORDERS_TO_FILL_AMOUNT_ERR } from '../../exceptions/common';
import { InsufficientOrdersAmountException } from '../../exceptions/insufficient_orders_amount_exception';
>>>>>>>
import { INSUFFICIENT_ORDERS_TO_FILL_AMOUNT_ERR } ... |
<<<<<<<
currencyPair: CurrencyPair;
baseToken: Token | null;
quoteToken: Token | null;
markets: Market[] | null;
=======
readonly currencyPair: CurrencyPair;
readonly baseToken: Token | null;
readonly quoteToken: Token | null;
readonly ethInUsd: BigNumber | null;
>>>>>>>
readonly ... |
<<<<<<<
export const submitLimitOrder = (amount: BigNumber, price: number, side: OrderSide) => {
=======
export const submitOrder = (amount: BigNumber, price: BigNumber, side: OrderSide) => {
>>>>>>>
export const submitLimitOrder = (amount: BigNumber, price: BigNumber, side: OrderSide) => { |
<<<<<<<
overflow: 'hidden',
=======
padding: '16px',
>>>>>>>
overflow: 'hidden',
padding: '16px', |
<<<<<<<
export const getMarkets = () => {
return async (dispatch: any, getState: any) => {
const web3Wrapper = await getWeb3Wrapper();
=======
export const fetchMarkets = () => {
return async (dispatch: any) => {
const web3Wrapper = await getWeb3WrapperOrThrow();
>>>>>>>
export const fetchMar... |
<<<<<<<
import { TEMPLATE_THEME } from '../../common/constants';
=======
import { SignedOrderException } from '../../exceptions/signed_order_exception';
>>>>>>>
import { TEMPLATE_THEME } from '../../common/constants';
import { SignedOrderException } from '../../exceptions/signed_order_exception'; |
<<<<<<<
import { BigNumber, MetamaskSubprovider, signatureUtils, SignedOrder } from '0x.js';
import { createAction } from 'typesafe-actions';
import {
MAINNET_ID,
METAMASK_NOT_INSTALLED,
METAMASK_USER_DENIED_AUTH,
TX_DEFAULTS,
WETH_TOKEN_SYMBOL,
} from '../common/constants';
import { getContractWra... |
<<<<<<<
import { getMarkets, setMarketTokens } from '../market/actions';
import { getOrderbookAndUserOrders, initializeRelayerData } from '../relayer/actions';
=======
import { setMarketTokens, updateMarketPriceEther } from '../market/actions';
import { getOrderBook, getOrderbookAndUserOrders, initializeRelayerData }... |
<<<<<<<
dispatch(getAllOrders());
dispatch(getUserOrders());
dispatch(
addNotification({
kind: NotificationKind.CancelOrder,
amount: order.size,
token: selectedToken,
timestamp: new Date(),
}),
);
=... |
<<<<<<<
export interface Market {
currencyPair: CurrencyPair;
price: BigNumber | null;
}
=======
export interface CurrencyPairBalance {
quoteBalance: BigNumber;
baseBalance: BigNumber;
}
>>>>>>>
export interface Market {
currencyPair: CurrencyPair;
price: BigNumber | null;
}
export interfa... |
<<<<<<<
import { getKnownTokens, getTokenBySymbol, getWethToken } from '../util/known_tokens';
import { buildLimitOrder, buildMarketOrders } from '../util/orders';
=======
import { getKnownTokens } from '../util/known_tokens';
import { buildOrder } from '../util/orders';
>>>>>>>
import { getKnownTokens } from '../ut... |
<<<<<<<
};
export const createBuySellLimitSteps = (
baseToken: Token,
quoteToken: Token,
tokenBalances: TokenBalance[],
wethTokenBalance: TokenBalance,
amount: BigNumber,
price: BigNumber,
side: OrderSide,
): Step[] => {
const buySellLimitFlow: Step[] = [];
let unlockBaseOrQuoteToke... |
<<<<<<<
import { BlockchainState, RelayerState, StoreState, UIState, Web3State } from '../util/types';
=======
import { BlockchainState, RelayerState, Step, StepsModalState, StoreState, UIState, Web3State } from '../util/types';
>>>>>>>
import { BlockchainState, RelayerState, Step, StepsModalState, StoreState, UISta... |
<<<<<<<
import { getEthereumPriceInUSD } from './market_prices';
import { tokenAmountInUnits } from './tokens';
import { OrderSide } from './types';
=======
import { OrderSide, UIOrder } from '../util/types';
>>>>>>>
import { OrderSide, UIOrder } from '../util/types';
import { getEthereumPriceInUSD } from './marke... |
<<<<<<<
import { assetDataUtils, BigNumber, DutchAuctionWrapper, generatePseudoRandomSalt, Order, SignedOrder } from '0x.js';
=======
import { assetDataUtils, BigNumber, Order, SignedOrder } from '0x.js';
>>>>>>>
import { assetDataUtils, BigNumber, DutchAuctionWrapper, Order, SignedOrder } from '0x.js'; |
<<<<<<<
{ side: OrderSide.Sell, size: new BigNumber(1), price: new BigNumber('8.1') },
{ side: OrderSide.Sell, size: new BigNumber(2), price: new BigNumber('8.0') },
=======
{
side: UIOrderSide.Sell,
size: new BigNumber(1),
... |
<<<<<<<
dispatch(getOrderbookAndUserOrders());
=======
export const submitLimitOrder = (signedOrder: SignedOrder) => {
return async (dispatch: any) => {
const submitResult = await getRelayer().client.submitOrderAsync(signedOrder);
dispatch(getAllOrders());
dispatch(getUserOrders())... |
<<<<<<<
const baseToken = getBaseToken(state) as Token;
const contractWrappers = await getContractWrappers();
const web3Wrapper = await getWeb3WrapperOrThrow();
=======
>>>>>>>
<<<<<<<
const txHash = await contractWrappers.exchange.batchFillOrdersAsync(
ordersToF... |
<<<<<<<
import { cancelSignedOrder } from '../../services/orders';
=======
import { TX_DEFAULTS, ZERO_ADDRESS } from '../../common/constants';
>>>>>>>
import { cancelSignedOrder } from '../../services/orders';
import { TX_DEFAULTS, ZERO_ADDRESS } from '../../common/constants';
<<<<<<<
};
export const cancelOrderCo... |
<<<<<<<
export const getMarket = (state: StoreState) => state.market;
export const getMarketPrices = (state: StoreState) => state.market.prices;
export const getMarketPriceEther = (state: StoreState) => state.market.prices.eth;
=======
export const getCurrencyPair = (state: StoreState) => state.market.currencyPair;
e... |
<<<<<<<
markets: null,
=======
ethInUsd: null,
>>>>>>>
markets: null,
ethInUsd: null,
<<<<<<<
case getType(actions.setMarkets):
return { ...state, markets: action.payload };
=======
case getType(actions.fetchMarketPriceEtherUpdate):
return { ...state, ethInU... |
<<<<<<<
import {
ICellTools, CellTools, INotebookTracker
=======
/* import {
ICellTools, NotebookActions, CellTools, INotebookTracker
} from '@jupyterlab/notebook'; */
import {
ICellTools, NotebookActions, CellTools, INotebookTracker
>>>>>>>
import {
ICellTools, CellTools, INotebookTracker
<<<<<<<
// impor... |
<<<<<<<
"7b77a6e",
"1581527146",
"fix",
"contacts",
"Don't include contacts' nicknames when composing emails to them"
],
[
=======
"97b6f79",
"1581532103",
"fix",
"calendar",
"Make the datetime picker show up again"
],
[
... |
<<<<<<<
"ef90f54",
"1582728986",
"fix",
"shopping-cart",
"Increase quantities in cart when adding duplicate products"
],
[
"e34f447",
"1582549440",
"fix",
"ci",
"Bump the revision number for commit log tests"
],
[
=======
... |
<<<<<<<
| 'FF_62'
=======
>>>>>>> |
<<<<<<<
* we look at Z/Y's predecessors, the best we can say is ["A"] without getting
* into the details of which of Z/Y's descendant nodes have predecessors to
=======
* we look at Z/Y's predecessors, the best we can say is ['A'] without getting
* into the details of which of of Z/Y's descendant nodes ha... |
<<<<<<<
var actionBar = this.actionBar;
if(actionBar === undefined) {
actionBar = new actionBarModule.ActionBar();
}
actionBar.title = this._associatedExampleMeta.title;
=======
>>>>>>> |
<<<<<<<
name: 'Ruby on Rails',
description: `Rails is a web application development framework written in the Ruby programming language. It is designed to make programming web applications easier by making assumptions about what every developer needs to get started. It allows you to write less code while accompl... |
<<<<<<<
name: 'Ruby on Rails',
description: `Rails is a web application development framework written in the Ruby programming language. It is designed to make programming web applications easier by making assumptions about what every developer needs to get started. It allows you to write less code while accompl... |
<<<<<<<
'401697': 'WordPress - Latest One-Click',
'604068': 'Shadowsocks - One-Click'
=======
'401697': 'WordPress - Latest One-Click',
'595742': 'cPanel One-Click',
'593835': 'Plesk One-Click'
>>>>>>>
'401697': 'WordPress - Latest One-Click',
'595742': 'cPanel One-Click',
'593835': 'Plesk One-Click'... |
<<<<<<<
if (this.pageManagers.length && (this.currentPage > 0)) {
const { pageHeadingText } = this.pageManagers[this.currentPage - 1];
return getPrevPageParam(this.currentPage, pageHeadingText!);
=======
if (this.pageManagers.length) {
const currentPage = this.inRev... |
<<<<<<<
'401697': 'WordPress - Latest One-Click',
'606691': 'LEMP One-Click'
=======
'401697': 'WordPress - Latest One-Click',
'595742': 'cPanel One-Click',
'593835': 'Plesk One-Click'
>>>>>>>
'401697': 'WordPress - Latest One-Click',
'595742': 'cPanel One-Click',
'593835': 'Plesk One-Click',
'6066... |
<<<<<<<
//this.pipeline.push(new ex.CollisionDetectionModule());
this.pipeline.push(new ex.OffscreenCullingModule());
this.pipeline.push(new ex.EventPropagationModule());
=======
this.pipeline.push(new ex.CollisionDetectionModule());
this.pipeline.push(new ex.OffscreenCull... |
<<<<<<<
=======
import Storage = require("./Storage");
import UriLabeller = require("./UriLabeller");
>>>>>>>
import UriLabeller = require("./UriLabeller");
<<<<<<<
result.push(<IMetadataItem>{
label: "license",
value: this.manifest.getLicense()
=======
meta... |
<<<<<<<
=======
import LoginDialogue = require("../../modules/uv-dialogues-module/LoginDialogue");
import LoginWarningMessages = require("./LoginWarningMessages");
import Metric = require("../../modules/uv-shared-module/Metric");
import {MetricType} from "../../modules/uv-shared-module/MetricType";
import Params = re... |
<<<<<<<
export class Metric {
constructor(public minWidth: number, public maxWidth: number) {
=======
import {MetricType} from "./MetricType";
class Metric {
constructor(public type: MetricType, public minWidth: number, public maxWidth: number) {
>>>>>>>
import {MetricType} from "./MetricType";
export cla... |
<<<<<<<
import config from 'ember-get-config';
import CurrentUser from 'ember-osf-web/services/current-user';
import Theme from 'ember-osf-web/services/theme';
import pathJoin from 'ember-osf-web/utils/path-join';
import $ from 'jquery';
=======
>>>>>>>
import Theme from 'ember-osf-web/services/theme'; |
<<<<<<<
case PlayerActions.TOGGLE_PLAY_PAUSE: {
return Object.assign({}, state, {
isPlaying: !state.isPlaying,
});
}
=======
case PlayerActions.VOLUME_CHANGE: {
if(state.isMuted) {
return Object.assign({}, state, {
volume: state.volumeBeforeMute,
i... |
<<<<<<<
getCurrentTrackIndex(): number {
return this.tracksList.reduce((acc, cur, index) => {
if (acc !== null) {
return acc;
} else if (cur.id === this.currentTrackId) {
return index;
} else {
return null;
}
}, null);
}
=======
changePosition(fraction:... |
<<<<<<<
AudioControlsActions,
PlaylistService,
PlaylistActions
=======
AudioControlsActions,
SoundmooseUserActions
>>>>>>>
AudioControlsActions,
PlaylistService,
PlaylistActions
SoundmooseUserActions
<<<<<<<
comments: comments,
playlist: playlist
=======
comments: comments,
soundmooseUse... |
<<<<<<<
discover: {
main: {
providers: 'Providers',
subject: 'Subject',
status: 'Status',
type: 'Type',
},
relevance: 'Relevance',
sort_oldest_newest: 'Modified Date (oldest to newest)',
sort_newest_oldest: 'Modified Date (newes... |
<<<<<<<
encapsulation: ViewEncapsulation.None,
styleUrls: [
'./app.component.css'
],
template: `
<nav>
<span>
<a [routerLink]=" ['./'] ">
Index
</a>
</span>
|
<span>
<a [routerLink]=" ['./home'] ">
Home
</a>
</span>
... |
<<<<<<<
this.currentProgress = Math.floor(((currentProgressInMilliseconds/this.duration)*100)) * this.multiplier / 100;
=======
// Why is {{ progressMinutesSeconds }} so laggy?
//$('#track-current-time').html(this.progressMinutesSeconds);
this.currentProgress = Math.floor(((currentProgressInMi... |
<<<<<<<
platform: 'soundcloud'
})))
.first()
.subscribe(tracks => this.store.dispatch(this.searchActions.searchSuccess(tracks)));
=======
platform: 'soundcloud',
trackId: item.id.toString()
})));
>>>>>>>
platform: 'soundcloud',
trackId: item.id.toString... |
<<<<<<<
return (new Promise((resolve, reject) => {
if (seemToBeInIE()) {
readIE().then(
(s: string) => resolve(DTFromText(s)),
reject
);
return;
}
// TODO: Attempt to read using async clipboard API.
reject("Read is not supported in your browser.");... |
<<<<<<<
'service:status-messages',
=======
'service:ready',
>>>>>>>
'service:status-messages',
'service:ready', |
<<<<<<<
import { BottomSheetComponent, DrawerState } from './bottom-sheet/bottom-sheet.component';
import { BottomSheetContentComponent } from './bottom-sheet/bottom-sheet-content/bottom-sheet-content.component';
=======
import { ToolbarSearchComponent } from './toolbar-search/toolbar-search.component';
import { Load... |
<<<<<<<
maintenance: string;
},
=======
cookieConsent: string;
};
>>>>>>>
cookieConsent: string;
maintenance: string;
}; |
<<<<<<<
let socket: Socket | undefined = undefined;
if (args.reAttach) {
try {
socket = await connect(args.port || 6000, 'localhost');
this.reloadTabs = true;
} catch(err) {}
}
if (socket === undefined) {
let proc = await launchFirefox(args);
if (!args.reAttach) {
this.firefoxProc = pr... |
<<<<<<<
import {GlobalMessageManager} from "../../Administration/GlobalMessageManager";
import {ConsoleGlobalMessageManager} from "../../Administration/ConsoleGlobalMessageManager";
=======
import {UserMovedMessage} from "../../Messages/generated/messages_pb";
import {ProtobufClientUtils} from "../../Network/Protobuf... |
<<<<<<<
import {Player} from "../Player/Player";
import {getPlayerAnimations, PlayerAnimationNames} from "../Player/Animation";
import Rectangle = Phaser.GameObjects.Rectangle;
import {PLAYER_RESOURCES} from "../Entity/PlayableCaracter";
=======
import {cypressAsserter} from "../../Cypress/CypressAsserter";
>>>>>>>
... |
<<<<<<<
import {DEBUG_MODE, POSITION_DELAY, RESOLUTION, ZOOM_LEVEL} from "../../Enum/EnvironmentVariable";
import {
ITiledMap,
ITiledMapLayer,
ITiledMapLayerProperty, ITiledMapObject,
ITiledTileSet
} from "../Map/ITiledMap";
=======
import {DEBUG_MODE, JITSI_URL, POSITION_DELAY, RESOLUTION, ZOOM_LEVEL... |
<<<<<<<
const API_URL = (process.env.API_PROTOCOL || (typeof(window) !== 'undefined' ? window.location.protocol : 'http:')) + '//' + (process.env.API_URL || "pusher.workadventure.localhost");
const UPLOADER_URL = (process.env.API_PROTOCOL || (typeof(window) !== 'undefined' ? window.location.protocol : 'http:')) + '//' ... |
<<<<<<<
private isReconnecting: boolean = false;
=======
private startLayerName!: string | null;
>>>>>>>
private isReconnecting: boolean = false;
private startLayerName!: string | null;
<<<<<<<
//this.initUsersPosition(roomJoinedMessage.users);
this.connectionAnswerPromiseRes... |
<<<<<<<
connect(name:string) {
this.playerName = name;
this.ConnexionInstance = new Connexion(name, this);
ConnexionInstance = this.ConnexionInstance;
=======
connect(email:string) {
this.ConnexionInstance = new Connexion(email, this);
>>>>>>>
connect(name:string) {... |
<<<<<<<
import {uuid} from "uuidv4";
=======
import {PositionInterface} from "_Model/PositionInterface";
>>>>>>>
import {PositionInterface} from "_Model/PositionInterface";
import {uuid} from "uuidv4";
<<<<<<<
getId() : string{
return this.id;
}
=======
/**
* Returns the barycenter of al... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.