conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
=======
private createMedia(key: string, referenceId, dimensions, data: fs.ReadStream | Buffer, filePath?: string) {
const imageData = {
referenceId: referenceId,
stream: data,
path: filePath,
fileName: key,
dimensions: {
pixels: {
x: dimensions.width,
y: dimensions.height,
},
emus: {
x: Math.round(dimensions.width * 9525),
y: Math.round(dimensions.height * 9525),
},
},
};
this.map.set(key, imageData);
return imageData;
}
>>>>>>>
x: Math.round(dimensions.width * 9525),
y: Math.round(dimensions.height * 9525), |
<<<<<<<
export function loginAsync(parsed: commandParser.ParsedCommand) {
const access_token = parsed.arguments[0];
if (/^http/.test(access_token)) {
globalConfig.accessToken = access_token
saveConfig()
=======
export function loginAsync(...args: string[]) {
const token = args[0];
if (/^https:\/\//.test(token)) {
globalConfig.accessToken = token
saveConfig();
>>>>>>>
export function loginAsync(parsed: commandParser.ParsedCommand) {
const token = parsed.arguments[0];
if (/^https:\/\//.test(token)) {
globalConfig.accessToken = token
saveConfig();
<<<<<<<
browser: parsed.flags["browser"] as string
=======
port: parseInt(argValue("port") || "0"),
browser
>>>>>>>
port: parsed.flags["port"] as number || 0,
browser: parsed.flags["browser"] as string
<<<<<<<
export function publishGistAsync(parsed: commandParser.ParsedCommand) {
return publishGistCoreAsync();
=======
export function publishGistAsync(...args: string[]) {
let forceNewGist = false;
for (let i = 0; i < args.length; i++) {
if (args[i] == "--new") {
forceNewGist = true
}
}
return publishGistCoreAsync(forceNewGist);
>>>>>>>
export function publishGistAsync(parsed: commandParser.ParsedCommand) {
return publishGistCoreAsync(parsed.flags["new"] as boolean);
<<<<<<<
function initCommands() {
// Top level commands
simpleCmd("help", "display this message or info about a command", pc => {
p.printHelp(pc.arguments, console.log)
return Promise.resolve();
}, "[all|command]");
simpleCmd("init", "start new package (library) in current directory", initAsync);
simpleCmd("deploy", "build and deploy current package", deployAsync);
simpleCmd("run", "build and run current package in the simulator", runAsync);
simpleCmd("update", "update pxt-core reference and install updated version", updateAsync);
simpleCmd("install", "install new packages, or all package", installAsync, "[package1] [package2] ...");
simpleCmd("add", "add a feature (.asm, C++ etc) to package", addAsync, "<arguments>");
p.defineCommand({
name: "bump",
help: "bump target or package version",
flags: {
noupdate: { description: "Don't publish the updated version" }
}
}, bumpAsync);
p.defineCommand({
name: "build",
help: "build current package",
flags: {
cloud: { description: "Force build to happen in the cloud" }
}
}, buildAsync);
p.defineCommand({
name: "extract",
help: "extract sources from .hex file, folder of .hex files, stdin (-), or URL",
argString: "<path>",
flags: {
code: { description: "generate vscode project files" },
out: {
description: "directory to extract the project into",
argument: "DIRNAME"
}
=======
interface Command {
name: string;
fn: () => void;
argDesc: string;
desc: string;
priority?: number;
}
let cmds: Command[] = []
function cmd(desc: string, cb: (...args: string[]) => Promise<void>, priority = 0) {
let m = /^(\S+)(\s*)(.*?)\s+- (.*)/.exec(desc)
cmds.push({
name: m[1],
argDesc: m[3],
desc: m[4],
fn: cb,
priority: priority
})
}
cmd("help [all] - display this message", helpAsync)
cmd("init - start new package (library) in current directory", initAsync)
cmd("install [PACKAGE...] - install new packages, or all packages", installAsync)
cmd("build [--cloud] - build current package, --cloud forces a build in the cloud", buildAsync)
cmd("deploy - build and deploy current package", deployAsync)
cmd("run - build and run current package in the simulator", runAsync)
cmd("extract [--code] [--out DIRNAME] [FILENAME] - extract sources from .hex file, folder of .hex files, stdin (-), or URL", extractAsync)
cmd("test - run tests on current package", testAsync, 1)
cmd("gendocs [--locs] [--docs] - build current package and its docs. --locs produce localization files, --docs produce docs files", gendocsAsync, 1)
cmd("format [-i] file.ts... - pretty-print TS files; -i = in-place", formatAsync, 1)
cmd("testassembler - test the assemblers", testAssemblers, 1)
cmd("decompile file.ts... - decompile ts files and produce similarly named .blocks files", decompileAsync, 1)
cmd("testdecompiler DIR - decompile files from DIR one-by-one and compare to baselines", testDecompilerAsync, 1)
cmd("testdecompilererrors DIR - decompile unsupported files from DIR one-by-one and check for errors", testDecompilerErrorsAsync, 1)
cmd("testdir DIR - compile files from DIR one-by-one", testDirAsync, 1)
cmd("testconv JSONURL - test TD->TS converter", testConverterAsync, 2)
cmd("snippets [--re NAME] [--i] - verifies that all documentation snippets compile to blocks", testSnippetsAsync)
cmd("serve [--yt] [--browser NAME] [--port PORT] - start web server for your local target; -yt = use local yotta build", serveAsync)
cmd("update - update pxt-core reference and install updated version", updateAsync)
cmd("buildtarget - build pxtarget.json", () => buildTargetAsync().then(() => { }), 1)
cmd("bump [--noupdate] - bump target or package version", bumpAsync)
cmd("uploadtrg [LABEL] - upload target release", uploadTargetAsync, 1)
cmd("uploadtrgtranslations [--docs] - upload translations for target, --docs uploads markdown as well", uploadTargetTranslationsAsync, 1)
cmd("downloadtrgtranslations [PACKAGE] - download translations from bundled projects", downloadTargetTranslationsAsync, 1)
cmd("checkdocs - check docs for broken links, typing errors, etc...", checkDocsAsync, 1)
cmd("gist [--new] [--public] - publish current package to a gist, use 'pxt login' to create a gist under your GitHub account (otherwise anonymous), --new to force create a new gist, --public to create a public gist (otherwise secret)", publishGistAsync)
cmd("login TOKEN - stores the PXT or GitHub access token", loginAsync, 1)
cmd("logout - clears access tokens", logoutAsync, 1)
cmd("add ARGUMENTS... - add a feature (.asm, C++ etc) to package", addAsync)
cmd("search QUERY... - search GitHub for a published package", searchAsync)
cmd("pkginfo USER/REPO - show info about named GitHub packge", pkginfoAsync)
cmd("api PATH [DATA] - do authenticated API call", apiAsync, 1)
cmd("pokecloud - same as 'api pokecloud {}'", () => apiAsync("pokecloud", "{}"), 2)
cmd("pokerepo [-u] REPO - refresh repo, or generate a URL to do so", pokeRepoAsync, 2)
cmd("travis - upload release and npm package", travisAsync, 1)
cmd("uploadfile PATH - upload file under <CDN>/files/PATH", uploadFileAsync, 1)
cmd("service OPERATION - simulate a query to web worker", serviceAsync, 2)
cmd("time - measure performance of the compiler on the current package", timeAsync, 2)
cmd("buildcss - build required css files", buildSemanticUIAsync, 10)
cmd("buildwebstrings - build webstrings.json", buildWebStringsAsync, 10)
cmd("crowdin CMD PATH [OUTPUT] - upload, download files to/from crowdin", execCrowdinAsync, 2);
function showHelp(showAll = true) {
let f = (s: string, n: number) => {
while (s.length < n) {
s += " "
}
return s
}
let commandWidth = Math.max(10, 1 + Math.max(...cmds.map(cmd => cmd.name.length)))
let argWidth = Math.max(20, 1 + Math.max(...cmds.map(cmd => cmd.argDesc.length)))
cmds.forEach(cmd => {
if (cmd.priority >= 10) return;
if (showAll || !cmd.priority) {
console.log(f(cmd.name, commandWidth) + f(cmd.argDesc, argWidth) + cmd.desc);
>>>>>>>
function initCommands() {
// Top level commands
simpleCmd("help", "display this message or info about a command", pc => {
p.printHelp(pc.arguments, console.log)
return Promise.resolve();
}, "[all|command]");
simpleCmd("init", "start new package (library) in current directory", initAsync);
simpleCmd("deploy", "build and deploy current package", deployAsync);
simpleCmd("run", "build and run current package in the simulator", runAsync);
simpleCmd("update", "update pxt-core reference and install updated version", updateAsync);
simpleCmd("install", "install new packages, or all package", installAsync, "[package1] [package2] ...");
simpleCmd("add", "add a feature (.asm, C++ etc) to package", addAsync, "<arguments>");
simpleCmd("login", "stores the PXT or GitHub access token", loginAsync, "<access_token>");
simpleCmd("logout", "clears access tokens", logoutAsync);
p.defineCommand({
name: "bump",
help: "bump target or package version",
flags: {
noupdate: { description: "Don't publish the updated version" }
}
}, bumpAsync);
p.defineCommand({
name: "build",
help: "build current package",
flags: {
cloud: { description: "Force build to happen in the cloud" }
}
}, buildAsync);
p.defineCommand({
name: "extract",
help: "extract sources from .hex file, folder of .hex files, stdin (-), or URL",
argString: "<path>",
flags: {
code: { description: "generate vscode project files" },
out: {
description: "directory to extract the project into",
argument: "DIRNAME"
} |
<<<<<<<
import { Alignment, AlignmentType } from "./formatting/alignment";
import { Bidirectional } from "./formatting/bidirectional";
import { IBorderOptions, ThematicBreak } from "./formatting/border";
import { IIndentAttributesProperties, Indent } from "./formatting/indent";
import { KeepLines, KeepNext } from "./formatting/keep";
import { PageBreak, PageBreakBefore } from "./formatting/page-break";
import { ContextualSpacing, ISpacingProperties, Spacing } from "./formatting/spacing";
import { HeadingLevel, Style } from "./formatting/style";
import { LeaderType, TabStop, TabStopPosition, TabStopType } from "./formatting/tab-stop";
import { NumberProperties } from "./formatting/unordered-list";
import { Bookmark, Hyperlink, OutlineLevel } from "./links";
import { Math } from "./math";
import { ParagraphProperties } from "./properties";
=======
import { File } from "../file";
import { InsertedTextRun, DeletedTextRun } from "../track-revision";
import { PageBreak } from "./formatting/page-break";
import { Bookmark, HyperlinkRef } from "./links";
import { IParagraphPropertiesOptions, ParagraphProperties } from "./properties";
>>>>>>>
import { PageBreak } from "./formatting/page-break";
import { Bookmark, HyperlinkRef } from "./links";
import { Math } from "./math";
import { File } from "../file";
import { InsertedTextRun, DeletedTextRun } from "../track-revision";
import { IParagraphPropertiesOptions, ParagraphProperties } from "./properties";
<<<<<<<
readonly border?: IBorderOptions;
readonly spacing?: ISpacingProperties;
readonly outlineLevel?: number;
readonly alignment?: AlignmentType;
readonly heading?: HeadingLevel;
readonly bidirectional?: boolean;
readonly thematicBreak?: boolean;
readonly pageBreakBefore?: boolean;
readonly contextualSpacing?: boolean;
readonly indent?: IIndentAttributesProperties;
readonly keepLines?: boolean;
readonly keepNext?: boolean;
readonly tabStops?: Array<{
readonly position: number | TabStopPosition;
readonly type: TabStopType;
readonly leader?: LeaderType;
}>;
readonly style?: string;
readonly bullet?: {
readonly level: number;
};
readonly numbering?: {
readonly num: Num;
readonly level: number;
readonly custom?: boolean;
};
readonly children?: Array<TextRun | PictureRun | Hyperlink | SymbolRun | Bookmark | PageBreak | SequentialIdentifier | Math>;
=======
readonly children?: (
| TextRun
| PictureRun
| SymbolRun
| Bookmark
| PageBreak
| SequentialIdentifier
| FootnoteReferenceRun
| HyperlinkRef
| InsertedTextRun
| DeletedTextRun
)[];
>>>>>>>
readonly children?: (
| TextRun
| PictureRun
| SymbolRun
| Bookmark
| PageBreak
| SequentialIdentifier
| FootnoteReferenceRun
| HyperlinkRef
| InsertedTextRun
| DeletedTextRun
| Math
)[]; |
<<<<<<<
},
{
id: "spriteWizard",
name: lf("Sprite Wizard"),
description: lf("Make a sprite using the new Sprite Wizard")
=======
},
{
id: "experimentalHw",
name: lf("Experimental Hardware"),
description: lf("Enable support for hardware marked 'experimental' in the hardware seletion dialog")
},
{
id: "recipes",
name: lf("Tutorials in Context"),
description: lf("Micro-tutorials running within your program."),
feedbackUrl: "https://github.com/microsoft/pxt/issues/5646"
>>>>>>>
},
{
id: "spriteWizard",
name: lf("Sprite Wizard"),
description: lf("Make a sprite using the new Sprite Wizard")
},
{
id: "experimentalHw",
name: lf("Experimental Hardware"),
description: lf("Enable support for hardware marked 'experimental' in the hardware seletion dialog")
},
{
id: "recipes",
name: lf("Tutorials in Context"),
description: lf("Micro-tutorials running within your program."),
feedbackUrl: "https://github.com/microsoft/pxt/issues/5646" |
<<<<<<<
// import { TitlePage } from "./title-page/title-page";
=======
import { FooterReferenceType, IPageNumberTypeAttributes, PageNumberType, PageNumberFormat, PageBordersOptions, PageBorders } from ".";
import { HeaderReferenceType } from "./header-reference/header-reference-attributes";
>>>>>>>
import { FooterReferenceType, IPageNumberTypeAttributes, PageNumberType, PageNumberFormat } from ".";
// import { TitlePage } from "./title-page/title-page";
import { FooterReferenceType, IPageNumberTypeAttributes, PageNumberType, PageNumberFormat, PageBordersOptions, PageBorders } from ".";
<<<<<<<
IHeaderOptions &
IFooterOptions &
IPageNumberTypeAttributes;
=======
HeaderOptions &
FooterOptions &
IPageNumberTypeAttributes &
PageBordersOptions;
>>>>>>>
IHeaderOptions &
IFooterOptions &
IPageNumberTypeAttributes &
PageBordersOptions; |
<<<<<<<
readonly style?: string;
=======
readonly borders?: ITableBordersOptions;
readonly alignment?: AlignmentType;
readonly visuallyRightToLeft?: boolean;
>>>>>>>
readonly style?: string;
readonly borders?: ITableBordersOptions;
readonly alignment?: AlignmentType;
readonly visuallyRightToLeft?: boolean;
<<<<<<<
style,
=======
borders,
alignment,
visuallyRightToLeft,
>>>>>>>
style,
borders,
alignment,
visuallyRightToLeft,
<<<<<<<
this.properties = new TableProperties();
this.root.push(this.properties);
this.properties.setBorder();
if (style) {
this.properties.setStyle(style);
}
if (width) {
this.properties.setWidth(width.size, width.type);
} else {
this.properties.setWidth(100);
}
=======
>>>>>>> |
<<<<<<<
for (let si of symbols) {
if (
/^__/.test(si.name) || // ignore members starting with __
=======
for (let nm of keys) {
const si = lastApiInfo.apis.byQName[nm]
if (/^__/.test(si.name) || // ignore members starting with __
>>>>>>>
for (let si of symbols) {
if (
/^__/.test(si.name) || // ignore members starting with __
<<<<<<<
r.entries[si.qName] = si
const n = lastApiInfo.decls[si.qName];
=======
entries[si.qName] = si
const n = lastApiInfo.decls[nm];
>>>>>>>
entries[si.qName] = si
const n = lastApiInfo.decls[si.qName]; |
<<<<<<<
=======
'NonSystemVpnWarningDismissed', this.nonSystemVpnWarningDismissed.bind(this));
this.rootEl.addEventListener(
'AutoConnectDialogDismissed', this.autoConnectDialogDismissed.bind(this));
this.rootEl.addEventListener(
>>>>>>>
'AutoConnectDialogDismissed', this.autoConnectDialogDismissed.bind(this));
this.rootEl.addEventListener(
<<<<<<<
=======
this.maybeShowNonSystemWarning();
this.maybeShowAutoConnectDialog();
>>>>>>>
this.maybeShowAutoConnectDialog();
<<<<<<<
=======
private maybeShowAutoConnectDialog() {
// TODO: remove this check when Windows full system VPN is released.
let vpnWarningDismissed = false;
try {
vpnWarningDismissed = this.getNonSystemVpnWarningDismissed();
} catch (e) {
console.error(`Could not read full-system VPN warning status, assuming not dismissed: ${e}`);
}
if (!this.hasSystemVpnSupport && !vpnWarningDismissed) {
// Only show the dialog on Windows if the non-VPN warning has been dismissed.
return;
}
let dismissed = false;
try {
dismissed = this.settings.get(SettingsKey.AUTO_CONNECT_DIALOG_DISMISSED) === 'true';
} catch (e) {
console.error(`Failed to read auto-connect dialog status, assuming not dismissed: ${e}`);
}
if (!dismissed) {
this.rootEl.$.serversView.$.autoConnectDialog.show();
}
}
private autoConnectDialogDismissed() {
this.settings.set(SettingsKey.AUTO_CONNECT_DIALOG_DISMISSED, 'true');
}
private maybeShowNonSystemWarning() {
if (this.hasSystemVpnSupport) {
return;
}
let dismissed = false;
try {
dismissed = this.getNonSystemVpnWarningDismissed();
} catch (e) {
console.error(`could not read full-system VPN warning status, assuming not dismissed`);
}
if (!dismissed) {
this.rootEl.$.serversView.$.nonSystemVpnWarning.show();
}
}
private getNonSystemVpnWarningDismissed() {
return this.settings.get(SettingsKey.VPN_WARNING_DISMISSED) === 'true';
}
private setNonSystemVpnWarningDismissed(dismissed: boolean) {
this.settings.set(SettingsKey.VPN_WARNING_DISMISSED, dismissed ? 'true' : 'false');
}
private nonSystemVpnWarningDismissed(event: CustomEvent) {
this.setNonSystemVpnWarningDismissed(true);
}
>>>>>>>
private maybeShowAutoConnectDialog() {
let dismissed = false;
try {
dismissed = this.settings.get(SettingsKey.AUTO_CONNECT_DIALOG_DISMISSED) === 'true';
} catch (e) {
console.error(`Failed to read auto-connect dialog status, assuming not dismissed: ${e}`);
}
if (!dismissed) {
this.rootEl.$.serversView.$.autoConnectDialog.show();
}
}
private autoConnectDialogDismissed() {
this.settings.set(SettingsKey.AUTO_CONNECT_DIALOG_DISMISSED, 'true');
} |
<<<<<<<
import { StoryRepository } from '../repositories/story.repository';
=======
import { PublishService } from '../services/publish.service';
import { DirectThreadRepository } from '../repositories/direct-thread.repository';
import { EntityFactory } from './entity.factory';
>>>>>>>
import { StoryRepository } from '../repositories/story.repository';
import { PublishService } from '../services/publish.service';
import { DirectThreadRepository } from '../repositories/direct-thread.repository';
import { EntityFactory } from './entity.factory';
<<<<<<<
public feed = new FeedFactory(this);
public story = new StoryRepository(this);
=======
public directThread = new DirectThreadRepository(this);
/* Services */
public publish = new PublishService(this);
>>>>>>>
public story = new StoryRepository(this);
public directThread = new DirectThreadRepository(this);
/* Services */
public publish = new PublishService(this); |
<<<<<<<
public story = new StoryRepository(this);
public directThread = new DirectThreadRepository(this);
=======
public user = new UserRepository(this);
public zr = new ZrRepository(this);
>>>>>>>
public story = new StoryRepository(this);
public user = new UserRepository(this);
public zr = new ZrRepository(this); |
<<<<<<<
fitView: (options: FitViewParams = { padding: 0.1 }) => {
const { elements, width, height, minZoom, maxZoom } = store.getState();
const nodes = elements.filter(isNode);
=======
fitView: (options: FitViewParams = { padding: DEFAULT_PADDING, includeHiddenNodes: false }) => {
const { nodes, width, height, minZoom, maxZoom } = store.getState();
>>>>>>>
fitView: (options: FitViewParams = { padding: DEFAULT_PADDING, includeHiddenNodes: false }) => {
const { elements, width, height, minZoom, maxZoom } = store.getState();
const nodes = elements.filter(isNode); |
<<<<<<<
import { ProvisionRequest } from "./provisioning/ProvisionRequest";
=======
import { getBridgeVersion } from "./util/PackageInfo";
>>>>>>>
import { ProvisionRequest } from "./provisioning/ProvisionRequest";
import { getBridgeVersion } from "./util/PackageInfo"; |
<<<<<<<
this.clientPool = new ClientPool(this, this.dataStore);
if (this.config.ircService.debugApi.enabled) {
this.debugApi = new DebugApi(
this,
this.config.ircService.debugApi.port,
this.ircServers,
this.clientPool,
this.registration.getAppServiceToken() as string
);
}
=======
if (this.activityTracker) {
log.info("Restoring last active times from DB");
const users = await this.dataStore.getLastSeenTimeForUsers();
for (const user of users) {
this.activityTracker.setLastActiveTime(user.user_id, user.ts);
}
log.info(`Restored ${users.length} last active times from DB`);
}
this.identGenerator = new IdentGenerator(this.dataStore);
this.ipv6Generator = new Ipv6Generator(this.dataStore);
>>>>>>>
this.clientPool = new ClientPool(this, this.dataStore);
if (this.config.ircService.debugApi.enabled) {
this.debugApi = new DebugApi(
this,
this.config.ircService.debugApi.port,
this.ircServers,
this.clientPool,
this.registration.getAppServiceToken() as string
);
}
if (this.activityTracker) {
log.info("Restoring last active times from DB");
const users = await this.dataStore.getLastSeenTimeForUsers();
for (const user of users) {
this.activityTracker.setLastActiveTime(user.user_id, user.ts);
}
log.info(`Restored ${users.length} last active times from DB`);
} |
<<<<<<<
import ResourcePackStatusType from '../type/ResourcePackStatusType';
import PacketHandler from './PacketHandler';
=======
>>>>>>>
import ResourcePackStatusType from '../type/ResourcePackStatusType';
import PacketHandler from './PacketHandler'; |
<<<<<<<
import {
setIntervalAsync,
clearIntervalAsync
} from 'set-interval-async/dynamic';
import RakNetListener from './RakNetListener';
=======
>>>>>>>
import RakNetListener from './RakNetListener'; |
<<<<<<<
const blockMeta = chunk.getBlockMetadata(
chunkPos.getX(),
chunkPos.getY(),
chunkPos.getZ()
);
const block = server
.getBlockManager()
.getBlockByIdAndMeta(blockId, blockMeta);
if (!block) {
server
.getLogger()
.warn(
`Block at ${packet.blockPosition.getX()} ${packet.blockPosition.getY()} ${packet.blockPosition.getZ()} is undefined!`
);
return;
}
=======
>>>>>>> |
<<<<<<<
import type Prismarine from '../../Prismarine';
import type PlayerActionPacket from '../packet/PlayerActionPacket';
import PlayerActionType from '../type/PlayerActionType';
=======
import PlayerAction from '../type/player-action';
import type PlayerActionPacket from '../packet/PlayerActionPacket';
import type Server from '../../Server';
>>>>>>>
import type Server from '../../Server';
import type PlayerActionPacket from '../packet/PlayerActionPacket';
import PlayerActionType from '../type/PlayerActionType';
<<<<<<<
import LevelEventType from '../type/LevelEventType';
import PacketHandler from './PacketHandler';
=======
>>>>>>>
import LevelEventType from '../type/LevelEventType';
import PacketHandler from './PacketHandler'; |
<<<<<<<
import {ModalWidgetStore} from "../stores/ModalWidgetStore";
=======
import {Analytics} from "../Analytics";
import UserActivity from "../UserActivity";
>>>>>>>
import {Analytics} from "../Analytics";
import UserActivity from "../UserActivity";
import {ModalWidgetStore} from "../stores/ModalWidgetStore";
<<<<<<<
mxModalWidgetStore: ModalWidgetStore;
=======
mxAnalytics: Analytics;
mxUserActivity: UserActivity;
>>>>>>>
mxAnalytics: Analytics;
mxUserActivity: UserActivity;
mxModalWidgetStore: ModalWidgetStore; |
<<<<<<<
[UIFeature.IdentityServer]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
=======
[UIFeature.Voip]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
[UIFeature.Feedback]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
[UIFeature.Registration]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
[UIFeature.PasswordReset]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
[UIFeature.Deactivate]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
[UIFeature.ShareQRCode]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
[UIFeature.ShareSocial]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
>>>>>>>
[UIFeature.Voip]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
[UIFeature.Feedback]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
[UIFeature.Registration]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
[UIFeature.PasswordReset]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
[UIFeature.Deactivate]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
[UIFeature.ShareQRCode]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
[UIFeature.ShareSocial]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
[UIFeature.IdentityServer]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
}, |
<<<<<<<
[UIFeature.Voip]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
=======
[UIFeature.Feedback]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
>>>>>>>
[UIFeature.Voip]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
[UIFeature.Feedback]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
}, |
<<<<<<<
import { OIDCState, WidgetPermissionStore } from "./WidgetPermissionStore";
=======
import { WidgetType } from "../../widgets/WidgetType";
import { EventType } from "matrix-js-sdk/src/@types/event";
>>>>>>>
import { OIDCState, WidgetPermissionStore } from "./WidgetPermissionStore";
import { WidgetType } from "../../widgets/WidgetType";
import { EventType } from "matrix-js-sdk/src/@types/event"; |
<<<<<<<
AdvancedSettings = "UIFeature.advancedSettings",
=======
Voip = "UIFeature.voip",
Feedback = "UIFeature.feedback",
Registration = "UIFeature.registration",
PasswordReset = "UIFeature.passwordReset",
Deactivate = "UIFeature.deactivate",
ShareQRCode = "UIFeature.shareQrCode",
ShareSocial = "UIFeature.shareSocial",
IdentityServer = "UIFeature.identityServer",
Flair = "UIFeature.flair",
>>>>>>>
Voip = "UIFeature.voip",
Feedback = "UIFeature.feedback",
Registration = "UIFeature.registration",
PasswordReset = "UIFeature.passwordReset",
Deactivate = "UIFeature.deactivate",
ShareQRCode = "UIFeature.shareQrCode",
ShareSocial = "UIFeature.shareSocial",
IdentityServer = "UIFeature.identityServer",
Flair = "UIFeature.flair",
AdvancedSettings = "UIFeature.advancedSettings", |
<<<<<<<
import {ModalManager} from "../Modal";
=======
import {IntegrationManagers} from "../integrations/IntegrationManagers";
>>>>>>>
import {IntegrationManagers} from "../integrations/IntegrationManagers";
import {ModalManager} from "../Modal";
<<<<<<<
singletonModalManager: ModalManager;
// TODO: Remove flag before launch: https://github.com/vector-im/riot-web/issues/14231
mx_QuietRoomListLogging: boolean;
=======
mxIntegrationManagers: typeof IntegrationManagers;
>>>>>>>
mxIntegrationManagers: typeof IntegrationManagers;
singletonModalManager: ModalManager; |
<<<<<<<
Communities = "UIFeature.communities",
=======
AdvancedSettings = "UIFeature.advancedSettings",
>>>>>>>
Communities = "UIFeature.communities",
AdvancedSettings = "UIFeature.advancedSettings", |
<<<<<<<
Voip = "UIFeature.voip",
=======
Feedback = "UIFeature.feedback",
>>>>>>>
Voip = "UIFeature.voip",
Feedback = "UIFeature.feedback", |
<<<<<<<
import { exec } from 'child_process';
// import { dirObj } from './main';
//let directoryGlobal;
=======
import { exec } from 'child_process';
>>>>>>>
import { exec } from 'child_process';
// import { dirObj } from './main';
//let directoryGlobal;
<<<<<<<
// console.log("looping through looking for module.exports", i)
=======
>>>>>>>
<<<<<<<
=======
=============")
=======
// console.log(" Showing entrypoints all")
// console.log(entryPoints)
// console.log("====================")
>>>>>>>
<<<<<<<
=======
=============")
=======
// console.log(formattedCode)
// console.log("====================")
>>>>>>>
<<<<<<<
this.loadStats2()
},
loadStats2: function () {
async function runWebpack2(cmd) {
return new Promise(function (resolve, reject) {
exec(cmd, (err, stdout, stderr) => {
if (err) {
reject(err);
} else {
resolve({ stdout, stderr });
}
});
});
}
console.log("calling runWebpack")
console.log("this.directory: ", this.directory)
// let aPromise = runWebpack2("cd " + this.directory + " && webpack --config ./webpack.config.js --profile --json > webpack-stats.tony.json")
console.log('checking it out: ', ("cd " + `'${this.directory}'` + " && webpack --env production --profile --json > stats.json"))
let aPromise = runWebpack2("cd '" + this.directory + "' && webpack --config ./webpack.config.js --env production --profile --json > stats.json")
.then((res) => {
console.log("there was a response")
isStatsUpdated()
// go display webpack stats
})
.catch((err) => {
console.log("there was an error")
console.log(err)
})
function isStatsUpdated() {
console.log("isStatsUpdated?")
fs.readFile("stats.json", (err, data) => {
if (err) {
console.log(err);
return;
}
console.log((data.toString()));
});
}
=======
this.loadStats2()
},
loadStats2: function () {
async function runWebpack2(cmd) {
return new Promise(function (resolve, reject) {
exec(cmd, (err, stdout, stderr) => {
if (err) {
reject(err);
} else {
resolve({ stdout, stderr });
}
});
});
}
console.log("calling runWebpack")
let aPromise = runWebpack2("cd " + this.directory + " && webpack --config ./webpack.config.js --profile --json > webpack-stats.tony.json")
.then((res)=>{
console.log("there was a response")
isStatsUpdated()
// go display webpack stats
})
.catch((err) => {
console.log("there was an error")
console.log(err)
})
function isStatsUpdated () {
console.log("isStatsUpdated?")
fs.readFile("c:/sandbox/simple_webpack_boilerplate/webpack-stats.tony.json", (err, data) => {
if (err) {
console.log(err);
return;
}
console.log((data.toString()));
});
}
>>>>>>>
this.loadStats2()
},
loadStats2: function () {
async function runWebpack2(cmd) {
return new Promise(function (resolve, reject) {
exec(cmd, (err, stdout, stderr) => {
if (err) {
reject(err);
} else {
resolve({ stdout, stderr });
}
});
});
}
console.log("calling runWebpack")
console.log("this.directory: ", this.directory)
// let aPromise = runWebpack2("cd " + this.directory + " && webpack --config ./webpack.config.js --profile --json > webpack-stats.tony.json")
console.log('checking it out: ', ("cd " + `'${this.directory}'` + " && webpack --env production --profile --json > stats.json"))
let aPromise = runWebpack2("cd '" + this.directory + "' && webpack --config ./webpack.config.js --env production --profile --json > stats.json")
.then((res) => {
console.log("there was a response")
isStatsUpdated()
// go display webpack stats
})
.catch((err) => {
console.log("there was an error")
console.log(err)
})
function isStatsUpdated() {
console.log("isStatsUpdated?")
fs.readFile("stats.json", (err, data) => {
if (err) {
console.log(err);
return;
}
console.log((data.toString()));
});
}
<<<<<<<
this.parsePlugin(data.toString())
// console.dir("^^^^^^^^^^^^^^^console.dir^^^^^^^")
// console.dir(JSON.stringify(entryPoints.all, null, 2))
return { entryPoints: pluginEntryPoints }
=======
this.parsePlugin(data.toString())
// console.dir("^^^^^^^^^^^^^^^console.dir^^^^^^^")
// console.dir(JSON.stringify (entryPoints.all, null, 2))
return { entryPoints: pluginEntryPoints}
>>>>>>>
this.parsePlugin(data.toString())
// console.dir("^^^^^^^^^^^^^^^console.dir^^^^^^^")
// console.dir(JSON.stringify(entryPoints.all, null, 2))
return { entryPoints: pluginEntryPoints } |
<<<<<<<
import U from '../Core/Utilities.js';
=======
import Math3D from '../parts-3d/Math.js';
const { perspective } = Math3D;
import U from '../parts/Utilities.js';
>>>>>>>
import Math3D from '../parts-3d/Math.js';
const { perspective } = Math3D;
import U from '../Core/Utilities.js'; |
<<<<<<<
* @sample {highcharts} highcharts/xaxis/zoomenabled/
* Zoom enabled
=======
* @sample {highcharts} highcharts/xaxis/xaxis/zoomenabled/
* Zoom enabled is false
>>>>>>>
* @sample {highcharts} highcharts/xaxis/zoomenabled/
* Zoom enabled is false |
<<<<<<<
class GanttChart extends Chart {
/**
* Initializes the chart. The constructor's arguments are passed on
* directly.
*
* @function Highcharts.GanttChart#init
*
* @param {Highcharts.Options} userOptions
* Custom options.
*
* @param {Function} [callback]
* Function to run when the chart has loaded and and all external
* images are loaded.
*
* @return {void}
*
* @fires Highcharts.GanttChart#event:init
* @fires Highcharts.GanttChart#event:afterInit
*/
public init(
userOptions: Partial<Highcharts.Options>,
callback?: Chart.CallbackFunction
): void {
var seriesOptions = userOptions.series,
defaultOptions = getOptions(),
defaultLinkedTo: number;
// If user hasn't defined axes as array, make it into an array and add a
// second axis by default.
if (!isArray(userOptions.xAxis)) {
userOptions.xAxis = [userOptions.xAxis || {}, {}];
=======
H.ganttChart = function (
renderTo: (string|HTMLDOMElement),
options: Highcharts.Options,
callback?: Chart.CallbackFunction
): Chart {
var hasRenderToArg = typeof renderTo === 'string' || renderTo.nodeName,
seriesOptions = options.series,
defaultOptions = getOptions(),
defaultLinkedTo: number,
userOptions = options;
options = arguments[hasRenderToArg ? 1 : 0];
// If user hasn't defined axes as array, make it into an array and add a
// second axis by default.
if (!isArray(options.xAxis)) {
options.xAxis = [options.xAxis || {}, {}];
}
// apply X axis options to both single and multi x axes
options.xAxis = options.xAxis.map(function (
xAxisOptions,
i
): Highcharts.XAxisOptions {
if (i === 1) { // Second xAxis
defaultLinkedTo = 0;
>>>>>>>
class GanttChart extends Chart {
/**
* Initializes the chart. The constructor's arguments are passed on
* directly.
*
* @function Highcharts.GanttChart#init
*
* @param {Highcharts.Options} userOptions
* Custom options.
*
* @param {Function} [callback]
* Function to run when the chart has loaded and and all external
* images are loaded.
*
* @return {void}
*
* @fires Highcharts.GanttChart#event:init
* @fires Highcharts.GanttChart#event:afterInit
*/
public init(
userOptions: Partial<Highcharts.Options>,
callback?: Chart.CallbackFunction
): void {
var seriesOptions = userOptions.series,
defaultOptions = getOptions(),
defaultLinkedTo: number;
// If user hasn't defined axes as array, make it into an array and add a
// second axis by default.
if (!isArray(userOptions.xAxis)) {
userOptions.xAxis = [userOptions.xAxis || {}, {}];
<<<<<<<
=======
});
delete options.series;
options = merge(
true,
{
chart: {
type: 'gantt'
},
title: {
text: null as any
},
legend: {
enabled: false
},
navigator: {
series: { type: 'gantt' },
// Bars were clipped, #14060.
yAxis: {
type: 'category'
}
}
} as Highcharts.Options,
>>>>>>> |
<<<<<<<
startAngleRad: number;
=======
clipCircle: SVGElement;
>>>>>>>
startAngleRad: number;
clipCircle: SVGElement; |
<<<<<<<
* crisp, cropThreshold, colorAxis, colorKey, depth,
* edgeColor, edgeWidth, findNearestPointBy, grouping,
* groupPadding, groupZPadding, maxPointWidth, negativeColor,
* pointInterval, pointIntervalUnit, pointPadding,
* pointPlacement, pointRange, pointStart, pointWidth,
* shadow, softThreshold, stacking, threshold, zoneAxis,
* zones, minPointLength
=======
* crisp, cropThreshold, depth, dragDrop, edgeColor,
* edgeWidth, findNearestPointBy, grouping, groupPadding,
* groupZPadding, maxPointWidth, negativeColor, pointInterval,
* pointIntervalUnit, pointPadding, pointPlacement,
* pointRange, pointStart, pointWidth, shadow, softThreshold,
* stacking, threshold, zoneAxis, zones, minPointLength
>>>>>>>
* crisp, cropThreshold, colorAxis, colorKey, depth, dragDrop,
* edgeColor, edgeWidth, findNearestPointBy, grouping,
* groupPadding, groupZPadding, maxPointWidth, negativeColor,
* pointInterval, pointIntervalUnit, pointPadding,
* pointPlacement, pointRange, pointStart, pointWidth,
* shadow, softThreshold, stacking, threshold, zoneAxis,
* zones, minPointLength |
<<<<<<<
import type SVGAttributes from '../Core/Renderer/SVG/SVGAttributes';
=======
import type {
PointOptions,
PointShortOptions
} from '../Core/Series/PointOptions';
import type Series from '../Core/Series/Series.js';
import type SeriesOptions from '../Core/Series/SeriesOptions';
>>>>>>>
import type SVGAttributes from '../Core/Renderer/SVG/SVGAttributes';
import type {
PointOptions,
PointShortOptions
} from '../Core/Series/PointOptions';
import type Series from '../Core/Series/Series.js';
import type SeriesOptions from '../Core/Series/SeriesOptions';
<<<<<<<
interface ChartLike {
dataTableDiv?: HTMLDivElement;
/** @requires modules/export-data */
downloadCSV(): void;
/** @requires modules/export-data */
downloadXLS(): void;
/** @requires modules/export-data */
getCSV(useLocalDecimalPoint?: boolean): string;
/** @requires modules/export-data */
getDataRows(
multiLevelHeaders?: boolean
): Array<Array<(number|string)>>;
/** @requires modules/export-data */
getTable(useLocalDecimalPoint?: boolean): string;
/** @requires modules/export-data */
getTableAST(useLocalDecimalPoint?: boolean): ASTNode;
/** @requires modules/export-data */
setUpKeyToAxis(): void;
/** @requires modules/export-data */
viewData(): void;
/** @requires modules/export-data */
toggleDataTable(show?: boolean): void;
/** @requires modules/export-data */
hideData(): void;
/** @requires modules/export-data */
isDataTableVisible: boolean;
}
=======
>>>>>>>
<<<<<<<
// Change the menu item text
const exportDivElements = this.exportDivElements,
menuItems = exportingOptions?.buttons?.contextButton.menuItems,
=======
Chart.prototype.toggleDataTable = function (): void {
var exportDivElements = this.exportDivElements,
options = this.options.exporting,
menuItems = options && options.buttons && options.buttons.contextButton.menuItems,
>>>>>>>
// Change the menu item text
const exportDivElements = this.exportDivElements,
options = this.options.exporting,
menuItems = options &&
options.buttons &&
options.buttons.contextButton.menuItems, |
<<<<<<<
class SVGElement {
public constructor();
[key: string]: any;
public element: (HTMLDOMElement|SVGDOMElement);
public parentGroup?: SVGElement;
public pathArray?: SVGPathArray;
public r?: number;
public renderer: SVGRenderer;
public rotation?: number;
public shadows?: Array<(HTMLDOMElement|SVGDOMElement)>;
public oldShadowOptions?: Highcharts.ShadowOptionsObject;
public styles?: CSSObject;
public text?: SVGElement;
public _defaultGetter(key: string): (number|string);
public _defaultSetter(
value: string,
key: string,
element: SVGDOMElement
): void;
public add(parent?: SVGElement): SVGElement;
public addClass(className: string, replace?: boolean): SVGElement;
public afterSetters(): void;
public align(
alignOptions?: AlignObject,
alignByTranslate?: boolean,
box?: (string|BBoxObject)
): SVGElement;
public alignSetter(value: ('start'|'middle'|'end')): void;
public animate(
params: SVGAttributes,
options?: (boolean|AnimationOptionsObject),
complete?: Function
): SVGElement;
public applyTextOutline(textOutline: string): void;
public attr(
hash: string
): (number|string)
public attr(
hash?: (string|SVGAttributes),
val?: (number|string|SVGPathArray),
complete?: Function,
continueAnimation?: boolean
): SVGElement;
public clip(clipRect?: ClipRectElement): SVGElement;
public complexColor(
color: GradientColorObject,
prop: string,
elem: SVGDOMElement
): void;
public crisp(
rect: RectangleObject,
strokeWidth?: number
): RectangleObject;
public css(styles: CSSObject): SVGElement;
public dashstyleSetter(value: string): void;
public destroy(): undefined;
public destroyShadows(): void;
public destroyTextPath (
elem: SVGDOMElement,
path: SVGElement
): void;
public dSetter(
value: (number|string|SVGPathArray),
key: string,
element: SVGDOMElement
): void;
public fadeOut(duration?: number): void;
public fillSetter(
value: ColorType,
key: string,
element: SVGDOMElement
): void;
public getBBox(reload?: boolean, rot?: number): BBoxObject;
public getStyle(prop: string): string;
public hasClass(className: string): boolean;
public hide(hideByTranslation?: boolean): SVGElement;
public init(renderer: SVGRenderer, nodeName: string): void;
public invert(inverted: boolean): SVGElement
public matrixSetter(value: any, key: string): void;
public on(eventType: string, handler: Function): SVGElement;
public opacitySetter(
value: string,
key: string,
element: SVGDOMElement
): void;
public removeClass(
className: (string|RegExp)
): SVGElement;
public removeTextOutline(tspans: Array<SVGDOMElement>): void;
public rotationOriginXSetter(value: any, key: string): void;
public rotationOriginYSetter(value: any, key: string): void;
public rotationSetter(value: any, key: string): void;
public safeRemoveChild(
element: (SVGDOMElement|HTMLDOMElement)
): void;
public scaleXSetter(value: any, key: string): void;
public scaleYSetter(value: any, key: string): void;
public setRadialReference(coordinates: Array<number>): SVGElement;
public setTextPath(
path: SVGElement,
textPathOptions: object
): SVGElement;
public shadow(
shadowOptions?: (boolean|Partial<ShadowOptionsObject>),
group?: SVGElement,
cutOff?: boolean
): SVGElement;
public show(inherit?: boolean): SVGElement;
public strokeSetter(
value: (number|string),
key: string,
element: SVGDOMElement
): void
public strokeWidth(): number;
public symbolAttr(hash: SVGAttributes): void;
public textSetter(value: string): void;
public titleSetter(value: string): void;
public toFront(): SVGElement;
public translate(x: number, y: number): SVGElement;
public translateXSetter(value: any, key: string): void;
public translateYSetter(value: any, key: string): void;
public updateShadows(
key: string,
value: number,
setter: Function
): void;
public updateTransform(): void;
public verticalAlignSetter(value: any, key: string): void;
public visibilitySetter(
value: string,
key: string,
element: SVGDOMElement
): void;
public xGetter(key: string): (number|string|null);
public xSetter?(
value: string,
key: string,
element: SVGDOMElement
): void;
public yGetter(key: string): (number|string|null);
public ySetter?(
value: string,
key: string,
element: SVGDOMElement
): void;
public zIndexSetter(value?: string, key?: string): boolean;
}
=======
>>>>>>> |
<<<<<<<
fill: '${palette.neutralColor10}'
}, AST.filterUserAttributes(hoverState || {}));
=======
fill: palette.neutralColor10
}, hoverState);
>>>>>>>
fill: palette.neutralColor10
}, AST.filterUserAttributes(hoverState || {})); |
<<<<<<<
=======
// eslint-disable-next-line valid-jsdoc
/** @ignore-option */
>>>>>>>
<<<<<<<
/**
* @ignore-options
* @private
*/
lineWidth: undefined, // #12222
=======
/** @ignore-options */
lineWidth: void 0, // #12222
>>>>>>>
/**
* @ignore-options
* @private
*/
lineWidth: void 0, // #12222 |
<<<<<<<
import Color from '../parts/Color.js';
const color = Color.parse;
=======
import type SVGPath from '../parts/SVGPath';
>>>>>>>
import type SVGPath from '../parts/SVGPath';
import Color from '../parts/Color.js';
const color = Color.parse; |
<<<<<<<
start: function (this: Highcharts.NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
=======
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Highcharts.Annotation {
>>>>>>>
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
<<<<<<<
start: function (this: Highcharts.NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
=======
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Highcharts.Annotation {
>>>>>>>
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
<<<<<<<
start: function (this: Highcharts.NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
=======
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Highcharts.Annotation {
>>>>>>>
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
<<<<<<<
start: function (this: Highcharts.NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
=======
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Highcharts.Annotation {
>>>>>>>
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
<<<<<<<
start: function (this: Highcharts.NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
=======
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Highcharts.Annotation {
>>>>>>>
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
<<<<<<<
start: function (this: Highcharts.NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
=======
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Highcharts.Annotation {
>>>>>>>
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
<<<<<<<
start: function (this: Highcharts.NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
=======
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Highcharts.Annotation {
>>>>>>>
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
<<<<<<<
start: function (this: Highcharts.NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
=======
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Highcharts.Annotation {
>>>>>>>
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
<<<<<<<
start: function (this: Highcharts.NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
=======
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Highcharts.Annotation {
>>>>>>>
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
<<<<<<<
start: function (this: Highcharts.NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
=======
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Highcharts.Annotation {
>>>>>>>
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
<<<<<<<
start: function (this: Highcharts.NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
=======
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Highcharts.Annotation {
>>>>>>>
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
<<<<<<<
start: function (this: Highcharts.NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
=======
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Highcharts.Annotation {
>>>>>>>
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
<<<<<<<
start: function (this: Highcharts.NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
=======
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Highcharts.Annotation {
>>>>>>>
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
<<<<<<<
start: function (this: Highcharts.NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
=======
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Highcharts.Annotation {
>>>>>>>
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
<<<<<<<
start: function (this: Highcharts.NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
=======
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Highcharts.Annotation {
>>>>>>>
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
<<<<<<<
start: function (this: Highcharts.NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
=======
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Highcharts.Annotation {
>>>>>>>
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Annotation { |
<<<<<<<
type DataGroupingApproximationValue = (
'average'|'averages'|'ohlc'|'open'|'high'|'low'|'close'|'sum'|
'windbarb'
);
=======
>>>>>>> |
<<<<<<<
import multipleLinesMixin from '../../mixins/multipe-lines.js';
import requiredIndicator from '../../mixins/indicator-required.js';
=======
import multipleLinesMixin from '../../mixins/multiple-lines.js';
import requiredIndicatorMixin from '../../mixins/indicator-required.js';
>>>>>>>
import multipleLinesMixin from '../../mixins/multiple-lines.js';
import requiredIndicator from '../../mixins/indicator-required.js'; |
<<<<<<<
* @excluding animationLimit, boostThreshold, colorAxis, colorKey,
* connectEnds, connectNulls, cropThreshold, dashStyle,
* findNearestPointBy, getExtremesFromAll, marker, negativeColor,
* pointPlacement, shadow, softThreshold, stacking, states, step,
* threshold, turboThreshold, xAxis, zoneAxis, zones
=======
* @excluding animationLimit, boostThreshold, connectEnds, connectNulls,
* cropThreshold, dashStyle, dragDrop, findNearestPointBy,
* getExtremesFromAll, marker, negativeColor, pointPlacement,
* shadow, softThreshold, stacking, states, step, threshold,
* turboThreshold, xAxis, zoneAxis, zones
>>>>>>>
* @excluding animationLimit, boostThreshold, colorAxis, colorKey,
* connectEnds, connectNulls, cropThreshold, dashStyle, dragDrop,
* findNearestPointBy, getExtremesFromAll, marker, negativeColor,
* pointPlacement, shadow, softThreshold, stacking, states, step,
* threshold, turboThreshold, xAxis, zoneAxis, zones |
<<<<<<<
import type WaterfallPoint from '../Series/Waterfall/WaterfallPoint';
=======
import type XRangePoint from '../Series/XRange/XRangePoint';
>>>>>>>
import type WaterfallPoint from '../Series/Waterfall/WaterfallPoint';
import type XRangePoint from '../Series/XRange/XRangePoint'; |
<<<<<<<
=======
import Color from '../parts/Color.js';
const color = Color.parse;
import SVGElement from '../parts/SVGElement.js';
import SVGRenderer from '../parts/SVGRenderer.js';
import U from '../parts/Utilities.js';
const {
addEvent,
createElement,
css,
defined,
discardElement,
erase,
extend,
extendClass,
getOptions,
isArray,
isNumber,
isObject,
merge,
offset,
pick,
pInt,
uniqueKey
} = U;
>>>>>>> |
<<<<<<<
import type SVGPath from '../../parts/SVGPath';
import controllableMixin from './controllableMixin.js';
import H from '../../parts/Globals.js';
import MockPoint from '../MockPoint.js';
import Tooltip from '../../parts/Tooltip.js';
import U from '../../parts/Utilities.js';
const {
extend,
format,
isNumber,
merge,
pick
} = U;
=======
import type Annotation from '../annotations.src';
import controllableMixin from './controllableMixin.js';
import H from './../../parts/Globals.js';
import MockPoint from './../MockPoint.js';
import Tooltip from '../../parts/Tooltip.js';
import U from './../../parts/Utilities.js';
const {
extend,
format,
isNumber,
merge,
pick
} = U;
>>>>>>>
import type Annotation from '../annotations.src';
import type SVGPath from '../../parts/SVGPath';
import controllableMixin from './controllableMixin.js';
import H from './../../parts/Globals.js';
import MockPoint from './../MockPoint.js';
import Tooltip from '../../parts/Tooltip.js';
import U from './../../parts/Utilities.js';
const {
extend,
format,
isNumber,
merge,
pick
} = U;
<<<<<<<
import '../../parts/SVGRenderer.js';
=======
import './../../parts/SvgRenderer.js';
>>>>>>>
import '../../parts/SVGRenderer.js'; |
<<<<<<<
=======
/**
* Get stock-specific default axis options.
*
* @private
* @function getDefaultAxisOptions
* @param {string} type
* @param {Highcharts.AxisOptions} options
* @return {Highcharts.AxisOptions}
*/
function getDefaultAxisOptions(
type: string,
options: Highcharts.AxisOptions
): DeepPartial<Highcharts.AxisOptions> {
if (type === 'xAxis') {
return {
minPadding: 0,
maxPadding: 0,
overscroll: 0,
ordinal: true,
title: {
text: null
},
labels: {
overflow: 'justify'
},
showLastLabel: true
};
}
if (type === 'yAxis') {
return {
labels: {
y: -2
},
opposite: pick(options.opposite, true),
/**
* @default {highcharts} true
* @default {highstock} false
* @apioption yAxis.showLastLabel
*
* @private
*/
showLastLabel: !!(
// #6104, show last label by default for category axes
options.categories ||
options.type === 'category'
),
title: {
text: null
}
};
}
return {};
}
const stockModule = {
stockChart,
StockChart
};
>>>>>>> |
<<<<<<<
categoryAndDatetimeMap = getCategoryAndDateTimeMap(
series,
pointArrayMap
),
mockSeries: Highcharts.ExportingSeries,
=======
mockSeries: Highcharts.ExportDataSeries,
>>>>>>>
categoryAndDatetimeMap = getCategoryAndDateTimeMap(
series,
pointArrayMap
),
mockSeries: Highcharts.ExportDataSeries, |
<<<<<<<
this.horiz ? [
['M', pos - 4, this.top - 6],
['L', pos + 4, this.top - 6],
['L', pos, this.top],
['Z']
=======
axis.horiz ? [
'M',
pos - 4, top - 6,
'L',
pos + 4, top - 6,
pos, top,
'Z'
>>>>>>>
axis.horiz ? [
['M', pos - 4, this.top - 6],
['L', pos + 4, this.top - 6],
['L', pos, this.top],
['Z']
<<<<<<<
['M', this.left, pos],
['L', this.left - 6, pos + 6],
['L', this.left - 6, pos - 6],
['Z']
=======
'M',
left, pos,
'L',
left - 6, pos + 6,
left - 6, pos - 6,
'Z'
>>>>>>>
['M', this.left, pos],
['L', this.left - 6, pos + 6],
['L', this.left - 6, pos - 6],
['Z'] |
<<<<<<<
dateBox,
inputGroup = this.inputGroup;
=======
dateBox;
>>>>>>>
dateBox;
<<<<<<<
if (value !== input.previousValue && isNumber(value)) {
input.previousValue = value;
=======
const { maxInput, minInput } = rangeSelector;
value = (options.inputDateParser || defaultInputDateParser)(
inputValue,
chart.time.useUTC,
chart.time
);
if (
value !== Number(input.getAttribute('data-hc-time-previous')) &&
isNumber(value)
) {
input.setAttribute('data-hc-time-previous', value);
>>>>>>>
const { maxInput, minInput } = rangeSelector;
if (
value !== Number(input.getAttribute('data-hc-time-previous')) &&
isNumber(value)
) {
input.setAttribute('data-hc-time-previous', value);
<<<<<<<
type: preferredInputType(options.inputDateFormat || '%b %e, %Y')
}, void 0, div);
=======
type: 'text'
}, {
top: chart.plotTop + 'px' // prevent jump on focus in Firefox
}, div) as any;
>>>>>>>
type: preferredInputType(options.inputDateFormat || '%b %e, %Y')
}, void 0, div) as any; |
<<<<<<<
import type BrokenAxis from '../../modules/broken-axis.src';
=======
import type DateTimeAxis from '../DateTimeAxis';
>>>>>>>
import type BrokenAxis from '../../modules/broken-axis.src';
import type DateTimeAxis from '../DateTimeAxis';
<<<<<<<
brokenAxis?: BrokenAxis['brokenAxis'];
=======
dateTime?: DateTimeAxis['dateTime'];
>>>>>>>
brokenAxis?: BrokenAxis['brokenAxis'];
dateTime?: DateTimeAxis['dateTime']; |
<<<<<<<
this.applyRotateTimeline(timeline, skeleton, animationTime, mix, timelineBlend, timelinesRotation, ii << 1, firstFrame);
} else
timeline.apply(skeleton, animationLast, animationTime, events, mix, timelineBlend, MixDirection.in);
=======
this.applyRotateTimeline(timeline, skeleton, animationTime, mix, pose, timelinesRotation, ii << 1, firstFrame);
} else {
// This fixes the WebKit 602 specific issue described at http://esotericsoftware.com/forum/iOS-10-disappearing-graphics-10109
Utils.webkit602BugfixHelper(mix, pose);
timeline.apply(skeleton, animationLast, animationTime, events, mix, pose, MixDirection.in);
}
>>>>>>>
this.applyRotateTimeline(timeline, skeleton, animationTime, mix, timelineBlend, timelinesRotation, ii << 1, firstFrame);
} else {
// This fixes the WebKit 602 specific issue described at http://esotericsoftware.com/forum/iOS-10-disappearing-graphics-10109
Utils.webkit602BugfixHelper(mix, pose);
timeline.apply(skeleton, animationLast, animationTime, events, mix, timelineBlend, MixDirection.in);
}
<<<<<<<
let alphaDip = from.alpha * to.interruptAlpha, alphaMix = alphaDip * (1 - mix);
if (blend == MixBlend.add) {
for (var i = 0; i < timelineCount; i++)
timelines[i].apply(skeleton, animationLast, animationTime, events, alphaMix, blend, MixDirection.out);
} else {
let timelineData = from.timelineData;
let timelineDipMix = from.timelineDipMix;
let firstFrame = from.timelinesRotation.length == 0;
if (firstFrame) Utils.setArraySize(from.timelinesRotation, timelineCount << 1, null);
let timelinesRotation = from.timelinesRotation;
from.totalAlpha = 0;
for (var i = 0; i < timelineCount; i++) {
let timeline = timelines[i];
var timelineBlend: MixBlend;
var alpha = 0;
switch (timelineData[i]) {
case AnimationState.SUBSEQUENT:
if (!attachments && timeline instanceof AttachmentTimeline) continue;
if (!drawOrder && timeline instanceof DrawOrderTimeline) continue;
timelineBlend = blend;
alpha = alphaMix;
break;
case AnimationState.FIRST:
timelineBlend = MixBlend.setup;
alpha = alphaMix;
break;
case AnimationState.DIP:
timelineBlend = MixBlend.setup;
alpha = alphaDip;
break;
default:
timelineBlend = MixBlend.setup;
let dipMix = timelineDipMix[i];
alpha = alphaDip * Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
break;
}
from.totalAlpha += alpha;
if (timeline instanceof RotateTimeline)
this.applyRotateTimeline(timeline, skeleton, animationTime, alpha, timelineBlend, timelinesRotation, i << 1, firstFrame);
else {
timeline.apply(skeleton, animationLast, animationTime, events, alpha, timelineBlend, MixDirection.out);
}
=======
let timelineData = from.timelineData;
let timelineDipMix = from.timelineDipMix;
let firstFrame = from.timelinesRotation.length == 0;
if (firstFrame) Utils.setArraySize(from.timelinesRotation, timelineCount << 1, null);
let timelinesRotation = from.timelinesRotation;
let pose: MixPose;
let alphaDip = from.alpha * to.interruptAlpha, alphaMix = alphaDip * (1 - mix), alpha = 0;
from.totalAlpha = 0;
for (var i = 0; i < timelineCount; i++) {
let timeline = timelines[i];
switch (timelineData[i]) {
case AnimationState.SUBSEQUENT:
if (!attachments && timeline instanceof AttachmentTimeline) continue;
if (!drawOrder && timeline instanceof DrawOrderTimeline) continue;
pose = currentPose;
alpha = alphaMix;
break;
case AnimationState.FIRST:
pose = MixPose.setup
alpha = alphaMix;
break;
case AnimationState.DIP:
pose = MixPose.setup;
alpha = alphaDip;
break;
default:
pose = MixPose.setup;
alpha = alphaDip;
let dipMix = timelineDipMix[i];
alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
break;
}
from.totalAlpha += alpha;
if (timeline instanceof RotateTimeline)
this.applyRotateTimeline(timeline, skeleton, animationTime, alpha, pose, timelinesRotation, i << 1, firstFrame);
else {
// This fixes the WebKit 602 specific issue described at http://esotericsoftware.com/forum/iOS-10-disappearing-graphics-10109
Utils.webkit602BugfixHelper(alpha, pose);
timeline.apply(skeleton, animationLast, animationTime, events, alpha, pose, MixDirection.out);
>>>>>>>
let alphaDip = from.alpha * to.interruptAlpha, alphaMix = alphaDip * (1 - mix);
if (blend == MixBlend.add) {
for (var i = 0; i < timelineCount; i++)
timelines[i].apply(skeleton, animationLast, animationTime, events, alphaMix, blend, MixDirection.out);
} else {
let timelineData = from.timelineData;
let timelineDipMix = from.timelineDipMix;
let firstFrame = from.timelinesRotation.length == 0;
if (firstFrame) Utils.setArraySize(from.timelinesRotation, timelineCount << 1, null);
let timelinesRotation = from.timelinesRotation;
from.totalAlpha = 0;
for (var i = 0; i < timelineCount; i++) {
let timeline = timelines[i];
var timelineBlend: MixBlend;
var alpha = 0;
switch (timelineData[i]) {
case AnimationState.SUBSEQUENT:
if (!attachments && timeline instanceof AttachmentTimeline) continue;
if (!drawOrder && timeline instanceof DrawOrderTimeline) continue;
timelineBlend = blend;
alpha = alphaMix;
break;
case AnimationState.FIRST:
timelineBlend = MixBlend.setup;
alpha = alphaMix;
break;
case AnimationState.DIP:
timelineBlend = MixBlend.setup;
alpha = alphaDip;
break;
default:
timelineBlend = MixBlend.setup;
let dipMix = timelineDipMix[i];
alpha = alphaDip * Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
break;
}
from.totalAlpha += alpha;
if (timeline instanceof RotateTimeline)
this.applyRotateTimeline(timeline, skeleton, animationTime, alpha, timelineBlend, timelinesRotation, i << 1, firstFrame);
else {
// This fixes the WebKit 602 specific issue described at http://esotericsoftware.com/forum/iOS-10-disappearing-graphics-10109
Utils.webkit602BugfixHelper(alpha, pose);
timeline.apply(skeleton, animationLast, animationTime, events, alpha, timelineBlend, MixDirection.out);
} |
<<<<<<<
client.getNativeClient().sendCommand("HelloWorld");
},
() => nodecg.log.info("AHK client has been unset."),
);
=======
client.getRawClient().sendCommand("HelloWorld");
});
ahk?.onUnavailable(() => nodecg.log.info("AHK client has been unset."));
>>>>>>>
client.getNativeClient().sendCommand("HelloWorld");
});
ahk?.onUnavailable(() => nodecg.log.info("AHK client has been unset.")); |
<<<<<<<
import { ServiceProvider, ServiceClient } from "nodecg-io-core/extension/types";
import { emptySuccess, success, Result } from "nodecg-io-core/extension/utils/result";
=======
import { emptySuccess, Result, success } from "nodecg-io-core/extension/utils/result";
>>>>>>>
import { ServiceClient } from "nodecg-io-core/extension/types";
import { emptySuccess, Result, success } from "nodecg-io-core/extension/utils/result"; |
<<<<<<<
import { ServiceProvider, ServiceClient } from "nodecg-io-core/extension/types";
import { emptySuccess, success, Result } from "nodecg-io-core/extension/utils/result";
=======
import { emptySuccess, Result, success } from "nodecg-io-core/extension/utils/result";
>>>>>>>
import { ServiceClient } from "nodecg-io-core/extension/types";
import { emptySuccess, Result, success } from "nodecg-io-core/extension/utils/result"; |
<<<<<<<
import { ServiceProvider, ServiceClient } from "nodecg-io-core/extension/types";
import { emptySuccess, success, Result } from "nodecg-io-core/extension/utils/result";
=======
import { emptySuccess, Result, success } from "nodecg-io-core/extension/utils/result";
>>>>>>>
import { ServiceClient } from "nodecg-io-core/extension/types";
import { emptySuccess, Result, success } from "nodecg-io-core/extension/utils/result"; |
<<<<<<<
import { ServiceProvider, ServiceClient } from "nodecg-io-core/extension/types";
import { emptySuccess, success, Result } from "nodecg-io-core/extension/utils/result";
=======
import { emptySuccess, Result, success } from "nodecg-io-core/extension/utils/result";
>>>>>>>
import { emptySuccess, Result, success } from "nodecg-io-core/extension/utils/result";
import { ServiceClient } from "nodecg-io-core/extension/types"; |
<<<<<<<
import { ServiceProvider, ServiceClient } from "nodecg-io-core/extension/types";
import { emptySuccess, success, Result } from "nodecg-io-core/extension/utils/result";
=======
import { emptySuccess, Result, success } from "nodecg-io-core/extension/utils/result";
>>>>>>>
import { ServiceClient } from "nodecg-io-core/extension/types";
import { emptySuccess, Result, success } from "nodecg-io-core/extension/utils/result"; |
<<<<<<<
}
export interface RefreshTokenMiddleware {
value: string | null
type: 'query' | 'cookie' | null
}
export interface RequestExtended extends Request {
refresh_token?: RefreshTokenMiddleware
permission_variables?: PermissionVariables
=======
}
export interface SetNewEmailData {
update_auth_accounts: {
returning: {
user: UserData
}[]
affected_rows: number
}
>>>>>>>
}
export interface RefreshTokenMiddleware {
value: string | null
type: 'query' | 'cookie' | null
}
export interface RequestExtended extends Request {
refresh_token?: RefreshTokenMiddleware
permission_variables?: PermissionVariables
}
export interface SetNewEmailData {
update_auth_accounts: {
returning: {
user: UserData
}[]
affected_rows: number
} |
<<<<<<<
await this.waitForDeploymentCompletion(this.taskParameters.applicationName, deploymentId);
=======
await this.waitForDeploymentCompletion(taskParameters.applicationName, deploymentId, taskParameters.timeoutInMins);
>>>>>>>
await this.waitForDeploymentCompletion(this.taskParameters.applicationName, deploymentId, this.taskParameters.timeoutInMins);
<<<<<<<
private async waitForDeploymentCompletion(applicationName: string, deploymentId: string) : Promise<void> {
=======
private static async waitForDeploymentCompletion(applicationName: string, deploymentId: string, timeout: number) : Promise<void> {
>>>>>>>
private async waitForDeploymentCompletion(applicationName: string, deploymentId: string, timeout: number) : Promise<void> { |
<<<<<<<
attribute: process.env.QAW_ATTRIBUTE || "data-qa,data-test,data-testid",
browser: getBrowserType(process.env.QAW_BROWSER || "chromium"),
=======
attribute:
process.env.QAW_ATTRIBUTE || "data-cy,data-qa,data-test,data-testid",
>>>>>>>
attribute:
process.env.QAW_ATTRIBUTE || "data-cy,data-qa,data-test,data-testid",
browser: getBrowserType(process.env.QAW_BROWSER || "chromium"), |
<<<<<<<
createTest,
countPendingTests,
=======
createTestAndTestTriggers,
countIncompleteTests,
>>>>>>>
createTest,
countIncompleteTests, |
<<<<<<<
const buildTypeStep = ({
allEvents,
firstEvent,
value
}: BuildTypeStepOptions): Step => {
return {
action: "type",
cssSelector: firstEvent.cssSelector,
html: firstEvent.target,
// include event index so we can sort in buildSteps
index: allEvents.indexOf(firstEvent),
page: firstEvent.page,
value
};
};
=======
>>>>>>> |
<<<<<<<
return (
isMouseDownEvent(event) || isScrollEvent(event) || isInputEvent(event)
);
=======
return isClickEvent(event) || isScrollEvent(event) || isTypeEvent(event);
>>>>>>>
return isClickEvent(event) || isInputEvent(event) || isScrollEvent(event);
<<<<<<<
if (isInputEvent(event)) return "input";
if (isMouseDownEvent(event)) return "click";
=======
if (isClickEvent(event)) return "click";
>>>>>>>
if (isClickEvent(event)) return "click";
if (isInputEvent(event)) return "input"; |
<<<<<<<
import "../../../components/ha-paper-icon-button-arrow-prev";
import { haStyle } from "../../../resources/ha-style";
=======
import { haStyle } from "../../../resources/styles";
>>>>>>>
import "../../../components/ha-paper-icon-button-arrow-prev";
import { haStyle } from "../../../resources/styles"; |
<<<<<<<
import { NbSidebarService, NbToggleModule } from '@nebular/theme';
import { isPlatformBrowser, Location } from '@angular/common';
=======
import { NbSidebarService } from '@nebular/theme';
import { DOCUMENT, isPlatformBrowser, Location } from '@angular/common';
>>>>>>>
import { NbSidebarService, NbToggleModule } from '@nebular/theme';
import { DOCUMENT, isPlatformBrowser, Location } from '@angular/common'; |
<<<<<<<
=======
entryComponents: [
CommunityFormsListStatsComponent,
CommunityFormsListActionsComponent,
CookieConsentComponent
// EmailerComponent
],
>>>>>>>
entryComponents: [
CookieConsentComponent
// EmailerComponent
], |
<<<<<<<
NbUserModule,
NbSidebarModule.forRoot()
=======
NbUserModule
],
exports: [
LabDisplayCardComponent
>>>>>>>
NbUserModule,
NbSidebarModule.forRoot()
],
exports: [
LabDisplayCardComponent |
<<<<<<<
import {CookieConsentService} from './services/cookie-consent.service';
import {Component, Inject, OnInit, PLATFORM_ID} from '@angular/core';
import {ApiRoutesService} from 'projects/shared-services/api-routes.service';
import {environment} from '../environments/environment';
import {LibAuthwatchService} from 'projects/shared-services/lib-authwatch.service';
import {NbMenuItem, NbSidebarService, NbWindowService, NbWindowState} from '@nebular/theme';
import {faBars} from '@fortawesome/free-solid-svg-icons';
import {ICurrentUser} from 'projects/shared-models/current_user.model';
import {Router} from '@angular/router';
import {DOCUMENT, isPlatformBrowser} from '@angular/common';
import {Title} from '@angular/platform-browser';
import {ActionCableConnectionSocket} from 'projects/shared-services/action-cable-connection.socket';
import {AppCentralNotificationService} from './services/app-central-notifications.service';
import {CookieConsentComponent} from '../../../shared-components/cookie-consent/cookie-consent.component';
=======
import { CookieConsentService } from './services/cookie-consent.service';
import { Component, Inject, PLATFORM_ID, OnInit } from '@angular/core';
import { ApiRoutesService } from 'projects/shared-services/api-routes.service';
import { environment } from '../environments/environment';
import { LibAuthwatchService } from 'projects/shared-services/lib-authwatch.service';
import { NbMenuItem, NbSidebarService, NbWindowService, NbWindowState, NbIconLibraries } from '@nebular/theme';
import { faBars } from '@fortawesome/free-solid-svg-icons';
import { ICurrentUser } from 'projects/shared-models/current_user.model';
import { Router } from '@angular/router';
import { DOCUMENT, isPlatformBrowser } from '@angular/common';
import { Title } from '@angular/platform-browser';
import { ActionCableConnectionSocket } from 'projects/shared-services/action-cable-connection.socket';
import { UserPersonalDiscussionChatNotificationsChannel } from 'projects/shared-services/websockets/user-personal-discussion-chat-notifications.channel';
import { CookieConsentComponent } from 'projects/shared-components/cookie-consent/cookie-consent.component';
import { AppCentralNotificationService } from './services/app-central-notifications.service';
>>>>>>>
import {CookieConsentService} from './services/cookie-consent.service';
import {Component, Inject, OnInit, PLATFORM_ID} from '@angular/core';
import {ApiRoutesService} from 'projects/shared-services/api-routes.service';
import {environment} from '../environments/environment';
import {LibAuthwatchService} from 'projects/shared-services/lib-authwatch.service';
import {NbMenuItem, NbSidebarService, NbWindowService, NbWindowState, NbIconLibraries} from '@nebular/theme';
import {faBars} from '@fortawesome/free-solid-svg-icons';
import {ICurrentUser} from 'projects/shared-models/current_user.model';
import {Router} from '@angular/router';
import {DOCUMENT, isPlatformBrowser} from '@angular/common';
import {Title} from '@angular/platform-browser';
import {ActionCableConnectionSocket} from 'projects/shared-services/action-cable-connection.socket';
import {AppCentralNotificationService} from './services/app-central-notifications.service';
import {CookieConsentComponent} from '../../../shared-components/cookie-consent/cookie-consent.component';
<<<<<<<
private appCentralNotificationsService: AppCentralNotificationService
) {
this.checkHTTPS();
this.apiRoutes.setBaseUrl(environment.base_url);
this.actionCableConnectionSocket.setBaseUrl(environment.action_cable_url);
this.titleService.setTitle('Commudle | Developer Communities, Together');
=======
private appCentralNotificationsService: AppCentralNotificationService,
private iconLibraries: NbIconLibraries
) {
this.checkHTTPS();
this.apiRoutes.setBaseUrl(environment.base_url);
this.actionCableConnectionSocket.setBaseUrl(environment.action_cable_url);
this.titleService.setTitle("Commudle | Developer Communities, Together");
this.iconLibraries.registerFontPack('font-awesome', { iconClassPrefix: 'fa', packClass: 'fa' });
>>>>>>>
private appCentralNotificationsService: AppCentralNotificationService,
private iconLibraries: NbIconLibraries
) {
this.checkHTTPS();
this.apiRoutes.setBaseUrl(environment.base_url);
this.actionCableConnectionSocket.setBaseUrl(environment.action_cable_url);
this.titleService.setTitle('Commudle | Developer Communities, Together');
this.iconLibraries.registerFontPack('font-awesome', { iconClassPrefix: 'fa', packClass: 'fa' }); |
<<<<<<<
/** control for the selected bank for server side filtering */
public bankServerSideCtrl: FormControl = new FormControl();
/** control for filter for server side. */
public bankServerSideFilteringCtrl: FormControl = new FormControl();
=======
/** control for the selected bank for option groups */
public bankGroupsCtrl: FormControl = new FormControl();
/** control for the MatSelect filter keyword for option groups */
public bankGroupsFilterCtrl: FormControl = new FormControl();
>>>>>>>
/** control for the selected bank for server side filtering */
public bankServerSideCtrl: FormControl = new FormControl();
/** control for filter for server side. */
public bankServerSideFilteringCtrl: FormControl = new FormControl();
/** control for the selected bank for option groups */
public bankGroupsCtrl: FormControl = new FormControl();
/** control for the MatSelect filter keyword for option groups */
public bankGroupsFilterCtrl: FormControl = new FormControl();
<<<<<<<
/** list of banks filtered after simulating server side search */
public filteredServerSideBanks: ReplaySubject<Bank[]> = new ReplaySubject<Bank[]>(1);
=======
/** list of bank groups filtered by search keyword for option groups */
public filteredBankGroups: ReplaySubject<BankGroup[]> = new ReplaySubject<BankGroup[]>(1);
>>>>>>>
/** list of banks filtered after simulating server side search */
public filteredServerSideBanks: ReplaySubject<Bank[]> = new ReplaySubject<Bank[]>(1);
/** list of bank groups filtered by search keyword for option groups */
public filteredBankGroups: ReplaySubject<BankGroup[]> = new ReplaySubject<BankGroup[]>(1);
<<<<<<<
this.bankServerSideFilteringCtrl.valueChanges
.pipe(
takeUntil(this._onDestroy),
debounceTime(200),
filter(search => !!search),
map(search => {
if (!this.banks) {
return [];
}
return this.banks.filter(bank => bank.name.toLowerCase().indexOf(search) > -1);
}),
delay(500) // add server simulation
)
.subscribe(this.filteredServerSideBanks);
=======
this.bankGroupsFilterCtrl.valueChanges
.pipe(takeUntil(this._onDestroy))
.subscribe(() => {
this.filterBankGroups();
});
>>>>>>>
this.bankServerSideFilteringCtrl.valueChanges
.pipe(
takeUntil(this._onDestroy),
debounceTime(200),
filter(search => !!search),
map(search => {
if (!this.banks) {
return [];
}
return this.banks.filter(bank => bank.name.toLowerCase().indexOf(search) > -1);
}),
delay(500) // add server simulation
)
.subscribe(this.filteredServerSideBanks);
this.bankGroupsFilterCtrl.valueChanges
.pipe(takeUntil(this._onDestroy))
.subscribe(() => {
this.filterBankGroups();
}); |
<<<<<<<
const ethjsUtil = require('ethjs-util')
const {
privateKeyVerify,
publicKeyCreate,
publicKeyVerify,
publicKeyConvert,
} = require('ethereum-cryptography/secp256k1')
=======
import * as ethjsUtil from 'ethjs-util'
>>>>>>>
import * as ethjsUtil from 'ethjs-util'
const {
privateKeyVerify,
publicKeyCreate,
publicKeyVerify,
publicKeyConvert,
} = require('ethereum-cryptography/secp256k1') |
<<<<<<<
const settings: any = { enableInlineErrorMessages: true }
const sut = new JestExt(null, projectWorkspace, channelStub, settings)
=======
const settings: any = {
debugCodeLens: {},
enableInlineErrorMessages: true,
}
const sut = new JestExt(projectWorkspace, channelStub, settings)
>>>>>>>
const settings: any = {
debugCodeLens: {},
enableInlineErrorMessages: true,
}
const sut = new JestExt(null, projectWorkspace, channelStub, settings) |
<<<<<<<
runtimeImports: Set<string>;
=======
usedEnums: { [name: string]: TypeID };
usedFragments: Set<string>;
>>>>>>>
runtimeImports: Set<string>;
usedEnums: { [name: string]: TypeID };
usedFragments: Set<string>; |
<<<<<<<
public getProtocolTypes() {
return ProtocolTypes;
}
=======
public deserialize(json: any): void {
super.deserialize(json);
this.missionStatus = json.missionStatus;
this.vehicleLocation = json.vehicleLocation;
}
>>>>>>>
public getProtocolTypes() {
return ProtocolTypes;
}
public deserialize(json: any): void {
super.deserialize(json);
this.missionStatus = json.missionStatus;
this.vehicleLocation = json.vehicleLocation;
} |
<<<<<<<
public getProtocolTypes() {
return ProtocolTypes;
}
=======
public deserialize(json: any): void {
super.deserialize(json);
}
>>>>>>>
public getProtocolTypes() {
return ProtocolTypes;
}
public deserialize(json: any): void {
super.deserialize(json);
} |
<<<<<<<
/**
* Time, in milliseconds, the timer should delay in between reask kafka for new events.
*/
kafkaBrowserPollingInterval?: number;
kafkaBrowserRequestTimeout?: number;
/**
* Blockchain type (local/test/main). for using local blockchain, you must specify contracts.
*/
=======
/**
* @property Time, in milliseconds, the timer should delay in between reask kafka for new events.
*/
kafkaPollingInterval?: number;
/**
* @property Blockchain type (local/test/main). for using local blockchain, you must specify contracts.
*/
>>>>>>>
/**
* @property Time, in milliseconds, the timer should delay in between reask kafka for new events.
*/
kafkaBrowserPollingInterval?: number;
kafkaBrowserRequestTimeout?: number;
/**
* @property Blockchain type (local/test/main). for using local blockchain, you must specify contracts.
*/ |
<<<<<<<
new GraphQLFixture(languages.PikeLanguage),
new GraphQLFixture(languages.HaskellLanguage),
=======
new GraphQLFixture(languages.PikeLanguage),
new CommandSuccessfulLanguageFixture(languages.JavaScriptPropTypesLanguage),
>>>>>>>
new GraphQLFixture(languages.PikeLanguage),
new GraphQLFixture(languages.HaskellLanguage),
new CommandSuccessfulLanguageFixture(languages.JavaScriptPropTypesLanguage), |
<<<<<<<
public getProtocolTypes() {
return ProtocolTypes;
}
=======
public deserialize(json: any): void {
super.deserialize(json);
this.startLocation = json.startLocation;
this.endLocation = json.endLocation;
this.vehicleType = json.vehicleType;
this.maxAltitude = json.maxAltitude;
}
>>>>>>>
public getProtocolTypes() {
return ProtocolTypes;
}
public deserialize(json: any): void {
super.deserialize(json);
this.startLocation = json.startLocation;
this.endLocation = json.endLocation;
this.vehicleType = json.vehicleType;
this.maxAltitude = json.maxAltitude;
} |
<<<<<<<
public getProtocolTypes() {
return ProtocolTypes;
}
=======
public deserialize(json: any): void {
super.deserialize(json);
}
>>>>>>>
public getProtocolTypes() {
return ProtocolTypes;
}
public deserialize(json: any): void {
super.deserialize(json);
} |
<<<<<<<
public getProtocolTypes() {
return ProtocolTypes;
}
=======
public deserialize(json: any): void {
super.deserialize(json);
this.missionStatus = json.missionStatus;
}
>>>>>>>
public getProtocolTypes() {
return ProtocolTypes;
}
public deserialize(json: any): void {
super.deserialize(json);
this.missionStatus = json.missionStatus;
} |
<<<<<<<
export default class TSFilter extends stream.Duplex {
=======
interface BasicExtState {
basic: {
flags: FlagState[];
lastFlagsId: number;
}
extended: {
flags: FlagState[];
lastFlagsId: number;
}
}
interface FlagState {
flag: Buffer;
ignore: Buffer;
version_number: number;
}
class TSFilter extends stream.Duplex {
>>>>>>>
interface BasicExtState {
basic: {
flags: FlagState[];
lastFlagsId: number;
}
extended: {
flags: FlagState[];
lastFlagsId: number;
}
}
interface FlagState {
flag: Buffer;
ignore: Buffer;
version_number: number;
}
export default class TSFilter extends stream.Duplex {
<<<<<<<
}
=======
}
function getTime(buffer: Buffer): number {
let mjd = (buffer[0] << 8) | buffer[1];
let y = (((mjd - 15078.2) / 365.25) | 0);
let m = (((mjd - 14956.1 - ((y * 365.25) | 0)) / 30.6001) | 0);
let d = mjd - 14956 - ((y * 365.25) | 0) - ((m * 30.6001) | 0);
let k = (m === 14 || m === 15) ? 1 : 0;
y = y + k + 1900;
m = m - 1 - k * 12;
let h = (buffer[2] >> 4) * 10 + (buffer[2] & 0x0F);
let i = (buffer[3] >> 4) * 10 + (buffer[3] & 0x0F);
let s = (buffer[4] >> 4) * 10 + (buffer[4] & 0x0F);
return new Date(y, m - 1, d, h, i, s).getTime();
}
export = TSFilter;
>>>>>>>
}
function getTime(buffer: Buffer): number {
let mjd = (buffer[0] << 8) | buffer[1];
let y = (((mjd - 15078.2) / 365.25) | 0);
let m = (((mjd - 14956.1 - ((y * 365.25) | 0)) / 30.6001) | 0);
let d = mjd - 14956 - ((y * 365.25) | 0) - ((m * 30.6001) | 0);
let k = (m === 14 || m === 15) ? 1 : 0;
y = y + k + 1900;
m = m - 1 - k * 12;
let h = (buffer[2] >> 4) * 10 + (buffer[2] & 0x0F);
let i = (buffer[3] >> 4) * 10 + (buffer[3] & 0x0F);
let s = (buffer[4] >> 4) * 10 + (buffer[4] & 0x0F);
return new Date(y, m - 1, d, h, i, s).getTime();
} |
<<<<<<<
private bridge: Bridge;
private dataPromise: Promise<IMetaJSON>;
=======
public bridge: Bridge;
>>>>>>>
public bridge: Bridge;
private dataPromise: Promise<IMetaJSON>;
<<<<<<<
private addBridgeProtocol() {
protocol.registerStringProtocol('cmd', this.bridge.getProtocolHandler());
}
=======
private replaceProtocol() {
protocol.unregisterProtocol('file');
protocol.registerFileProtocol('file', (request, callback) => {
const url = request.url.substr(7).replace(/(#.*)|(\?.*)/, '');
callback(join(__dirname, url));
}, (error) => {
if (error) {
console.error('Failed to register protocol');
}
});
}
>>>>>>>
<<<<<<<
this.addBridgeProtocol();
=======
this.replaceProtocol();
>>>>>>> |
<<<<<<<
GherkinQueryContext,
CucumberQueryContext,
SearchQueryContext,
EnvelopesQueryContext,
=======
EnvelopesQuery,
FilteredResults,
filterByStatus,
>>>>>>>
GherkinQueryContext,
CucumberQueryContext,
SearchQueryContext,
EnvelopesQueryContext,
EnvelopesQuery,
FilteredResults,
filterByStatus, |
<<<<<<<
export * from './models/bank-slip';
export * from './models/debit-card';
=======
export * from './models/bank-slip';
export * from './models/eletronic-transfer';
>>>>>>>
export * from './models/bank-slip';
export * from './models/debit-card';
export * from './models/eletronic-transfer'; |
<<<<<<<
import { SettingsService } from './settings';
=======
import * as obs from '../../obs-api';
>>>>>>>
import { SettingsService } from './settings';
import * as obs from '../../obs-api'; |
<<<<<<<
platforms: ['twitch', 'mixer', 'facebook'],
=======
platforms: ['twitch'],
>>>>>>>
platforms: ['twitch', 'facebook'], |
<<<<<<<
min: this.value.minVal,
max: this.value.maxVal,
=======
title: this.value.description,
>>>>>>>
min: this.value.minVal,
max: this.value.maxVal,
title: this.value.description, |
<<<<<<<
await (await client.$("h1=You're live!")).waitForDisplayed({ timeout: 60000 });
=======
await client.waitForVisible("h1=You're live!", 60000);
await stopStream(t);
>>>>>>>
await (await client.$("h1=You're live!")).waitForDisplayed({ timeout: 60000 });
await stopStream(t);
<<<<<<<
await (await client.$("h1=You're live!")).waitForDisplayed({ timeout: 60000 });
=======
await client.waitForVisible("h1=You're live!", 60000);
await stopStream(t);
>>>>>>>
await (await client.$("h1=You're live!")).waitForDisplayed({ timeout: 60000 });
await stopStream(t); |
<<<<<<<
getTypes(): IListOption<ETransitionType>[] {
const types = [
{ title: $t('Cut'), value: ETransitionType.Cut },
{ title: $t('Fade'), value: ETransitionType.Fade },
{ title: $t('Swipe'), value: ETransitionType.Swipe },
{ title: $t('Slide'), value: ETransitionType.Slide },
{ title: $t('Fade to Color'), value: ETransitionType.FadeToColor },
{ title: $t('Luma Wipe'), value: ETransitionType.LumaWipe },
{ title: $t('Stinger'), value: ETransitionType.Stinger },
];
if (getOS() === OS.Windows) types.push({ title: $t('Motion'), value: ETransitionType.Motion });
return types;
}
=======
>>>>>>> |
<<<<<<<
import { AppService } from 'services/app';
=======
import ResizeBar from 'components/shared/ResizeBar.vue';
>>>>>>>
import { AppService } from 'services/app';
import ResizeBar from 'components/shared/ResizeBar.vue';
<<<<<<<
@Inject() appService: AppService;
=======
>>>>>>>
@Inject() private appService: AppService; |
<<<<<<<
import { Component, Input, Output, EventEmitter, TemplateRef, ViewChild, HostListener } from '@angular/core';
import { Observable } from 'rxjs';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import { noop } from 'rxjs/util/noop';
=======
import {Component, Input, Output, EventEmitter, TemplateRef, ViewChild} from '@angular/core';
import {Observable, Subject} from 'rxjs';
>>>>>>>
import { Component, Input, Output, EventEmitter, TemplateRef, ViewChild, HostListener } from '@angular/core';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import { noop } from 'rxjs/util/noop';
import {Observable, Subject} from 'rxjs';
<<<<<<<
(keyup)="getItems($event)"
(tap)="(showResultsFirst || keyword.length > 0) && getItems()"
=======
(keyup)="getItems($event)"
(tap)="showResultsFirst && getItems()"
>>>>>>>
(keyup)="getItems($event)"
(tap)="(showResultsFirst || keyword.length > 0) && getItems()"
<<<<<<<
<ul *ngIf="!disabled && suggestions.length > 0 && showList">
<li *ngFor="let suggestion of suggestions" (tap)="select(suggestion)">
=======
<ul *ngIf="suggestions.length > 0 && showList">
<li *ngFor="let suggestion of suggestions" (tap)="select(suggestion);$event.srcEvent.stopPropagation()">
>>>>>>>
<ul *ngIf="!disabled && suggestions.length > 0 && showList">
<li *ngFor="let suggestion of suggestions" (tap)="select(suggestion);$event.srcEvent.stopPropagation()">
<<<<<<<
@Output() public itemSelected: EventEmitter<any>;
@Output() public ionAutoInput: EventEmitter<string>;
=======
@Output() public autoFocus: EventEmitter<any>;
@Output() public autoBlur: EventEmitter<any>;
@Output() public itemSelected: EventEmitter<any>;
@Output() public itemsShown: EventEmitter<any>;
@Output() public itemsHidden: EventEmitter<any>;
@Output() public ionAutoInput: EventEmitter<string>;
>>>>>>>
@Output() public autoFocus: EventEmitter<any>;
@Output() public autoBlur: EventEmitter<any>;
@Output() public itemSelected: EventEmitter<any>;
@Output() public itemsShown: EventEmitter<any>;
@Output() public itemsHidden: EventEmitter<any>;
@Output() public ionAutoInput: EventEmitter<string>;
<<<<<<<
private suggestions: string[];
private showList: boolean;
private defaultOpts: any;
private onTouchedCallback: () => void = noop;
private onChangeCallback: (_: any) => void = noop;
=======
public suggestions: string[];
public get showList(): boolean {
return this._showList;
}
public set showList(value: boolean) {
if (this._showList === value) {
return;
}
this._showList = value;
this.showListChanged = true;
}
private _showList: boolean;
private defaultOpts: any;
private selection: any;
private showListChanged: boolean = false;
>>>>>>>
private onTouchedCallback: () => void = noop;
private onChangeCallback: (_: any) => void = noop;
public suggestions: string[];
public get showList(): boolean {
return this._showList;
}
public set showList(value: boolean) {
if (this._showList === value) {
return;
}
this._showList = value;
this.showListChanged = true;
}
private _showList: boolean;
private defaultOpts: any;
private selection: any;
private showListChanged: boolean = false;
<<<<<<<
public writeValue(value: any) {
if (value !== this.keyword) {
this.keyword = value || '';
}
}
public registerOnChange(fn: any) {
this.onChangeCallback = fn;
}
public registerOnTouched(fn: any) {
this.onTouchedCallback = fn;
}
public updateModel() {
this.onChangeCallback(this.keyword);
}
=======
ngAfterViewChecked() {
if (this.showListChanged) {
this.showListChanged = false;
this.showList ? this.itemsShown.emit() : this.itemsHidden.emit();
}
}
>>>>>>>
public writeValue(value: any) {
if (value !== this.keyword) {
this.keyword = value || '';
}
}
public registerOnChange(fn: any) {
this.onChangeCallback = fn;
}
public registerOnTouched(fn: any) {
this.onTouchedCallback = fn;
}
public updateModel() {
this.onChangeCallback(this.keyword);
}
ngAfterViewChecked() {
if (this.showListChanged) {
this.showListChanged = false;
this.showList ? this.itemsShown.emit() : this.itemsHidden.emit();
}
}
<<<<<<<
if (!this.showResultsFirst && this.keyword.trim() === '') {
=======
let result;
if (this.showResultsFirst && !this.keyword) {
this.keyword = '';
} else if (this.keyword.trim() === '') {
>>>>>>>
if (!this.showResultsFirst && this.keyword.trim() === '') {
let result;
if (this.showResultsFirst && !this.keyword) {
this.keyword = '';
} else if (this.keyword.trim() === '') {
<<<<<<<
this.keyword = '';
=======
this.keyword = null;
this.selection = null;
>>>>>>>
this.keyword = '';
this.selection = null; |
<<<<<<<
public importLuaLibFeature(feature: LuaLibFeature) {
// TODO inline imported features in output i option set
this.luaLibFeatureSet.add(feature);
}
public getAbsouluteImportPath(relativePath: string) {
=======
public getAbsoluteImportPath(relativePath: string) {
>>>>>>>
public importLuaLibFeature(feature: LuaLibFeature) {
// TODO inline imported features in output i option set
this.luaLibFeatureSet.add(feature);
}
public getAbsoluteImportPath(relativePath: string) { |
<<<<<<<
path: 'rule-engine',
name: '规则引擎',
icon: 'share-alt',
authority: ['rule-model', 'rule-instance'],
routes: [
{
path: '/rule-engine/model',
name: '规则模型',
icon: 'appstore',
authority: ['rule-model'],
component: './rule-engine/model',
},
{
path: '/rule-engine/instance',
name: '规则实例',
icon: 'control',
authority: ['rule-instance'],
component: './rule-engine/instance',
},
// {
// path: '/rule-engine/email',
// name: 'email',
// icon: 'mail',
// component: './rule-engine/email',
// },
// {
// path: '/rule-engine/sms',
// name: 'sms',
// icon: 'message',
// component: './rule-engine/sms',
// },
],
=======
path: '/admin',
name: 'admin',
icon: 'crown',
component: './Admin',
authority: ['admin'],
routes: [
{
path: '/admin/sub-page',
name: 'sub-page',
icon: 'smile',
component: './Welcome',
authority: ['admin'],
},
],
>>>>>>>
path: 'rule-engine',
name: '规则引擎',
icon: 'share-alt',
authority: ['rule-model', 'rule-instance'],
routes: [
{
path: '/rule-engine/model',
name: '规则模型',
icon: 'appstore',
authority: ['rule-model'],
component: './rule-engine/model',
},
{
path: '/rule-engine/instance',
name: '规则实例',
icon: 'control',
authority: ['rule-instance'],
component: './rule-engine/instance',
},
// {
// path: '/rule-engine/email',
// name: 'email',
// icon: 'mail',
// component: './rule-engine/email',
// },
// {
// path: '/rule-engine/sms',
// name: 'sms',
// icon: 'message',
// component: './rule-engine/sms',
// },
],
<<<<<<<
// chainWebpack: webpackPlugin,
proxy: {
'/jetlinks': {
// target: 'http://192.168.3.89:8848/',
target: 'http://2.jetlinks.org:9010/',
changeOrigin: true,
pathRewrite: { '^/jetlinks': '' },
},
},
=======
proxy: proxy[REACT_APP_ENV || 'dev'],
chainWebpack: webpackPlugin,
>>>>>>>
proxy: proxy[REACT_APP_ENV || 'dev'],
chainWebpack: webpackPlugin,
// proxy: {
// '/jetlinks': {
// // target: 'http://192.168.3.89:8848/',
// target: 'http://2.jetlinks.org:9010/',
// changeOrigin: true,
// pathRewrite: { '^/jetlinks': '' },
// },
// }, |
<<<<<<<
import {PortofinoModule, Page, CrudComponent, NAVIGATION_COMPONENT, NavigationComponent, DefaultNavigationComponent, PortofinoComponent} from "portofino";
import {
MatAutocompleteModule,
MatButtonModule, MatCheckboxModule, MatDatepickerModule, MatDialogModule,
MatFormFieldModule,
MatIconModule, MatInputModule, MatMenuModule, MatPaginatorModule, MatRadioModule, MatSelectModule,
MatSidenavModule,
MatSnackBarModule,
MatSortModule,
MatTableModule, MatToolbarModule
} from "@angular/material";
import {BrowserModule} from "@angular/platform-browser";
import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
import {FormsModule, ReactiveFormsModule} from "@angular/forms";
import {QuillModule} from "ngx-quill";
import {HttpClientModule} from "@angular/common/http";
import {FlexLayoutModule} from "@angular/flex-layout";
import {MatMomentDateModule} from "@angular/material-moment-adapter";
import {FileInputAccessorModule} from "file-input-accessor";
=======
import {PortofinoModule, PageComponent} from "portofino";
import {RouterModule} from "@angular/router";
import {TranslateModule} from "@ngx-translate/core";
>>>>>>>
import {PortofinoModule, Page, CrudComponent, NAVIGATION_COMPONENT, NavigationComponent, DefaultNavigationComponent, PortofinoComponent} from "portofino";
import {
MatAutocompleteModule,
MatButtonModule, MatCheckboxModule, MatDatepickerModule, MatDialogModule,
MatFormFieldModule,
MatIconModule, MatInputModule, MatMenuModule, MatPaginatorModule, MatRadioModule, MatSelectModule,
MatSidenavModule,
MatSnackBarModule,
MatSortModule,
MatTableModule, MatToolbarModule
} from "@angular/material";
import {BrowserModule} from "@angular/platform-browser";
import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
import {FormsModule, ReactiveFormsModule} from "@angular/forms";
import {QuillModule} from "ngx-quill";
import {HttpClientModule} from "@angular/common/http";
import {FlexLayoutModule} from "@angular/flex-layout";
import {MatMomentDateModule} from "@angular/material-moment-adapter";
import {FileInputAccessorModule} from "file-input-accessor";
import {TranslateModule} from "@ngx-translate/core";
<<<<<<<
declarations: [AppComponent, HelloPortofino, CustomNavigation, CustomCrud],
providers: [
{ provide: NAVIGATION_COMPONENT, useFactory: AppModule.navigation },
=======
declarations: [AppComponent, HelloPortofino],
imports: [
RouterModule.forRoot(
[{ path: "start", component: HelloPortofino },
{ path: "**", component: PageComponent}],
{ onSameUrlNavigation: "reload", enableTracing: false }),
PortofinoModule,
TranslateModule.forRoot()
>>>>>>>
declarations: [AppComponent, HelloPortofino, CustomNavigation, CustomCrud],
providers: [
{ provide: NAVIGATION_COMPONENT, useFactory: AppModule.navigation }, |
<<<<<<<
import {PortofinoModule, PageComponent} from "portofino";
import {RouterModule} from "@angular/router";
=======
import {RouterModule} from '@angular/router';
import {PortofinoModule} from "./portofino.module";
import {PortofinoAppComponent} from "./portofino-app.component";
import {PageComponent} from "./page.component";
import {TranslateModule} from "@ngx-translate/core";
>>>>>>>
import {PortofinoModule, PageComponent} from "portofino";
import {RouterModule} from "@angular/router";
import {TranslateModule} from "@ngx-translate/core";
<<<<<<<
RouterModule.forRoot(
[{ path: "start", component: HelloPortofino },
{ path: "**", component: PageComponent}],
{ onSameUrlNavigation: "reload", enableTracing: false }),
PortofinoModule
=======
RouterModule.forRoot([
{ path: "start", component: HelloPortofino }, //TODO custom routes file
{ path: "**", component: PageComponent}], { onSameUrlNavigation: "reload", enableTracing: false }),
PortofinoModule,
TranslateModule.forRoot()
>>>>>>>
RouterModule.forRoot(
[{ path: "start", component: HelloPortofino },
{ path: "**", component: PageComponent}],
{ onSameUrlNavigation: "reload", enableTracing: false }),
PortofinoModule,
TranslateModule.forRoot() |
<<<<<<<
import {Operation, Page, PageConfiguration} from "../page";
import {AuthenticationService} from "../security/authentication.service";
import {Router} from "@angular/router";
import {Button} from "../buttons";
=======
import {Button, Operation, Page, PageConfiguration} from "../page.component";
import {NotificationService} from "../notifications/notification.service";
>>>>>>>
import {Operation, Page, PageConfiguration} from "../page";
import {AuthenticationService} from "../security/authentication.service";
import {Router} from "@angular/router";
import {Button} from "../buttons";
import {NotificationService} from "../notifications/notification.service";
<<<<<<<
constructor(
protected http: HttpClient, public portofino: PortofinoService, protected router: Router,
public authenticationService: AuthenticationService, private snackBar: MatSnackBar) {
super(portofino, http, router, authenticationService);
=======
constructor(
protected http: HttpClient, public portofino: PortofinoService, protected notificationService: NotificationService) {
super(portofino, http);
>>>>>>>
constructor(
protected http: HttpClient, public portofino: PortofinoService, protected router: Router,
public authenticationService: AuthenticationService, protected notificationService: NotificationService) {
super(portofino, http, router, authenticationService); |
<<<<<<<
import {BigNumber} from 'bignumber.js'
import { checkAddress } from 'nanocurrency';
=======
import {BigNumber} from 'bignumber.js';
import * as nanocurrency from 'nanocurrency';
>>>>>>>
import {BigNumber} from 'bignumber.js';
import * as nanocurrency from 'nanocurrency';
<<<<<<<
isValidAccount: isValidAccount,
=======
isValidNanoAmount: isValidNanoAmount,
>>>>>>>
isValidAccount: isValidAccount,
isValidNanoAmount: isValidNanoAmount,
<<<<<<<
isValidAccount: isValidAccount,
=======
isValidNanoAmount: isValidNanoAmount,
>>>>>>>
isValidAccount: isValidAccount,
isValidNanoAmount: isValidNanoAmount, |
<<<<<<<
import { SweeperComponent } from './components/sweeper/sweeper.component';
=======
import { QrScanComponent } from './components/qr-scan/qr-scan.component';
>>>>>>>
import { SweeperComponent } from './components/sweeper/sweeper.component';
import { QrScanComponent } from './components/qr-scan/qr-scan.component';
<<<<<<<
SweeperComponent,
=======
QrScanComponent,
>>>>>>>
SweeperComponent,
QrScanComponent, |
<<<<<<<
// Remote signing
accounts = this.wallet.wallet.accounts;
addressBookResults$ = new BehaviorSubject([]);
showAddressBook = false;
addressBookMatch = '';
amounts = [
{ name: 'NANO (1 Mnano)', shortName: 'NANO', value: 'mnano' },
{ name: 'knano (0.001 Mnano)', shortName: 'knano', value: 'knano' },
{ name: 'nano (0.000001 Mnano)', shortName: 'nano', value: 'nano' },
];
selectedAmount = this.amounts[0];
amount = null;
amountRaw: BigNumber = new BigNumber(0);
amountFiat: number|null = null;
rawAmount: BigNumber = new BigNumber(0);
fromAccount: any = {};
toAccount: any = false;
toAccountID: string = '';
toAddressBook = '';
toAccountStatus = null;
qrCodeImageBlock = null;
blockHash = null;
remoteVisible = false;
// End remote signing
=======
statsRefreshEnabled = true;
>>>>>>>
statsRefreshEnabled = true;
// Remote signing
accounts = this.wallet.wallet.accounts;
addressBookResults$ = new BehaviorSubject([]);
showAddressBook = false;
addressBookMatch = '';
amounts = [
{ name: 'NANO (1 Mnano)', shortName: 'NANO', value: 'mnano' },
{ name: 'knano (0.001 Mnano)', shortName: 'knano', value: 'knano' },
{ name: 'nano (0.000001 Mnano)', shortName: 'nano', value: 'nano' },
];
selectedAmount = this.amounts[0];
amount = null;
amountRaw: BigNumber = new BigNumber(0);
amountFiat: number|null = null;
rawAmount: BigNumber = new BigNumber(0);
fromAccount: any = {};
toAccount: any = false;
toAccountID: string = '';
toAddressBook = '';
toAccountStatus = null;
qrCodeImageBlock = null;
blockHash = null;
remoteVisible = false;
// End remote signing |
<<<<<<<
import { Telemetry, ClientInfo } from "./telemetry";
import type * as ChartJs from "chart.js";
import { DisplayableState, createBarChart, createBarChartRealImagOption, createBarChartAmplitudePhaseOption, attachDumpMachineToolbar, createNewCanvas, PlotStyle, updateChart } from "./plotting";
import { defineQSharpMode } from "./syntax";
=======
import { Telemetry, ClientInfo } from "./telemetry.js";
import { executionPathToHtml } from "./ExecutionPathVisualizer";
function defineQSharpMode() {
console.log("Loading IQ# kernel-specific extension...");
let rules = [
{
token: "comment",
regex: /(\/\/).*/,
beginWord: false,
},
{
token: "string",
regex: String.raw`^\"(?:[^\"\\]|\\[\s\S])*(?:\"|$)`,
beginWord: false,
},
{
token: "keyword",
regex: String.raw`(namespace|open|as|operation|function|body|adjoint|newtype|controlled)\b`,
beginWord: true,
},
{
token: "keyword",
regex: String.raw`(if|elif|else|repeat|until|fixup|for|in|return|fail|within|apply)\b`,
beginWord: true,
},
{
token: "keyword",
regex: String.raw`(Adjoint|Controlled|Adj|Ctl|is|self|auto|distribute|invert|intrinsic)\b`,
beginWord: true,
},
{
token: "keyword",
regex: String.raw`(let|set|w\/|new|not|and|or|using|borrowing|newtype|mutable)\b`,
beginWord: true,
},
{
token: "meta",
regex: String.raw`(Int|BigInt|Double|Bool|Qubit|Pauli|Result|Range|String|Unit)\b`,
beginWord: true,
},
{
token: "atom",
regex: String.raw`(true|false|Pauli(I|X|Y|Z)|One|Zero)\b`,
beginWord: true,
},
{
token: "builtin",
regex: String.raw`(X|Y|Z|H|HY|S|T|SWAP|CNOT|CCNOT|MultiX|R|RFrac|Rx|Ry|Rz|R1|R1Frac|Exp|ExpFrac|Measure|M|MultiM)\b`,
beginWord: true,
},
{
token: "builtin",
regex: String.raw`(Message|Length|Assert|AssertProb|AssertEqual)\b`,
beginWord: true,
},
{
// built-in magic commands
token: "builtin",
regex: String.raw`(%(config|estimate|lsmagic|lsopen|package|performance|simulate|toffoli|trace|version|who|workspace))\b`,
beginWord: true,
},
{
// Azure magic commands
token: "builtin",
regex: String.raw`(%azure\.(connect|execute|jobs|output|status|submit|target))\b`,
beginWord: true,
},
{
// chemistry magic commands
token: "builtin",
regex: String.raw`(%chemistry\.(broombridge|encode|fh\.add_terms|fh\.load|inputstate\.load))\b`,
beginWord: true,
},
{
// katas magic commands
token: "builtin",
regex: String.raw`(%(check_kata|kata))\b`,
beginWord: true,
},
];
let simpleRules = []
for (let rule of rules) {
simpleRules.push({
"token": rule.token,
"regex": new RegExp(rule.regex, "g"),
"sol": rule.beginWord
});
if (rule.beginWord) {
// Need an additional rule due to the fact that CodeMirror simple mode doesn't work with ^ token
simpleRules.push({
"token": rule.token,
"regex": new RegExp(String.raw`\W` + rule.regex, "g"),
"sol": false
});
}
}
// NB: The TypeScript definitions for CodeMirror don't currently understand
// the simple mode plugin.
let codeMirror: any = window.CodeMirror;
codeMirror.defineSimpleMode('qsharp', {
start: simpleRules
});
codeMirror.defineMIME("text/x-qsharp", "qsharp");
}
>>>>>>>
import { Telemetry, ClientInfo } from "./telemetry";
import type * as ChartJs from "chart.js";
import { DisplayableState, createBarChart, createBarChartRealImagOption, createBarChartAmplitudePhaseOption, attachDumpMachineToolbar, createNewCanvas, PlotStyle, updateChart } from "./plotting";
import { defineQSharpMode } from "./syntax";
import { executionPathToHtml } from "./ExecutionPathVisualizer";
<<<<<<<
this.setupMeasurementHistogramDataListener();
this.setupDebugSessionHandlers();
=======
this.initExecutionPathVisualizer();
>>>>>>>
this.setupMeasurementHistogramDataListener();
this.setupDebugSessionHandlers();
this.initExecutionPathVisualizer(); |
<<<<<<<
public roomJoinMessageParser(rawPayload: PadchatMessagePayload): RoomJoinPayload {
const roomJoinPayload
= roomJoin.inviteeNameList
const inviterName = roomJoin.inviterName
const roomId = roomJoin.roomId
}
public roomLeaveMessageParser(rawPayload: PadchatMessagePayload): RoomLeavePayload {
const roomJoinPayload
roomLeave.leaverNameList
const removerName = roomLeave.removerName
const roomId = roomLeave.roomId
}
public roomTopicMessageParser(rawPayload: PadchatMessagePayload): RoomTopicPayload {
const roomJoinPayload
roomTopic.changerName
const newTopic = roomTopic.topic
const roomId = roomTopic.roomId
}
=======
public static roomJoinMessageParser(rawPayload: PadchatMessagePayload): RoomJoinType {
const content = rawPayload.content
}
>>>>>>>
public roomJoinMessageParser(rawPayload: PadchatMessagePayload): RoomJoinPayload {
const roomJoinPayload
= roomJoin.inviteeNameList
const inviterName = roomJoin.inviterName
const roomId = roomJoin.roomId
}
public roomLeaveMessageParser(rawPayload: PadchatMessagePayload): RoomLeavePayload {
const roomJoinPayload
roomLeave.leaverNameList
const removerName = roomLeave.removerName
const roomId = roomLeave.roomId
}
public roomTopicMessageParser(rawPayload: PadchatMessagePayload): RoomTopicPayload {
const roomJoinPayload
roomTopic.changerName
const newTopic = roomTopic.topic
const roomId = roomTopic.roomId
}
public static roomJoinMessageParser(rawPayload: PadchatMessagePayload): RoomJoinType {
const content = rawPayload.content
} |
<<<<<<<
public reply(message: Message, replyContent: string) {
log.warn('PuppetWeb', 'reply() @deprecated, please use Message.say()')
=======
/**
* Bot say...
* send to `filehelper` for notice / log
*/
public say(content: string) {
const m = new Message()
m.to('filehelper')
m.content(content)
return this.send(m)
}
// @deprecated
public reply(message, replyContent) {
>>>>>>>
/**
* Bot say...
* send to `filehelper` for notice / log
*/
public say(content: string) {
const m = new Message()
m.to('filehelper')
m.content(content)
return this.send(m)
}
// @deprecated
public reply(message: Message, replyContent: string) {
log.warn('PuppetWeb', 'reply() @deprecated, please use Message.say()') |
<<<<<<<
'wechaty-puppet-padpro' : '^0.3.7', // https://www.npmjs.com/package/wechaty-puppet-padpro
'wechaty-puppet-puppeteer' : '^0.17.14', // https://www.npmjs.com/package/wechaty-puppet-puppeteer
=======
'wechaty-puppet-padpro' : '^0.2.0', // https://www.npmjs.com/package/wechaty-puppet-padpro
'wechaty-puppet-puppeteer' : '^0.17.22', // https://www.npmjs.com/package/wechaty-puppet-puppeteer
>>>>>>>
'wechaty-puppet-padpro' : '^0.3.7', // https://www.npmjs.com/package/wechaty-puppet-padpro
'wechaty-puppet-puppeteer' : '^0.17.22', // https://www.npmjs.com/package/wechaty-puppet-puppeteer |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.