conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
<app-navbar>
=======
<nav class="navbar navbar-fixed-top">
>>>>>>>
<app-navbar>
<<<<<<<
</app-navbar>
=======
<div class="btn-group btn-group-sm navbar-btn nav-toolbar">
<button class="btn btn-default"
[class.active]="(playerSearch$ | async).queryParams.preset === ''"
(click)="updatePreset('')">
Any
</button>
<button class="btn btn-default"
[class.active]="(playerSearch$ | async).queryParams.preset === 'full album'"
(click)="updatePreset('full album')">
Albums
</button>
<button class="btn btn-default"
[class.active]="(playerSearch$ | async).queryParams.preset === 'live'"
(click)="updatePreset('live')">
Live
</button>
</div>
</nav>
>>>>>>>
<div class="btn-group btn-group-sm navbar-btn nav-toolbar">
<button class="btn btn-default"
[class.active]="(playerSearch$ | async).queryParams.preset === ''"
(click)="updatePreset('')">
Any
</button>
<button class="btn btn-default"
[class.active]="(playerSearch$ | async).queryParams.preset === 'full album'"
(click)="updatePreset('full album')">
Albums
</button>
<button class="btn btn-default"
[class.active]="(playerSearch$ | async).queryParams.preset === 'live'"
(click)="updatePreset('live')">
Live
</button>
</div>
</app-navbar>
<<<<<<<
=======
toggleSidebar() {
return this.store.dispatch(this.appLayoutActions.toggleSidebar());
}
updatePreset(preset: string) {
this.youtubeSearch.setPreset(preset);
this.youtubeSearch.search(this.searchQuery, false, this.searchParams);
}
get searchParams () {
let params;
this.playerSearch$.take(1).subscribe(ps => params = ps.queryParams);
return params;
}
get searchQuery () {
let query;
this.playerSearch$.take(1).subscribe(ps => query = ps.query);
return query;
}
>>>>>>>
updatePreset(preset: string) {
this.youtubeSearch.setPreset(preset);
this.youtubeSearch.search(this.searchQuery, false, this.searchParams);
}
get searchParams () {
let params;
this.playerSearch$.take(1).subscribe(ps => params = ps.queryParams);
return params;
}
get searchQuery () {
let query;
this.playerSearch$.take(1).subscribe(ps => query = ps.query);
return query;
} |
<<<<<<<
declare var IQKeyboardManager;
=======
import { AuthenticationProvider } from 'shared-library/core/auth';
>>>>>>>
declare var IQKeyboardManager;
import { AuthenticationProvider } from 'shared-library/core/auth'; |
<<<<<<<
// const userSubject = new Subject<User>();
=======
>>>>>>>
// const userSubject = new Subject<User>(); |
<<<<<<<
export * from './game.reducer';
export * from './bulk-upload.reducer';
=======
export * from './game.reducer';
export interface CoreState {
user: User;
authInitialized: boolean;
categories: Category[];
tags: string[];
questionsSearchResults: SearchResults;
unpublishedQuestions: Question[];
userPublishedQuestions: Question[];
userUnpublishedQuestions: Question[];
questionOfTheDay: Question;
questionSaveStatus: string;
loginRedirectUrl: string;
activeGames: Game[];
}
export const reducer: ActionReducerMap<CoreState> = {
user: user,
authInitialized: authInitialized,
categories: categories,
tags: tags,
questionsSearchResults: questionsSearchResults,
unpublishedQuestions: unpublishedQuestions,
userPublishedQuestions: userPublishedQuestions,
userUnpublishedQuestions: userUnpublishedQuestions,
questionOfTheDay: questionOfTheDay,
questionSaveStatus: questionSaveStatus,
loginRedirectUrl: loginRedirectUrl,
activeGames: activeGames
};
//Features
export const coreState = createFeatureSelector<CoreState>('core');
>>>>>>>
export * from './game.reducer';
export * from './bulk-upload.reducer';
export interface CoreState {
user: User;
authInitialized: boolean;
categories: Category[];
tags: string[];
questionsSearchResults: SearchResults;
unpublishedQuestions: Question[];
userPublishedQuestions: Question[];
userUnpublishedQuestions: Question[];
questionOfTheDay: Question;
questionSaveStatus: string;
loginRedirectUrl: string;
activeGames: Game[];
}
export const reducer: ActionReducerMap<CoreState> = {
user: user,
authInitialized: authInitialized,
categories: categories,
tags: tags,
questionsSearchResults: questionsSearchResults,
unpublishedQuestions: unpublishedQuestions,
userPublishedQuestions: userPublishedQuestions,
userUnpublishedQuestions: userUnpublishedQuestions,
questionOfTheDay: questionOfTheDay,
questionSaveStatus: questionSaveStatus,
loginRedirectUrl: loginRedirectUrl,
activeGames: activeGames
};
//Features
export const coreState = createFeatureSelector<CoreState>('core'); |
<<<<<<<
res.render('index', { req }, (err, html) => {
if (isProductionEnv) {
html += `\n<script async src="https://www.googletagmanager.com/gtag/js?id=UA-122807814-1"></script>
<script>
(function (i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r;
i[r] = i[r] || function () {
(i[r].q = i[r].q || []).push(arguments)
}, i[r].l = 1 * new Date();
a = s.createElement(o),
m = s.getElementsByTagName(o)[0];
a.async = 1;
a.src = g;
m.parentNode.insertBefore(a, m)
})(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
ga('create', 'UA-122807814-1', 'auto');// add your tracking ID here.
ga('send', 'pageview');
window.dataLayer = window.dataLayer || [];
function gtag() { dataLayer.push(arguments); }
gtag('js', new Date());
gtag('config', 'UA-122807814-1');
</script>`;
}
res.send(html);
});
=======
res.set('Cache-Control', 'public, max-age=3600, s-maxage=3600');
res.render('index', { req });
>>>>>>>
res.set('Cache-Control', 'public, max-age=3600, s-maxage=3600');
res.render('index', { req }, (err, html) => {
if (isProductionEnv) {
html += `\n<script async src="https://www.googletagmanager.com/gtag/js?id=UA-122807814-1"></script>
<script>
(function (i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r;
i[r] = i[r] || function () {
(i[r].q = i[r].q || []).push(arguments)
}, i[r].l = 1 * new Date();
a = s.createElement(o),
m = s.getElementsByTagName(o)[0];
a.async = 1;
a.src = g;
m.parentNode.insertBefore(a, m)
})(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
ga('create', 'UA-122807814-1', 'auto');// add your tracking ID here.
ga('send', 'pageview');
window.dataLayer = window.dataLayer || [];
function gtag() { dataLayer.push(arguments); }
gtag('js', new Date());
gtag('config', 'UA-122807814-1');
</script>`;
}
res.send(html);
});
<<<<<<<
function setEnvironment(envFlag) {
isProductionEnv = envFlag;
}
=======
// app.set('port', process.env.PORT || 3000);
// app.listen(app.get('port'), function () {
// console.log('Express server listening on port ' + 3000);
// });
>>>>>>>
function setEnvironment(envFlag) {
isProductionEnv = envFlag;
} |
<<<<<<<
export * from './render-box/render-box.component';
export * from './change-password/change-password.component';
export * from './animation-box/animation-box.component';
export * from './update-category-tag/update-category-tag.component'
=======
export * from './render-box/render-box.component';
export * from './bulk-upload-request/bulk-upload-request.component';
>>>>>>>
export * from './render-box/render-box.component';
export * from './change-password/change-password.component';
export * from './animation-box/animation-box.component';
export * from './update-category-tag/update-category-tag.component'
export * from './bulk-upload-request/bulk-upload-request.component'; |
<<<<<<<
import { CurrentQuestion } from './current-question';
=======
import { Countries } from './counties';
>>>>>>>
import { CurrentQuestion } from './current-question';
import { Countries } from './counties';
<<<<<<<
bulkUploads: BulkUploads,
currentQuestion: CurrentQuestion
=======
bulkUploads: BulkUploads,
countries: Countries
>>>>>>>
bulkUploads: BulkUploads,
currentQuestion: CurrentQuestion,
countries: Countries |
<<<<<<<
export function KeyToChar(key: Key): string {
=======
/**
* isNumber: Check if value is a number, including
* the number 0.
*/
export function isNumber(val) {
console.log('testing val', val);
var res = parseInt(val, 10);
return isNaN ? null : res;
}
export function KeyToChar(key: Enums.Key): string {
>>>>>>>
/**
* isNumber: Check if value is a number, including
* the number 0.
*/
export function isNumber(val) {
console.log('testing val', val);
var res = parseInt(val, 10);
return isNaN ? null : res;
}
export function KeyToChar(key: Key): string {
<<<<<<<
case Key.a:
=======
case Enums.Key.h:
>>>>>>>
case Key.h: |
<<<<<<<
import { MatDialog } from '@angular/material';
import { CheckOrSetPinDialogComponent } from 'app/dialogs/check-or-set-pin-dialog/check-or-set-pin-dialog.component';
=======
import { isoLangs } from './locales_list';
import { MatSnackBar } from '@angular/material/snack-bar';
import {DomSanitizer} from '@angular/platform-browser';
import { MatDialog } from '@angular/material/dialog';
import { ArgModifierDialogComponent } from 'app/dialogs/arg-modifier-dialog/arg-modifier-dialog.component';
>>>>>>>
import { CheckOrSetPinDialogComponent } from 'app/dialogs/check-or-set-pin-dialog/check-or-set-pin-dialog.component';
import { isoLangs } from './locales_list';
import { MatSnackBar } from '@angular/material/snack-bar';
import {DomSanitizer} from '@angular/platform-browser';
import { MatDialog } from '@angular/material/dialog';
import { ArgModifierDialogComponent } from 'app/dialogs/arg-modifier-dialog/arg-modifier-dialog.component';
<<<<<<<
constructor(private postsService: PostsService, private dialog: MatDialog) { }
=======
constructor(private postsService: PostsService, private snackBar: MatSnackBar, private sanitizer: DomSanitizer,
private dialog: MatDialog) { }
>>>>>>>
constructor(private postsService: PostsService, private snackBar: MatSnackBar, private sanitizer: DomSanitizer,
private dialog: MatDialog) { }
<<<<<<<
setNewPin() {
const dialogRef = this.dialog.open(CheckOrSetPinDialogComponent, {
data: {
resetMode: true
}
});
}
=======
localeSelectChanged(new_val) {
localStorage.setItem('locale', new_val);
this.openSnackBar('Language successfully changed! Reload to update the page.')
}
generateBookmarklet() {
this.bookmarksite('YTDL-Material', this.generated_bookmarklet_code);
}
generateBookmarkletCode() {
const currentURL = window.location.href.split('#')[0];
const homePageWithArgsURL = currentURL + '#/home;url=';
const bookmarkletCodeInside = `'${homePageWithArgsURL}' + window.location`
const bookmarkletCode = `javascript:(function()%7Bwindow.open('${homePageWithArgsURL}' + encodeURIComponent(window.location))%7D)()`;
return bookmarkletCode;
}
// not currently functioning on most platforms. hence not in use
bookmarksite(title, url) {
// Internet Explorer
if (document.all) {
window['external']['AddFavorite'](url, title);
} else if (window['chrome']) {
// Google Chrome
this.openSnackBar('Chrome users must drag the \'Alternate URL\' link to your bookmarks.');
} else if (window['sidebar']) {
// Firefox
window['sidebar'].addPanel(title, url, '');
} else if (window['opera'] && window.print) {
// Opera
const elem = document.createElement('a');
elem.setAttribute('href', url);
elem.setAttribute('title', title);
elem.setAttribute('rel', 'sidebar');
elem.click();
}
}
openArgsModifierDialog() {
const dialogRef = this.dialog.open(ArgModifierDialogComponent, {
data: {
initial_args: this.new_config['Downloader']['custom_args']
}
});
dialogRef.afterClosed().subscribe(new_args => {
if (new_args) {
this.new_config['Downloader']['custom_args'] = new_args;
}
});
}
// snackbar helper
public openSnackBar(message: string, action: string = '') {
this.snackBar.open(message, action, {
duration: 2000,
});
}
>>>>>>>
setNewPin() {
const dialogRef = this.dialog.open(CheckOrSetPinDialogComponent, {
data: {
resetMode: true
}
});
}
localeSelectChanged(new_val) {
localStorage.setItem('locale', new_val);
this.openSnackBar('Language successfully changed! Reload to update the page.')
}
generateBookmarklet() {
this.bookmarksite('YTDL-Material', this.generated_bookmarklet_code);
}
generateBookmarkletCode() {
const currentURL = window.location.href.split('#')[0];
const homePageWithArgsURL = currentURL + '#/home;url=';
const bookmarkletCodeInside = `'${homePageWithArgsURL}' + window.location`
const bookmarkletCode = `javascript:(function()%7Bwindow.open('${homePageWithArgsURL}' + encodeURIComponent(window.location))%7D)()`;
return bookmarkletCode;
}
// not currently functioning on most platforms. hence not in use
bookmarksite(title, url) {
// Internet Explorer
if (document.all) {
window['external']['AddFavorite'](url, title);
} else if (window['chrome']) {
// Google Chrome
this.openSnackBar('Chrome users must drag the \'Alternate URL\' link to your bookmarks.');
} else if (window['sidebar']) {
// Firefox
window['sidebar'].addPanel(title, url, '');
} else if (window['opera'] && window.print) {
// Opera
const elem = document.createElement('a');
elem.setAttribute('href', url);
elem.setAttribute('title', title);
elem.setAttribute('rel', 'sidebar');
elem.click();
}
}
openArgsModifierDialog() {
const dialogRef = this.dialog.open(ArgModifierDialogComponent, {
data: {
initial_args: this.new_config['Downloader']['custom_args']
}
});
dialogRef.afterClosed().subscribe(new_args => {
if (new_args) {
this.new_config['Downloader']['custom_args'] = new_args;
}
});
}
// snackbar helper
public openSnackBar(message: string, action: string = '') {
this.snackBar.open(message, action, {
duration: 2000,
});
} |
<<<<<<<
MatDialogModule,
MatRippleModule,
MatMenuModule} from '@angular/material';
=======
MatDialogModule,
MatSlideToggleModule,
MatMenuModule} from '@angular/material';
>>>>>>>
MatDialogModule,
MatRippleModule,
MatSlideToggleModule,
MatMenuModule} from '@angular/material';
<<<<<<<
import { SubscriptionsComponent } from './subscriptions/subscriptions.component';
import { SubscribeDialogComponent } from './dialogs/subscribe-dialog/subscribe-dialog.component';
import { SubscriptionComponent } from './subscription//subscription/subscription.component';
import { SubscriptionFileCardComponent } from './subscription/subscription-file-card/subscription-file-card.component';
import { SubscriptionInfoDialogComponent } from './dialogs/subscription-info-dialog/subscription-info-dialog.component';
=======
import { SettingsComponent } from './settings/settings.component';
>>>>>>>
import { SubscriptionsComponent } from './subscriptions/subscriptions.component';
import { SubscribeDialogComponent } from './dialogs/subscribe-dialog/subscribe-dialog.component';
import { SubscriptionComponent } from './subscription//subscription/subscription.component';
import { SubscriptionFileCardComponent } from './subscription/subscription-file-card/subscription-file-card.component';
import { SubscriptionInfoDialogComponent } from './dialogs/subscription-info-dialog/subscription-info-dialog.component';
import { SettingsComponent } from './settings/settings.component';
<<<<<<<
DownloadItemComponent,
SubscriptionsComponent,
SubscribeDialogComponent,
SubscriptionComponent,
SubscriptionFileCardComponent,
SubscriptionInfoDialogComponent
=======
DownloadItemComponent,
SettingsComponent
>>>>>>>
DownloadItemComponent,
SubscriptionsComponent,
SubscribeDialogComponent,
SubscriptionComponent,
SubscriptionFileCardComponent,
SubscriptionInfoDialogComponent,
SettingsComponent
<<<<<<<
CreatePlaylistComponent,
SubscribeDialogComponent,
SubscriptionInfoDialogComponent
=======
CreatePlaylistComponent,
SettingsComponent
>>>>>>>
CreatePlaylistComponent,
SubscribeDialogComponent,
SubscriptionInfoDialogComponent,
SettingsComponent |
<<<<<<<
const mapContentToIndex = (
obj: Partial<{ data: { slug: string }; content: string }>
) => {
=======
const client = algoliasearch(
process.env.ALGOLIA_APP_ID,
process.env.ALGOLIA_ADMIN_KEY
)
fetchDocs().then(docs => {
client
.initIndex('Tina-Docs-Next')
.saveObjects(docs.map(mapContentToIndex))
.then(() => {
console.log(`created docs index`)
})
.catch(err => {
console.log(`failed creating docs index: ${err}`)
})
})
fetchBlogs().then(blogs => {
client
.initIndex('Tina-Blogs-Next')
.saveObjects(blogs.map(mapContentToIndex))
.then(() => {
console.log(`created blogs index`)
})
.catch(err => {
console.log(`failed creating blogs index: ${err}`)
})
})
const mapContentToIndex = ({
content,
...obj
}: Partial<{ data: { slug: string }; content: string }>) => {
>>>>>>>
const mapContentToIndex = ({
content,
...obj
}: Partial<{ data: { slug: string }; content: string }>) => { |
<<<<<<<
import { isUndefined } from 'util';
import { Rule } from '../../../../../domain/data-preparation/dataset';
=======
import { isNullOrUndefined, isUndefined } from 'util';
>>>>>>>
import { isNullOrUndefined, isUndefined } from 'util';
import { Rule } from '../../../../../domain/data-preparation/dataset';
<<<<<<<
/**
* Delete rule event
* @param {Rule} rule
*/
public deleteRule(rule : Rule) {
this.deleteEvent.emit(rule['ruleNo']);
}
public insertStep(rule : Rule) {
// transform 할 때 사용할 ruleIdx 가 rule.ruleNo 이다.
// edit-dataflow-rule2 에 rule.ruleNo를 전달하고, 그리드가 바뀌어야 한다.
console.info('rule ==> ', rule );
}
public editRule(rule : Rule) {
this.editEvent.emit(rule);
}
=======
public setCanceledStatus(ssId) {
this.snapshotList.forEach((item) => {
if (item.ssId === ssId) {
item.status = 'Canceled';
}
})
}
>>>>>>>
public setCanceledStatus(ssId) {
this.snapshotList.forEach((item) => {
if (item.ssId === ssId) {
item.status = 'Canceled';
}
})
}
/**
* Delete rule event
* @param {Rule} rule
*/
public deleteRule(rule : Rule) {
this.deleteEvent.emit(rule['ruleNo']);
}
public insertStep(rule : Rule) {
// transform 할 때 사용할 ruleIdx 가 rule.ruleNo 이다.
// edit-dataflow-rule2 에 rule.ruleNo를 전달하고, 그리드가 바뀌어야 한다.
console.info('rule ==> ', rule );
}
public editRule(rule : Rule) {
this.editEvent.emit(rule);
} |
<<<<<<<
import { EditRuleFlattenComponent } from './dataflow/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-flatten.component';
import { EditRuleSetformatComponent } from './dataflow/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-setformat.component';
import { EditRuleUnnestComponent } from './dataflow/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-unnest.component';
=======
import { EditRuleAggregateComponent } from './dataflow/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-aggregate.component';
>>>>>>>
import { EditRuleFlattenComponent } from './dataflow/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-flatten.component';
import { EditRuleSetformatComponent } from './dataflow/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-setformat.component';
import { EditRuleUnnestComponent } from './dataflow/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-unnest.component';
import { EditRuleAggregateComponent } from './dataflow/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-aggregate.component';
<<<<<<<
EditRuleFlattenComponent,
EditRuleSetformatComponent,
EditRuleUnnestComponent,
=======
EditRuleAggregateComponent,
>>>>>>>
EditRuleAggregateComponent,
EditRuleFlattenComponent,
EditRuleSetformatComponent,
EditRuleUnnestComponent, |
<<<<<<<
=======
import {normalize, join} from 'path';
import * as chalk from 'chalk';
>>>>>>>
import {normalize, join} from 'path';
import * as chalk from 'chalk';
<<<<<<<
export const SERVER_DEST = `dist/server`;
export const ASSETS_DEST = `${APP_DEST}/assets`;
export const BUNDLES_DEST = `${APP_DEST}/bundles`;
=======
>>>>>>>
export const SERVER_DEST = `dist/server`;
export const ASSETS_DEST = `${APP_DEST}/assets`;
<<<<<<<
// Faster dev page load
{ src: 'rxjs/bundles/Rx.min.js', inject: 'libs', dest: LIB_DEST },
{ src: 'angular2/bundles/angular2.dev.js', inject: 'libs', dest: LIB_DEST },
{ src: 'angular2/bundles/router.js', inject: 'libs', dest: LIB_DEST }, // use router.min.js with alpha47
{ src: 'angular2/bundles/http.min.js', inject: 'libs', dest: LIB_DEST },
{ src: 'ng2-material/dist/ng2-material.js', inject: 'libs', dest: LIB_DEST },
{ src: 'redux/dist/redux.js', inject: 'libs', dest: LIB_DEST },
{ src: 'bootstrap/dist/css/bootstrap.min.css', inject: true, dest: CSS_DEST },
{ src: 'ng2-material/dist/ng2-material.css', inject: true, dest: CSS_DEST },
{ src: 'ng2-material/dist/font.css', inject: true, dest: CSS_DEST },
{ src: 'jquery/dist/jquery.js', inject: 'libs', dest: LIB_DEST },
{ src: 'underscore/underscore.js', inject: 'libs', dest: LIB_DEST },
{ src: 'moment/moment.js', inject: 'libs', dest: LIB_DEST },
{ src: 'd3/d3.js', inject: 'libs', dest: LIB_DEST },
{ src: 'bootstrap/dist/js/bootstrap.js', inject: 'libs', dest: LIB_DEST },
{ src: 'socket.io-client/socket.io.js', inject: 'libs', dest: LIB_DEST },
{ src: 'bootstrap/dist/fonts/glyphicons-halflings-regular.eot' , inject: false, dest: FONTS_DEST },
{ src: 'bootstrap/dist/fonts/glyphicons-halflings-regular.ttf', inject: false, dest: FONTS_DEST },
{ src: 'bootstrap/dist/fonts/glyphicons-halflings-regular.woff2', inject: false, dest: FONTS_DEST },
{ src: 'bootstrap/dist/fonts/glyphicons-halflings-regular.svg', inject: false, dest: FONTS_DEST },
{ src: 'bootstrap/dist/fonts/glyphicons-halflings-regular.woff', inject: false, dest: FONTS_DEST }
];
=======
interface InjectableDependency {
src: string;
inject: string | boolean;
dest?: string;
}
// Declare NPM dependencies (Note that globs should not be injected).
export const DEV_NPM_DEPENDENCIES: InjectableDependency[] = normalizeDependencies([
{ src: 'systemjs/dist/system-polyfills.src.js', inject: 'shims', dest: JS_DEST },
{ src: 'reflect-metadata/Reflect.js', inject: 'shims', dest: JS_DEST },
{ src: 'es6-shim/es6-shim.js', inject: 'shims', dest: JS_DEST },
{ src: 'systemjs/dist/system.src.js', inject: 'shims', dest: JS_DEST },
{ src: 'angular2/bundles/angular2-polyfills.js', inject: 'shims', dest: JS_DEST },
{ src: 'rxjs/bundles/Rx.js', inject: 'libs', dest: JS_DEST },
{ src: 'angular2/bundles/angular2.js', inject: 'libs', dest: JS_DEST },
{ src: 'angular2/bundles/router.js', inject: 'libs', dest: JS_DEST },
{ src: 'angular2/bundles/http.js', inject: 'libs', dest: JS_DEST }
]);
export const PROD_NPM_DEPENDENCIES: InjectableDependency[] = normalizeDependencies([
{ src: 'reflect-metadata/Reflect.js', inject: 'shims' },
{ src: 'es6-shim/es6-shim.min.js', inject: 'shims' },
{ src: 'angular2/bundles/angular2-polyfills.min.js', inject: 'libs' }
]);
>>>>>>>
interface InjectableDependency {
src: string;
inject: string | boolean;
dest?: string;
}
// Declare NPM dependencies (Note that globs should not be injected).
export const DEV_NPM_DEPENDENCIES: InjectableDependency[] = normalizeDependencies([
{ src: 'systemjs/dist/system-polyfills.src.js', inject: 'shims', dest: JS_DEST },
{ src: 'reflect-metadata/Reflect.js', inject: 'shims', dest: JS_DEST },
{ src: 'es6-shim/es6-shim.js', inject: 'shims', dest: JS_DEST },
{ src: 'systemjs/dist/system.src.js', inject: 'shims', dest: JS_DEST },
{ src: 'angular2/bundles/angular2-polyfills.js', inject: 'shims', dest: JS_DEST },
{ src: 'rxjs/bundles/Rx.js', inject: 'libs', dest: JS_DEST },
{ src: 'angular2/bundles/angular2.js', inject: 'libs', dest: JS_DEST },
{ src: 'angular2/bundles/router.js', inject: 'libs', dest: JS_DEST },
{ src: 'angular2/bundles/http.js', inject: 'libs', dest: JS_DEST }
]);
export const PROD_NPM_DEPENDENCIES: InjectableDependency[] = normalizeDependencies([
{ src: 'reflect-metadata/Reflect.js', inject: 'shims' },
{ src: 'es6-shim/es6-shim.min.js', inject: 'shims' },
{ src: 'angular2/bundles/angular2-polyfills.min.js', inject: 'libs' }
]);
<<<<<<<
const SYSTEM_CONFIG_PROD = {
defaultJSExtensions: true,
bundles: {
'bundles/app': ['bootstrap']
}
};
export const SYSTEM_CONFIG = ENV === 'dev' ? SYSTEM_CONFIG_DEV : SYSTEM_CONFIG_PROD;
// This is important to keep clean module names as 'module name == module uri'.
export const SYSTEM_CONFIG_BUILDER = {
defaultJSExtensions: true,
paths: {
'*': `${TMP_DIR}/*`,
'angular2/*': 'node_modules/angular2/*',
'ng2-material/*': 'node_modules/ng2-material/*',
'rxjs/*': 'node_modules/rxjs/*'
}
};
=======
export const SYSTEM_CONFIG = SYSTEM_CONFIG_DEV;
>>>>>>>
export const SYSTEM_CONFIG = SYSTEM_CONFIG_DEV; |
<<<<<<<
import {ROUTER_PROVIDERS, APP_BASE_HREF, LocationStrategy, HashLocationStrategy} from 'angular2/router';
import {HTTP_PROVIDERS} from 'angular2/http';
import {Authentication} from './services/Authentication';
=======
import {ROUTER_PROVIDERS, LocationStrategy, HashLocationStrategy} from 'angular2/router';
>>>>>>>
import {ROUTER_PROVIDERS, LocationStrategy, HashLocationStrategy} from 'angular2/router';
import {HTTP_PROVIDERS} from 'angular2/http';
import {Authentication} from './services/Authentication'; |
<<<<<<<
await search.search(page, req.query.sort);
var maillist = "";
search.members.forEach(function(element) {
if (maillist != "" && element.link != undefined) {
maillist = maillist + ", "
}
maillist += element.link && element.link.corporateUsername || ""
});
=======
await search.search(page, req.query.sort as string);
>>>>>>>
await search.search(page, req.query.sort as string);
let maillist = '';
search.members.forEach(function(element) {
if (maillist != '' && element.link != undefined) {
maillist = maillist + ', '
}
maillist += element.link && element.link.corporateUsername || ""
});
<<<<<<<
maillist,
=======
operations,
>>>>>>>
maillist,
operations, |
<<<<<<<
const extractRecipient = (recipient: any): Address | NamespaceId => {
if (typeof recipient === 'string') {
// If bit 0 of byte 0 is not set (like in 0x90), then it is a regular address.
// Else (e.g. 0x91) it represents a namespace id which starts at byte 1.
const bit0 = convert.hexToUint8(recipient.substr(1, 2))[0];
=======
export const extractRecipient = (recipient: string): Address | NamespaceId => {
// If bit 0 of byte 0 is not set (like in 0x90), then it is a regular address.
// Else (e.g. 0x91) it represents a namespace id which starts at byte 1.
const bit0 = convert.hexToUint8(recipient.substr(1, 2))[0];
>>>>>>>
export const extractRecipient = (recipient: any): Address | NamespaceId => {
if (typeof recipient === 'string') {
// If bit 0 of byte 0 is not set (like in 0x90), then it is a regular address.
// Else (e.g. 0x91) it represents a namespace id which starts at byte 1.
const bit0 = convert.hexToUint8(recipient.substr(1, 2))[0];
<<<<<<<
};
/**
* Extract message from either JSON payload (unencoded) or DTO (encoded)
*
* @param message - message payload
* @return {PlainMessage}
*/
const extractMessage = (message: any): PlainMessage => {
let plainMessage = EmptyMessage;
if (message !== undefined && convert.isHexString(message)) {
plainMessage = PlainMessage.createFromPayload(message);
} else {
plainMessage = PlainMessage.create(message);
}
return plainMessage;
=======
};
/**
* Extract beneficiary public key from DTO.
*
* @todo Upgrade of catapult-rest WITH catapult-service-bootstrap versioning.
*
* With `cow` upgrade (nemtech/[email protected]), `catapult-rest` block DTO
* was updated and latest catapult-service-bootstrap uses the wrong block DTO.
* This will be fixed with next catapult-server upgrade to `dragon`.
*
* :warning It is currently not possible to read the block's beneficiary public key
* except when working with a local instance of `catapult-rest`.
*
* @param beneficiary {string | undefined} The beneficiary public key if set
* @return {Mosaic[]}
*/
export const extractBeneficiary = (
blockDTO: any,
networkType: NetworkType
): PublicAccount | undefined => {
let dtoPublicAccount: PublicAccount | undefined;
let dtoFieldValue: string | undefined;
if (blockDTO.beneficiaryPublicKey) {
dtoFieldValue = blockDTO.beneficiaryPublicKey;
} else if (blockDTO.beneficiary) {
dtoFieldValue = blockDTO.beneficiary;
}
if (! dtoFieldValue) {
return undefined;
}
try {
// @FIX with latest catapult-service-bootstrap version, catapult-rest still returns
// a `string` formatted copy of the public *when it is set at all*.
dtoPublicAccount = PublicAccount.createFromPublicKey(dtoFieldValue, networkType);
} catch (e) { dtoPublicAccount = undefined; }
return dtoPublicAccount;
>>>>>>>
};
/**
* Extract message from either JSON payload (unencoded) or DTO (encoded)
*
* @param message - message payload
* @return {PlainMessage}
*/
const extractMessage = (message: any): PlainMessage => {
let plainMessage = EmptyMessage;
if (message !== undefined && convert.isHexString(message)) {
plainMessage = PlainMessage.createFromPayload(message);
} else {
plainMessage = PlainMessage.create(message);
}
return plainMessage;
};
/**
* Extract beneficiary public key from DTO.
*
* @todo Upgrade of catapult-rest WITH catapult-service-bootstrap versioning.
*
* With `cow` upgrade (nemtech/[email protected]), `catapult-rest` block DTO
* was updated and latest catapult-service-bootstrap uses the wrong block DTO.
* This will be fixed with next catapult-server upgrade to `dragon`.
*
* :warning It is currently not possible to read the block's beneficiary public key
* except when working with a local instance of `catapult-rest`.
*
* @param beneficiary {string | undefined} The beneficiary public key if set
* @return {Mosaic[]}
*/
export const extractBeneficiary = (
blockDTO: any,
networkType: NetworkType
): PublicAccount | undefined => {
let dtoPublicAccount: PublicAccount | undefined;
let dtoFieldValue: string | undefined;
if (blockDTO.beneficiaryPublicKey) {
dtoFieldValue = blockDTO.beneficiaryPublicKey;
} else if (blockDTO.beneficiary) {
dtoFieldValue = blockDTO.beneficiary;
}
if (! dtoFieldValue) {
return undefined;
}
try {
// @FIX with latest catapult-service-bootstrap version, catapult-rest still returns
// a `string` formatted copy of the public *when it is set at all*.
dtoPublicAccount = PublicAccount.createFromPublicKey(dtoFieldValue, networkType);
} catch (e) { dtoPublicAccount = undefined; }
return dtoPublicAccount; |
<<<<<<<
import vauth = require("./vorlon.authentication");
=======
import httpConfig = require("../config/vorlon.httpconfig");
>>>>>>>
import vauth = require("./vorlon.authentication");
import httpConfig = require("../config/vorlon.httpconfig"); |
<<<<<<<
this._cssFeaturesListTable = <HTMLTableElement>document.getElementById("cssFeaturesList");
this._htmlFeaturesListTable = <HTMLTableElement>document.getElementById("htmlFeaturesList");
this._miscFeaturesListTable = <HTMLTableElement>document.getElementById("miscFeaturesList");
this._nonCoreFeaturesListTable = <HTMLTableElement>document.getElementById("nonCoreFeaturesList");
var self = this;
var list = {};
var input = document.getElementById('css_feature_filter');
input.addEventListener('input', function(e){
var value = this.value;
for (var z in list) {
list[z].setAttribute('data-feature-visibility', z.indexOf(value) > -1 ? '' : 'hidden');
}
});
input.addEventListener('focus', function(){
var featureElements = Array.prototype.slice.call(document.querySelectorAll('.modernizr-features-list td:first-child'), 0);
featureElements.forEach(function(node){ list[node.textContent.toLowerCase()] = node.parentNode; });
});
=======
this._cssFeaturesListTable = <HTMLTableElement>Tools.QuerySelectorById(div, "cssFeaturesList");
this._htmlFeaturesListTable = <HTMLTableElement>Tools.QuerySelectorById(div, "htmlFeaturesList");
this._miscFeaturesListTable = <HTMLTableElement>Tools.QuerySelectorById(div, "miscFeaturesList");
this._nonCoreFeaturesListTable = <HTMLTableElement>Tools.QuerySelectorById(div, "nonCoreFeaturesList");
>>>>>>>
this._cssFeaturesListTable = <HTMLTableElement>Tools.QuerySelectorById(div, "cssFeaturesList");
this._htmlFeaturesListTable = <HTMLTableElement>Tools.QuerySelectorById(div, "htmlFeaturesList");
this._miscFeaturesListTable = <HTMLTableElement>Tools.QuerySelectorById(div, "miscFeaturesList");
this._nonCoreFeaturesListTable = <HTMLTableElement>Tools.QuerySelectorById(div, "nonCoreFeaturesList");
var list = {};
var input = document.getElementById('css_feature_filter');
input.addEventListener('input', function(e){
var value = this.value;
for (var z in list) {
list[z].setAttribute('data-feature-visibility', z.indexOf(value) > -1 ? '' : 'hidden');
}
});
input.addEventListener('focus', function(){
var featureElements = Array.prototype.slice.call(document.querySelectorAll('.modernizr-features-list td:first-child'), 0);
featureElements.forEach(function(node){ list[node.textContent.toLowerCase()] = node.parentNode; });
}); |
<<<<<<<
parsed.files.push('typings.d.ts');
parsed.files.push('main.web.ts');
=======
parsed.files.push('main.ts');
>>>>>>>
parsed.files.push('main.web.ts'); |
<<<<<<<
'typings/main.d.ts',
join(APP_SRC, '**/*.ts'),
'!' + join(APP_SRC, '**/*.e2e.ts'),
'!' + join(APP_SRC, 'main.ts')
];
=======
join(APP_SRC, '**/*.ts'),
'!' + join(APP_SRC, `${BOOTSTRAP_MODULE}.ts`)
];
>>>>>>>
'typings/main.d.ts',
join(APP_SRC, '**/*.ts'),
'!' + join(APP_SRC, '**/*.e2e.ts'),
'!' + join(APP_SRC, `${BOOTSTRAP_MODULE}.ts`)
]; |
<<<<<<<
=======
import { enableProdMode } from '@angular/core';
// The browser platform with a compiler
>>>>>>>
import { enableProdMode } from '@angular/core';
// The browser platform with a compiler |
<<<<<<<
positionSuggestionContainer = (scNode: any): void => {
const cmEditor = (this.app.workspace.activeLeaf.view as any).sourceMode.cmEditor as Editor;
// find the open bracket to the left of or at the cursor
const cursorPosition = cmEditor.getCursor();
var currentToken = cmEditor.getTokenAt(cmEditor.getCursor());
let currentLinkPosition: Position;
if (currentToken.string === '[]') { // there is no text within the double brackets yet
currentLinkPosition = cursorPosition;
} else { // there is text within the double brackets
var lineTokens = cmEditor.getLineTokens(cursorPosition.line);
var previousTokens = lineTokens.filter((token: Token): boolean => token.start <= currentToken.start).reverse();
const openBracketsToken = previousTokens.find((token: Token): boolean => token.string.contains('['));
currentLinkPosition = { line: cursorPosition.line, ch: openBracketsToken.end };
}
const scCoords = cmEditor.charCoords(currentLinkPosition);
// make sure it fits within the window
const appContainerEl = (this.app as any).dom.appContainerEl
const scRight = scCoords.left + scNode.offsetWidth;
const appWidth = appContainerEl.offsetWidth;
if (scRight > appWidth) {
scCoords.left -= scRight - appWidth;
}
// set the left coord
// the top coord is set by Obsidian and is correct.
// it's also a pain to try to recalculate so I left it out.
scNode.style.left = Math.max(scCoords.left, 0) + 'px';
};
=======
positionSuggestionContainer = (scNode: any): void => {
const cmEditor = (this.app.workspace.activeLeaf.view as any).sourceMode.cmEditor as Editor;
// find the open bracket to the left of or at the cursor
const cursorPosition = cmEditor.getCursor();
var currentToken = cmEditor.getTokenAt(cmEditor.getCursor());
let currentLinkPosition: Position;
if (currentToken.string === '[]') { // there is no text within the double brackets yet
currentLinkPosition = cursorPosition;
} else { // there is text within the double brackets
var lineTokens = cmEditor.getLineTokens(cursorPosition.line);
var previousTokens = lineTokens.filter((token: Token): boolean => token.start <= currentToken.start).reverse();
const openBracketsToken = previousTokens.find((token: Token): boolean => token.string.contains('['));
// position the suggestion container to just underneath the end of the open brackets
currentLinkPosition = { line: cursorPosition.line, ch: openBracketsToken.end };
}
const scCoords = cmEditor.charCoords(currentLinkPosition);
// make sure it fits within the window
const appContainerEl = (this.app as any).dom.appContainerEl
const scRight = scCoords.left + scNode.offsetWidth;
const appWidth = appContainerEl.offsetWidth;
if (scRight > appWidth) {
scCoords.left -= scRight - appWidth;
}
const verticalGap = 5;
scCoords.top += verticalGap;
const scBottom = scCoords.top + scNode.offsetHeight;
console.log({scBottom});
console.log({appHeight: appContainerEl.offsetHeight});
if (scBottom > appContainerEl.offsetHeight) {
const topOfLine = cmEditor.charCoords(cursorPosition, 'page').top; // using 'local' to take into account padding of the CodeMirror container
console.log({topOfLine});
scCoords.top = topOfLine - scNode.offsetHeight - verticalGap;
}
// set the coords
scNode.style.left = Math.max(scCoords.left, 0) + 'px';
scNode.style.top = Math.max(scCoords.top, 0) + 'px';
};
>>>>>>>
positionSuggestionContainer = (scNode: any): void => {
const cmEditor = (this.app.workspace.activeLeaf.view as any).sourceMode.cmEditor as Editor;
// find the open bracket to the left of or at the cursor
const cursorPosition = cmEditor.getCursor();
var currentToken = cmEditor.getTokenAt(cmEditor.getCursor());
let currentLinkPosition: Position;
if (currentToken.string === '[]') { // there is no text within the double brackets yet
currentLinkPosition = cursorPosition;
} else { // there is text within the double brackets
var lineTokens = cmEditor.getLineTokens(cursorPosition.line);
var previousTokens = lineTokens.filter((token: Token): boolean => token.start <= currentToken.start).reverse();
const openBracketsToken = previousTokens.find((token: Token): boolean => token.string.contains('['));
// position the suggestion container to just underneath the end of the open brackets
currentLinkPosition = { line: cursorPosition.line, ch: openBracketsToken.end };
}
const scCoords = cmEditor.charCoords(currentLinkPosition);
// make sure it fits within the window
const appContainerEl = (this.app as any).dom.appContainerEl
const scRight = scCoords.left + scNode.offsetWidth;
const appWidth = appContainerEl.offsetWidth;
if (scRight > appWidth) {
scCoords.left -= scRight - appWidth;
}
// set the left coord
// the top coord is set by Obsidian and is correct.
// it's also a pain to try to recalculate so I left it out.
scNode.style.left = Math.max(scCoords.left, 0) + 'px';
}; |
<<<<<<<
private suggestionContainerObserver: MutationObserver;
=======
// helper gets for any casts (for undocumented API stuff)
private get rootSplitAny(): any { return this.app.workspace.rootSplit; }
>>>>>>>
private suggestionContainerObserver: MutationObserver;
// helper gets for any casts (for undocumented API stuff)
private get rootSplitAny(): any { return this.app.workspace.rootSplit; } |
<<<<<<<
currentFWVersion: undefined,
=======
currentBetaOSVersion: undefined,
axis_inversion: {
x: !!Session.getBool(BooleanSetting.x_axis_inverted),
y: !!Session.getBool(BooleanSetting.y_axis_inverted),
z: !!Session.getBool(BooleanSetting.z_axis_inverted),
},
encoder_visibility: {
raw_encoders: !!Session.getBool(BooleanSetting.raw_encoders),
scaled_encoders: !!Session.getBool(BooleanSetting.scaled_encoders),
},
>>>>>>>
currentBetaOSVersion: undefined,
<<<<<<<
.add<string>(Actions.FETCH_FW_UPDATE_INFO_OK, (s, { payload }) => {
s.currentFWVersion = payload;
return s;
})
=======
.add<Xyz>(Actions.INVERT_JOG_BUTTON, (s, { payload }) => {
s.axis_inversion[payload] = !s.axis_inversion[payload];
return s;
})
.add<EncoderDisplay>(Actions.DISPLAY_ENCODER_DATA, (s, { payload }) => {
s.encoder_visibility[payload] = !s.encoder_visibility[payload];
return s;
})
>>>>>>> |
<<<<<<<
import { SearchAddon, ISearchOptions } from './xtermSearchAddon'
import 'xterm/lib/xterm.css'
=======
>>>>>>>
import { SearchAddon, ISearchOptions } from './xtermSearchAddon'
<<<<<<<
private search = new SearchAddon()
=======
private fitAddon = new FitAddon()
private opened = false
>>>>>>>
private search = new SearchAddon()
private fitAddon = new FitAddon()
private opened = false |
<<<<<<<
import { CodeGenerator } from '../../core/code-generator';
=======
import { logger } from '../../core';
import { CodeGenerator } from '../../core/code-generator';
>>>>>>>
import { logger } from '../../core';
import { CodeGenerator } from '../../core/code-generator';
<<<<<<<
try {
await new CodeGenerator(config.get('GENERATED_FOLDER'), config.get('DB_ENTITIES'), {
resolversPath: config.get('RESOLVERS_PATH'),
validateResolvers: config.get('VALIDATE_RESOLVERS') === 'true',
warthogImportPath: config.get('MODULE_IMPORT_PATH')
}).generate();
} catch (error) {
console.error(error); // eslint-disable-line
}
=======
try {
await new CodeGenerator(config.get('GENERATED_FOLDER'), config.get('DB_ENTITIES'), {
resolversPath: config.get('RESOLVERS_PATH'),
warthogImportPath: config.get('MODULE_IMPORT_PATH')
}).generate();
} catch (error) {
logger.error(error);
if (error.name.indexOf('Cannot determine GraphQL input type') > -1) {
logger.error('This often means you have multiple versions of TypeGraphQL installed.');
}
}
>>>>>>>
try {
await new CodeGenerator(config.get('GENERATED_FOLDER'), config.get('DB_ENTITIES'), {
resolversPath: config.get('RESOLVERS_PATH'),
validateResolvers: config.get('VALIDATE_RESOLVERS') === 'true',
warthogImportPath: config.get('MODULE_IMPORT_PATH')
}).generate();
} catch (error) {
logger.error(error);
if (error.name.indexOf('Cannot determine GraphQL input type') > -1) {
logger.error('This often means you have multiple versions of TypeGraphQL installed.');
}
} |
<<<<<<<
import componentsReducer from './components'
=======
import mutationsReducer from './mutations'
>>>>>>>
import componentsReducer from './components'
import mutationsReducer from './mutations'
<<<<<<<
components: componentsReducer,
=======
mutations: mutationsReducer,
>>>>>>>
components: componentsReducer,
mutations: mutationsReducer, |
<<<<<<<
import { isString } from '@nestjs/common/utils/shared.utils';
=======
import { transformSchema } from 'apollo-graphql';
>>>>>>>
import { transformSchema } from 'apollo-graphql';
import { isString } from '@nestjs/common/utils/shared.utils';
<<<<<<<
import {
GraphQLAbstractType,
GraphQLResolveInfo,
GraphQLSchema,
GraphQLTypeResolver,
GraphQLUnionType,
} from 'graphql';
=======
import {
GraphQLField,
GraphQLInputObjectType,
GraphQLObjectType,
GraphQLSchema,
GraphQLUnionType,
isEnumType,
isInputObjectType,
isInterfaceType,
isObjectType,
isUnionType,
} from 'graphql';
>>>>>>>
import {
GraphQLAbstractType,
GraphQLField,
GraphQLInputObjectType,
GraphQLObjectType,
GraphQLResolveInfo,
GraphQLSchema,
GraphQLUnionType,
isEnumType,
isInputObjectType,
isInterfaceType,
isObjectType,
isUnionType,
} from 'graphql'; |
<<<<<<<
let downloadsInitiated = 0;
=======
let extension = ZosFilesUtils.DEFAULT_FILE_EXTENSION;
if (options.extension != null) {
extension = options.extension;
}
>>>>>>>
let downloadsInitiated = 0;
let extension = ZosFilesUtils.DEFAULT_FILE_EXTENSION;
if (options.extension != null) {
extension = options.extension;
} |
<<<<<<<
import { SignupComponent } from './signup/signup.component';
=======
import { BreadcrumbComponent } from './breadcrumb/breadcrumb.component';
>>>>>>>
import { SignupComponent } from './signup/signup.component';
import { BreadcrumbComponent } from './breadcrumb/breadcrumb.component';
<<<<<<<
UserManagementComponent,
SignupComponent
=======
UserManagementComponent,
BreadcrumbComponent
>>>>>>>
UserManagementComponent,
SignupComponent
BreadcrumbComponent |
<<<<<<<
!options.enumName && delete options.enumName;
return createPropertyDecorator(DECORATORS.API_MODEL_PROPERTIES, options);
}
export function ApiPropertyOptional(
options: ApiPropertyOptions = {}
): PropertyDecorator {
return ApiProperty({
...options,
required: false
});
}
export function ApiResponseProperty(
options: Pick<
ApiPropertyOptions,
'type' | 'example' | 'format' | 'enum' | 'deprecated'
> = {}
): PropertyDecorator {
return ApiProperty({
readOnly: true,
...options
});
=======
return createPropertyDecorator(
DECORATORS.API_MODEL_PROPERTIES,
options,
overrideExisting
);
>>>>>>>
!options.enumName && delete options.enumName;
return createPropertyDecorator(
DECORATORS.API_MODEL_PROPERTIES,
options,
overrideExisting
);
}
export function ApiPropertyOptional(
options: ApiPropertyOptions = {}
): PropertyDecorator {
return ApiProperty({
...options,
required: false
});
}
export function ApiResponseProperty(
options: Pick<
ApiPropertyOptions,
'type' | 'example' | 'format' | 'enum' | 'deprecated'
> = {}
): PropertyDecorator {
return ApiProperty({
readOnly: true,
...options
}); |
<<<<<<<
export const Kbd = {
baseStyle,
}
=======
const kbd = {
baseStyle,
}
export default kbd
>>>>>>>
export default {
baseStyle,
} |
<<<<<<<
export const SkipLink = {
baseStyle,
}
=======
const skipLink = {
baseStyle,
}
export default skipLink
>>>>>>>
export default {
baseStyle,
} |
<<<<<<<
export const Popover = {
parts,
baseStyle,
}
=======
const popover = {
parts,
baseStyle,
}
export default popover
>>>>>>>
export default {
parts,
baseStyle,
} |
<<<<<<<
export const Menu = {
parts,
baseStyle,
}
=======
const menu = {
parts,
baseStyle,
}
export default menu
>>>>>>>
export default {
parts,
baseStyle,
} |
<<<<<<<
import { Input } from "./input"
=======
import input from "./input"
type Dict = Record<string, any>
>>>>>>>
import Input from "./input"
type Dict = Record<string, any>
<<<<<<<
...Input.baseStyle?.field,
=======
...input.baseStyle.field,
>>>>>>>
...Input.baseStyle.field, |
<<<<<<<
export const Skeleton = {
baseStyle,
}
=======
const skeleton = {
baseStyle,
}
export default skeleton
>>>>>>>
export default {
baseStyle,
} |
<<<<<<<
import { generateStripe, getColor, mode } from "@chakra-ui/theme-tools"
=======
import { generateStripe, getColor, mode } from "@chakra-ui/theme-tools"
type Dict = Record<string, any>
>>>>>>>
import { generateStripe, getColor, mode } from "@chakra-ui/theme-tools"
type Dict = Record<string, any>
<<<<<<<
}
export const Progress = {
parts,
sizes,
baseStyle,
defaultProps,
}
=======
}
const progress = {
parts,
baseStyle,
sizes,
defaultProps,
}
export default progress
>>>>>>>
}
export default {
parts,
sizes,
baseStyle,
defaultProps,
} |
<<<<<<<
import * as fs from 'fs';
import { cwd } from 'process';
// Only for types; take care never to use ts_types in expressions, only in type annotations
import * as ts_types from 'typescript';
import { logOnce } from './logger';
import { CodeSourceMapPair, TsJestConfig } from './jest-types';
import { getTypescriptCompiler } from './custom-compiler';
=======
import * as ts from 'typescript';
import { logOnce } from './utils/logger';
>>>>>>>
import * as fs from 'fs';
import { cwd } from 'process';
// Only for types; take care never to use ts_types in expressions, only in type annotations
import * as ts_types from 'typescript';
import { logOnce } from './utils/logger';
import { getTypescriptCompiler } from './custom-compiler';
import { TsJestConfig } from './types';
<<<<<<<
compilerOptions: ts_types.CompilerOptions,
tsJestConfig: TsJestConfig,
): CodeSourceMapPair {
=======
compilerOptions: ts.CompilerOptions,
): jest.TransformedSource {
>>>>>>>
compilerOptions: ts_types.CompilerOptions,
tsJestConfig: TsJestConfig,
): jest.TransformedSource {
<<<<<<<
const ts = getTypescriptCompiler(tsJestConfig);
const transpileOutput = transpileViaTranspileModule(
=======
const { outputText: code, sourceMapText: map } = transpileViaTranspileModule(
>>>>>>>
const ts = getTypescriptCompiler(tsJestConfig);
const { outputText: code, sourceMapText: map } = transpileViaTranspileModule(
<<<<<<<
compilerOptions: ts_types.CompilerOptions,
ts: typeof ts_types,
): ts_types.TranspileOutput {
return ts.transpileModule(fileSource, {
=======
compilerOptions: ts.CompilerOptions,
): ts.TranspileOutput {
const transpileOutput = ts.transpileModule(fileSource, {
>>>>>>>
compilerOptions: ts_types.CompilerOptions,
ts: typeof ts_types,
): ts_types.TranspileOutput {
const transpileOutput = ts.transpileModule(fileSource, { |
<<<<<<<
xhr = new window.XMLHttpRequest();
=======
params.onerror(0);
>>>>>>>
xhr = new window.XMLHttpRequest();
<<<<<<<
params.onerror("No XMLHTTPRequest object could be created");
}
return null;
}
=======
var xhrStatus = xhr.status;
var xhrStatusText = xhr.status !== 0 && xhr.statusText || 'No connection';
// Fix for loading from file
if (xhrStatus === 0 &&
(window.location.protocol === "file:" ||
window.location.protocol === "chrome-extension:"))
{
xhrStatus = 200;
}
// Sometimes the browser sets status to 200 OK when the connection is closed
// before the message is sent (weird!).
// In order to address this we fail any completely empty responses.
// Hopefully, nobody will get a valid response with no headers and no body!
if (xhr.getAllResponseHeaders() === "")
{
var noBody;
if (xhr.responseType === "arraybuffer")
{
noBody = !xhr.response;
}
else if (xhr.mozResponseArrayBuffer)
{
noBody = !xhr.mozResponseArrayBuffer;
}
else
{
noBody = !xhr.responseText;
}
if (noBody)
{
if (loader.onerror)
{
loader.onerror(0);
}
}
// break circular reference
xhr.onreadystatechange = null;
xhr = null;
return;
}
>>>>>>>
params.onerror(0);
}
return null;
}
<<<<<<<
// Fix for loading from file
if (xhrStatus === 0 && window.location.protocol === "file:")
{
xhrStatus = 200;
}
// processBytes returns false if any of the
// entries in the archive was not supported or
// couldn't be loaded as a sound.
=======
// processBytes returns false if any of the
// entries in the archive was not supported or
// couldn't be loaded as a sound.
>>>>>>>
// processBytes returns false if any of the
// entries in the archive was not supported or
// couldn't be loaded as a sound.
<<<<<<<
if (loader.onerror)
{
loader.onerror();
}
=======
loader.onerror(xhrStatus);
>>>>>>>
if (loader.onerror)
{
loader.onerror(xhrStatus);
} |
<<<<<<<
// Create each of the native engine API devices to be used
var mathDeviceParameters = {};
var mathDevice = TurbulenzEngine.createMathDevice(mathDeviceParameters);
if (!TurbulenzEngine.canvas)
{
var graphicsDeviceParameters = { };
var graphicsDevice = TurbulenzEngine.createGraphicsDevice(graphicsDeviceParameters);
}
=======
/*{% if not tz_canvas %}*/
var graphicsDeviceParameters = { };
var graphicsDevice = TurbulenzEngine.createGraphicsDevice(graphicsDeviceParameters);
/*{% endif %}*/
>>>>>>>
if (!TurbulenzEngine.canvas)
{
var graphicsDeviceParameters = { };
var graphicsDevice = TurbulenzEngine.createGraphicsDevice(graphicsDeviceParameters);
}
<<<<<<<
var numFrames = 0;
var lastSecond = 0;
}
else
{
canvas = Canvas.create(graphicsDevice, mathDevice);
}
=======
/*{% else %}*/
canvas = Canvas.create(graphicsDevice);
/*{% endif %}*/
>>>>>>>
var numFrames = 0;
var lastSecond = 0;
}
else
{
canvas = Canvas.create(graphicsDevice);
} |
<<<<<<<
xhr = new window.XMLHttpRequest();
=======
params.onerror(0);
>>>>>>>
xhr = new window.XMLHttpRequest();
<<<<<<<
params.onerror("No XMLHTTPRequest object could be created");
}
return null;
}
=======
var xhrStatus = xhr.status;
var xhrStatusText = xhr.status !== 0 && xhr.statusText || 'No connection';
// Fix for loading from file
if (xhrStatus === 0 &&
(window.location.protocol === "file:" ||
window.location.protocol === "chrome-extension:"))
{
xhrStatus = 200;
}
// Sometimes the browser sets status to 200 OK when the connection is closed
// before the message is sent (weird!).
// In order to address this we fail any completely empty responses.
// Hopefully, nobody will get a valid response with no headers and no body!
if (xhr.getAllResponseHeaders() === "")
{
var noBody;
if (xhr.responseType === "arraybuffer")
{
noBody = !xhr.response;
}
else if (xhr.mozResponseArrayBuffer)
{
noBody = !xhr.mozResponseArrayBuffer;
}
else
{
noBody = !xhr.responseText;
}
if (noBody)
{
if (loader.onerror)
{
loader.onerror(0);
}
}
// break circular reference
xhr.onreadystatechange = null;
xhr = null;
return;
}
>>>>>>>
params.onerror(0);
}
return null;
}
<<<<<<<
// Fix for loading from file
if (xhrStatus === 0 && window.location.protocol === "file:")
{
xhrStatus = 200;
}
loader.processBytes(new Uint8Array(buffer));
if (loader.data)
=======
loader.processBytes(new Uint8Array(buffer));
if (loader.data)
{
if (loader.onload)
>>>>>>>
loader.processBytes(new Uint8Array(buffer));
if (loader.data)
<<<<<<<
// break circular reference
xhr.onreadystatechange = null;
xhr = null;
=======
else
{
if (loader.onerror)
{
loader.onerror(xhrStatus);
}
}
>>>>>>>
// break circular reference
xhr.onreadystatechange = null;
xhr = null;
<<<<<<<
if (loader.onload)
{
loader.onload(loader.data, loader.width, loader.height, loader.format,
loader.numLevels, (loader.numFaces > 1), loader.depth);
}
}
else
{
if (loader.onerror)
{
loader.onerror();
}
=======
loader.onerror(0);
>>>>>>>
if (loader.onload)
{
loader.onload(loader.data, loader.width, loader.height, loader.format,
loader.numLevels, (loader.numFaces > 1), loader.depth);
}
}
else
{
if (loader.onerror)
{
loader.onerror(0);
} |
<<<<<<<
it("should be able to create a sequential data set (PS) with responseTimeout", async () => {
dsOptions.dsntype = "PDS";
dsOptions.responseTimeout = 5;
const response = await Create.dataSet(dummySession, CreateDataSetTypeEnum.DATA_SET_SEQUENTIAL, dataSetName, dsOptions);
expect(response.success).toBe(true);
expect(response.commandResponse).toContain("created successfully");
expect(mySpy).toHaveBeenCalledWith(
dummySession,
endpoint,
[],
JSON.stringify({
...CreateDefaults.DATA_SET.SEQUENTIAL,
...dsOptions,
...{
secondary: 1
}
})
);
});
=======
it("should be able to allocate like from a sequential data set", async () => {
const response = await Create.dataSetLike(dummySession, "testing2", dataSetName);
expect(response.commandResponse).toContain("created successfully");
});
>>>>>>>
it("should be able to create a sequential data set (PS) with responseTimeout", async () => {
dsOptions.dsntype = "PDS";
dsOptions.responseTimeout = 5;
const response = await Create.dataSet(dummySession, CreateDataSetTypeEnum.DATA_SET_SEQUENTIAL, dataSetName, dsOptions);
expect(response.success).toBe(true);
expect(response.commandResponse).toContain("created successfully");
expect(mySpy).toHaveBeenCalledWith(
dummySession,
endpoint,
[],
JSON.stringify({
...CreateDefaults.DATA_SET.SEQUENTIAL,
...dsOptions,
...{
secondary: 1
}
})
);
});
it("should be able to allocate like from a sequential data set", async () => {
const response = await Create.dataSetLike(dummySession, "testing2", dataSetName);
expect(response.commandResponse).toContain("created successfully");
}); |
<<<<<<<
=======
};
// Constructor function
TZWebGLTexture.create = function webGLTextureCreateFn(gd, params)
{
var tex = new TZWebGLTexture();
tex.gd = gd;
tex.mipmaps = params.mipmaps;
tex.dynamic = params.dynamic;
tex.renderable = params.renderable;
tex.numDataLevels = 0;
tex.id = ++gd.counters.textures;
>>>>>>>
<<<<<<<
if (renderBuffer.width < width ||
renderBuffer.height < height)
{
gl.deleteRenderbuffer(glBuffer);
return null;
}
=======
renderBuffer.gd = gd;
renderBuffer.format = format;
renderBuffer.glDepthAttachment = attachment;
renderBuffer.glBuffer = glBuffer;
renderBuffer.id = ++gd.counters.renderBuffers;
>>>>>>>
if (renderBuffer.width < width ||
renderBuffer.height < height)
{
gl.deleteRenderbuffer(glBuffer);
return null;
}
<<<<<<<
return renderTarget;
}
}
=======
renderTarget.id = ++gd.counters.renderTargets;
return renderTarget;
};
>>>>>>>
renderTarget.id = ++gd.counters.renderTargets;
return renderTarget;
}
}
<<<<<<<
gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, (numIndices * stride), ib.usage);
}
=======
ib.id = ++gd.counters.indexBuffers;
return ib;
};
>>>>>>>
gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, (numIndices * stride), ib.usage);
}
ib.id = ++gd.counters.indexBuffers;
<<<<<<<
gl.bufferData(gl.ARRAY_BUFFER, bufferSize, vb.usage);
}
=======
vb.id = ++gd.counters.vertexBuffers;
return vb;
};
>>>>>>>
gl.bufferData(gl.ARRAY_BUFFER, bufferSize, vb.usage);
}
vb.id = ++gd.counters.vertexBuffers;
<<<<<<<
return technique;
}
}
=======
technique.id = ++gd.counters.techniques;
return technique;
};
>>>>>>>
technique.id = ++gd.counters.techniques;
return technique;
}
}
<<<<<<<
return shader;
}
}
=======
shader.id = ++gd.counters.shaders;
return shader;
};
>>>>>>>
shader.id = ++gd.counters.shaders;
return shader;
}
}
<<<<<<<
class WebGLGraphicsDevice implements GraphicsDevice
=======
interface WebGLCreationCounters
{
textures: number;
vertexBuffers: number;
indexBuffers: number;
renderTargets: number;
renderBuffers: number;
shaders: number;
techniques: number;
};
interface WebGLGraphicsDevice extends GraphicsDevice
>>>>>>>
interface WebGLCreationCounters
{
textures: number;
vertexBuffers: number;
indexBuffers: number;
renderTargets: number;
renderBuffers: number;
shaders: number;
techniques: number;
};
class WebGLGraphicsDevice implements GraphicsDevice
<<<<<<<
drawIndexed(primitive: number, numIndices: number, first?: number)
=======
counters: WebGLCreationCounters;
// Methods
bindTexture(target: number, texture: WebGLTexture) : void;
unbindTexture(texture: WebGLTexture) : void;
syncState(): void;
checkFullScreen: { (): void; };
destroy(): void;
};
declare var WebGLGraphicsDevice :
{
new(): WebGLGraphicsDevice;
prototype: any;
create(canvas: any, params: any): any;
};
function WebGLGraphicsDevice() { return this; }
WebGLGraphicsDevice.prototype =
{
version : 1,
SEMANTIC_POSITION: 0,
SEMANTIC_POSITION0: 0,
SEMANTIC_BLENDWEIGHT: 1,
SEMANTIC_BLENDWEIGHT0: 1,
SEMANTIC_NORMAL: 2,
SEMANTIC_NORMAL0: 2,
SEMANTIC_COLOR: 3,
SEMANTIC_COLOR0: 3,
SEMANTIC_COLOR1: 4,
SEMANTIC_SPECULAR: 4,
SEMANTIC_FOGCOORD: 5,
SEMANTIC_TESSFACTOR: 5,
SEMANTIC_PSIZE0: 6,
SEMANTIC_BLENDINDICES: 7,
SEMANTIC_BLENDINDICES0: 7,
SEMANTIC_TEXCOORD: 8,
SEMANTIC_TEXCOORD0: 8,
SEMANTIC_TEXCOORD1: 9,
SEMANTIC_TEXCOORD2: 10,
SEMANTIC_TEXCOORD3: 11,
SEMANTIC_TEXCOORD4: 12,
SEMANTIC_TEXCOORD5: 13,
SEMANTIC_TEXCOORD6: 14,
SEMANTIC_TEXCOORD7: 15,
SEMANTIC_TANGENT: 14,
SEMANTIC_TANGENT0: 14,
SEMANTIC_BINORMAL0: 15,
SEMANTIC_BINORMAL: 15,
SEMANTIC_PSIZE: 6,
SEMANTIC_ATTR0: 0,
SEMANTIC_ATTR1: 1,
SEMANTIC_ATTR2: 2,
SEMANTIC_ATTR3: 3,
SEMANTIC_ATTR4: 4,
SEMANTIC_ATTR5: 5,
SEMANTIC_ATTR6: 6,
SEMANTIC_ATTR7: 7,
SEMANTIC_ATTR8: 8,
SEMANTIC_ATTR9: 9,
SEMANTIC_ATTR10: 10,
SEMANTIC_ATTR11: 11,
SEMANTIC_ATTR12: 12,
SEMANTIC_ATTR13: 13,
SEMANTIC_ATTR14: 14,
SEMANTIC_ATTR15: 15,
PIXELFORMAT_A8: 0,
PIXELFORMAT_L8: 1,
PIXELFORMAT_L8A8: 2,
PIXELFORMAT_R5G5B5A1: 3,
PIXELFORMAT_R5G6B5: 4,
PIXELFORMAT_R4G4B4A4: 5,
PIXELFORMAT_R8G8B8A8: 6,
PIXELFORMAT_R8G8B8: 7,
PIXELFORMAT_D24S8: 8,
PIXELFORMAT_D16: 9,
PIXELFORMAT_DXT1: 10,
PIXELFORMAT_DXT3: 11,
PIXELFORMAT_DXT5: 12,
drawIndexed : function drawIndexedFn(primitive, numIndices, first)
>>>>>>>
counters: WebGLCreationCounters;
drawIndexed(primitive: number, numIndices: number, first?: number)
<<<<<<<
if (debug)
{
gd.metrics = <WebGLMetrics>{
renderTargetChanges: 0,
textureChanges: 0,
renderStateChanges: 0,
vertexBufferChanges: 0,
indexBufferChanges: 0,
techniqueChanges: 0,
drawCalls: 0,
primitives: 0,
=======
gd.counters = <WebGLCreationCounters>{
textures: 0,
vertexBuffers: 0,
indexBuffers: 0,
renderTargets: 0,
renderBuffers: 0,
shaders: 0,
techniques: 0
};
if (debug)
{
gd.metrics = <WebGLMetrics>{
renderTargetChanges: 0,
textureChanges: 0,
renderStateChanges: 0,
vertexBufferChanges: 0,
indexBufferChanges: 0,
techniqueChanges: 0,
drawCalls: 0,
primitives: 0,
>>>>>>>
gd.counters = <WebGLCreationCounters>{
textures: 0,
vertexBuffers: 0,
indexBuffers: 0,
renderTargets: 0,
renderBuffers: 0,
shaders: 0,
techniques: 0
};
if (debug)
{
gd.metrics = <WebGLMetrics>{
renderTargetChanges: 0,
textureChanges: 0,
renderStateChanges: 0,
vertexBufferChanges: 0,
indexBufferChanges: 0,
techniqueChanges: 0,
drawCalls: 0,
primitives: 0, |
<<<<<<<
interface Physics2DCallbackFn
{
(thisShape: Physics2DShape, otherShape: Physics2DShape): void;
}
=======
// BREAK, WAKE, SLEEP callbacks on Constraints/RigidBody
interface Physics2DObjectCallbackFn {
(): void;
}
// BEGIN, END, etc between two Shapes
interface Physics2DShapeCallbackFn {
(arbiter: Physics2DArbiter, otherShape: Physics2DShape): void;
}
>>>>>>>
// BREAK, WAKE, SLEEP callbacks on Constraints/RigidBody
interface Physics2DObjectCallbackFn
{
(): void;
}
// BEGIN, END, etc between two Shapes
interface Physics2DShapeCallbackFn
{
(arbiter: Physics2DArbiter, otherShape: Physics2DShape): void;
}
<<<<<<<
}
sleep()
=======
};
sleep(): void
>>>>>>>
}
sleep(): void
<<<<<<<
}
getAnchorB(dst)
=======
};
getAnchorB(dst?: any): any // v2
>>>>>>>
}
getAnchorB(dst?: any): any // v2
<<<<<<<
}
setAnchorB(anchor)
=======
};
setAnchorB(anchor: any): void // v2
>>>>>>>
}
setAnchorB(anchor: any): void // v2
<<<<<<<
}
clearCache2()
=======
};
clearCache2(): void
>>>>>>>
}
clearCache2(): void
<<<<<<<
}
clearCache3()
=======
};
clearCache3(): void
>>>>>>>
}
clearCache3(): void
<<<<<<<
}
soft_params2(data, KMASS, GAMMA, BIAS, deltaTime, breakUnderError)
=======
};
soft_params2(data: any /*floatArray*/, KMASS: number, GAMMA: number, BIAS: number, deltaTime: number, breakUnderError: bool): bool
>>>>>>>
}
soft_params2(data: any /*floatArray*/, KMASS: number, GAMMA: number, BIAS: number, deltaTime: number, breakUnderError: bool): bool
<<<<<<<
}
soft_params3(data, KMASS, GAMMA, BIAS, deltaTime, breakUnderError)
=======
};
soft_params3(data: any /*floatArray*/, KMASS: number, GAMMA: number, BIAS: number, deltaTime: number, breakUnderError: bool): bool
>>>>>>>
}
soft_params3(data: any /*floatArray*/, KMASS: number, GAMMA: number, BIAS: number, deltaTime: number, breakUnderError: bool): bool
<<<<<<<
}
safe_solve2(data, KMASS, ERR, IMP)
=======
};
safe_solve2(data: any /*floatArray*/, KMASS: number, ERR: number, IMP: number): void
>>>>>>>
}
safe_solve2(data: any /*floatArray*/, KMASS: number, ERR: number, IMP: number): void
<<<<<<<
}
safe_solve3(data, KMASS, ERR, IMP)
=======
};
safe_solve3(data: any /*floatArray*/, KMASS: number, ERR: number, IMP: number): void
>>>>>>>
}
safe_solve3(data: any /*floatArray*/, KMASS: number, ERR: number, IMP: number): void
<<<<<<<
}
safe_invert2(data, KMASS, JACC)
=======
};
safe_invert2(data: any /*floatArray*/, KMASS: number, JACC: number): void
>>>>>>>
}
safe_invert2(data: any /*floatArray*/, KMASS: number, JACC: number): void
<<<<<<<
}
safe_invert3(data, KMASS, JACC)
=======
};
safe_invert3(data: any /*floatArray*/, KMASS: number, JACC: number): void
>>>>>>>
}
safe_invert3(data: any /*floatArray*/, KMASS: number, JACC: number): void
<<<<<<<
dimension: number;
=======
>>>>>>>
<<<<<<<
}
setRatio(ratio)
=======
};
setRatio(ratio: number): void
>>>>>>>
}
setRatio(ratio: number): void
<<<<<<<
}
getUpperBound()
=======
};
getUpperBound(): number
>>>>>>>
}
getUpperBound(): number
<<<<<<<
}
setUpperBound(upperBound)
=======
};
setUpperBound(upperBound: number): void
>>>>>>>
}
setUpperBound(upperBound: number): void
<<<<<<<
getAnchorC(dst)
=======
getAnchorC(dst?: any /*v2*/): any /*v2*/
>>>>>>>
getAnchorC(dst?: any /*v2*/): any /*v2*/
<<<<<<<
}
setAnchorC(anchor)
=======
};
setAnchorC(anchor: any /*v2*/): void
>>>>>>>
}
setAnchorC(anchor: any /*v2*/): void
<<<<<<<
}
setAnchorD(anchor)
=======
};
setAnchorD(anchor: any /*v2*/): void
>>>>>>>
}
setAnchorD(anchor: any /*v2*/): void
<<<<<<<
}
getRatio()
=======
};
getRatio(): number
>>>>>>>
}
getRatio(): number
<<<<<<<
}
setRatio(ratio)
=======
};
setRatio(ratio: number): void
>>>>>>>
}
setRatio(ratio: number): void
<<<<<<<
dimension: number;
=======
// Inherited
wake = Physics2DConstraint.prototype.wake;
sleep = Physics2DConstraint.prototype.sleep;
configure = Physics2DConstraint.prototype.configure;
isEnabled = Physics2DConstraint.prototype.isEnabled;
isDisabled = Physics2DConstraint.prototype.isDisabled;
enable = Physics2DConstraint.prototype.enable;
disable = Physics2DConstraint.prototype.disable;
addEventListener = Physics2DConstraint.prototype.addEventListener;
removeEventListener = Physics2DConstraint.prototype.removeEventListener;
>>>>>>>
<<<<<<<
}
getUpperBound()
=======
};
getUpperBound(): number
>>>>>>>
}
getUpperBound(): number
<<<<<<<
}
setUpperBound(upperBound)
=======
};
setUpperBound(upperBound: number): void
>>>>>>>
}
setUpperBound(upperBound: number): void
<<<<<<<
}
setAxis(axis)
=======
};
setAxis(axis: any /*v2*/): void
>>>>>>>
}
setAxis(axis: any /*v2*/): void
<<<<<<<
}
getUpperBound()
=======
};
getUpperBound(): number
>>>>>>>
}
getUpperBound(): number
<<<<<<<
}
setUpperBound(upperBound)
=======
};
setUpperBound(upperBound: number): void
>>>>>>>
}
setUpperBound(upperBound: number): void
<<<<<<<
}
getUpperBound()
=======
};
getUpperBound(): number
>>>>>>>
}
getUpperBound(): number
<<<<<<<
}
getRatio()
=======
};
getRatio(): number
>>>>>>>
}
getRatio(): number
<<<<<<<
}
setUpperBound(upperBound)
=======
};
setUpperBound(upperBound: number): void
>>>>>>>
}
setUpperBound(upperBound: number): void
<<<<<<<
}
setRatio(ratio)
=======
};
setRatio(ratio: number): void
>>>>>>>
}
setRatio(ratio: number): void
<<<<<<<
}
setPhase(phase)
=======
};
setPhase(phase: number): void
>>>>>>>
}
setPhase(phase: number): void
<<<<<<<
// Ours
dimension: number;
=======
// Inherited
wake = Physics2DConstraint.prototype.wake;
sleep = Physics2DConstraint.prototype.sleep;
configure = Physics2DConstraint.prototype.configure;
isEnabled = Physics2DConstraint.prototype.isEnabled;
isDisabled = Physics2DConstraint.prototype.isDisabled;
enable = Physics2DConstraint.prototype.enable;
disable = Physics2DConstraint.prototype.disable;
addEventListener = Physics2DConstraint.prototype.addEventListener;
removeEventListener = Physics2DConstraint.prototype.removeEventListener;
>>>>>>>
<<<<<<<
// debug.abort("abstact method");
// }
=======
// debug.abort("abstract method");
// }
>>>>>>>
// debug.abort("abstract method");
// }
<<<<<<<
}
computeCenterOfMass: { (dst?: any): any; }; // floatArray
=======
};
computeCenterOfMass(dst?: any /*v2*/): any /*v2*/
{
debug.abort("abstract method"); return null;
};
>>>>>>>
}
computeCenterOfMass(dst?: any /*v2*/): any /*v2*/
{
debug.abort("abstract method"); return null;
};
<<<<<<<
// }
translate(translation, skip: bool)
=======
// };
translate(translation, skip: bool): void
>>>>>>>
// }
translate(translation, skip: bool): void
<<<<<<<
computeArea()
=======
====================================================================
computeArea()
=======
// Inherited
getMaterial = Physics2DShape.prototype.getMaterial;
setMaterial = Physics2DShape.prototype.setMaterial;
getGroup = Physics2DShape.prototype.getGroup;
setGroup = Physics2DShape.prototype.setGroup;
getMask = Physics2DShape.prototype.getMask;
setMask = Physics2DShape.prototype.setMask;
addEventListener = Physics2DShape.prototype.addEventListener;
removeEventListener = Physics2DShape.prototype.removeEventListener;
// ===========================================================================
computeArea(): number
>>>>>>>
computeArea(): number
<<<<<<<
}
computeCenterOfMass = Physics2DPolygon.prototype._computeCenterOfMass;
=======
};
>>>>>>>
}
<<<<<<<
// EVENT TYPES
// !! Must use regexp to change these globally (in all files) !!
//
// (Order here is used to order deferred event dispatch)
///*EVENT_WAKE*/0
///*EVENT_BEGIN*/1
///*EVENT_PROGRESS*/2
///*EVENT_END*/3
///*EVENT_SLEEP*/4
///*EVENT_BREAK*/5
//
// (not deferred)
///*EVENT_PRESOLVE*/6
=======
class Physics2DCallback
{
thisObject: any;
callback: any;
// Used to ensure time ordering of deferred events.
// -1 if event corresponds to action performed before step()
// 0 if event is a standard event during step()
// 1 if event is result of a continuous collision during step()
time: number;
// Interaction events
index: number;
arbiter: Physics2DArbiter;
next: Physics2DCallback;
// EVENT TYPES
// !! Must use regexp to change these globally (in all files) !!
//
// (Order here is used to order deferred event dispatch)
///*EVENT_WAKE*/0
///*EVENT_BEGIN*/1
///*EVENT_PROGRESS*/2
///*EVENT_END*/3
///*EVENT_SLEEP*/4
///*EVENT_BREAK*/5
//
// (not deferred)
///*EVENT_PRESOLVE*/6
>>>>>>>
class Physics2DCallback
{
thisObject: any;
callback: any;
// EVENT TYPES
// !! Must use regexp to change these globally (in all files) !!
//
// (Order here is used to order deferred event dispatch)
///*EVENT_WAKE*/0
///*EVENT_BEGIN*/1
///*EVENT_PROGRESS*/2
///*EVENT_END*/3
///*EVENT_SLEEP*/4
///*EVENT_BREAK*/5
//
// (not deferred)
///*EVENT_PRESOLVE*/6
<<<<<<<
}
static pool = null;
static allocate(): Physics2DContact
{
if (!this.pool)
{
return new Physics2DContact();
}
else
{
var ret = this.pool;
this.pool = ret._next;
ret._next = null;
return ret;
}
}
static deallocate(contact: Physics2DContact)
{
contact._next = this.pool;
this.pool = contact;
}
}
=======
};
};
>>>>>>>
}
}
static pool = null;
<<<<<<<
minFactor : number;
userCallback : Physics2DCastCallback;
userThis : any;
ray : Physics2DRay;
noInner : bool;
normal : any; // floatArray
sample(handle): void;
}
=======
minFactor: number;
userCallback: Physics2DCastCallback;
userThis: any;
ray: Physics2DRay;
noInner: bool;
normal: any; // floatArray
sample(handle, any): void;
};
>>>>>>>
minFactor: number;
userCallback: Physics2DCastCallback;
userThis: any;
ray: Physics2DRay;
noInner: bool;
normal: any; // floatArray
sample(handle, any): void;
}
<<<<<<<
shape : Physics2DShape;
hitNormal : any; // v3
hitPoint : any; // v3
factor : number;
}
=======
shape: Physics2DShape;
hitNormal: any; // v3
hitPoint: any; // v3
factor: number;
};
>>>>>>>
shape: Physics2DShape;
hitNormal: any; // v3
hitPoint: any; // v3
factor: number;
}
<<<<<<<
return this._rectangleQuery(this._shapeRectangleCallback, point, store);
}
=======
return this._rectangleQuery(this._shapeRectangleCallback, aabb, store);
};
>>>>>>>
return this._rectangleQuery(this._shapeRectangleCallback, aabb, store);
}
<<<<<<<
return this._rectangleQuery(this._bodyRectangleCallback, point, store);
}
=======
return this._rectangleQuery(this._bodyRectangleCallback, aabb, store);
};
>>>>>>>
return this._rectangleQuery(this._bodyRectangleCallback, aabb, store);
} |
<<<<<<<
=======
>>>>>>>
<<<<<<<
self.config = {...self.config || {}, ...fs.readJsonSync(configFilePath)};// _.extend(self.config || {}, );
=======
self.config = {...self.config || {}, ... fs.readJsonSync(configFilePath)};
>>>>>>>
self.config = {...self.config || {}, ... fs.readJsonSync(configFilePath)}; |
<<<<<<<
},
/**
* Message indicating that the data set has been renamed successfully.
* @type {IMessageDefinition}
*/
dataSetRenamedSuccessfully: {
message: "Data set renamed successfully."
}
=======
},
/**
* Message indicating that the data set was recalled successfully.
* @type {IMessageDefinition}
*/
datasetMigratedSuccessfully: {
message: "Data set migrated successfully.",
},
>>>>>>>
},
/**
* Message indicating that the data set has been renamed successfully.
* @type {IMessageDefinition}
*/
dataSetRenamedSuccessfully: {
message: "Data set renamed successfully.",
},
/**
* Message indicating that the data set was recalled successfully.
* @type {IMessageDefinition}
*/
datasetMigratedSuccessfully: {
message: "Data set migrated successfully.",
}, |
<<<<<<<
import EspritGauge from './Esprit'
=======
import FeatherGauge from './FeatherGauge'
import OGCDDowntime from './OCDDowntime'
>>>>>>>
import EspritGauge from './Esprit'
import FeatherGauge from './FeatherGauge'
import OGCDDowntime from './OCDDowntime'
<<<<<<<
EspritGauge,
=======
FeatherGauge,
OGCDDowntime,
>>>>>>>
EspritGauge,
FeatherGauge,
OGCDDowntime, |
<<<<<<<
import FeatherGauge from './FeatherGauge'
=======
import OGCDDowntime from './OCDDowntime'
>>>>>>>
import FeatherGauge from './FeatherGauge'
import OGCDDowntime from './OCDDowntime'
<<<<<<<
FeatherGauge,
=======
OGCDDowntime,
>>>>>>>
FeatherGauge,
OGCDDowntime, |
<<<<<<<
import { TestProperties } from "../../../../../../../__tests__/__src__/properties/TestProperties";
import { ITestSystemSchema } from "../../../../../../../__tests__/__src__/properties/ITestSystemSchema";
import { Get, ZosFilesConstants } from "../../../../../index";
=======
import { ITestPropertiesSchema } from "../../../../../../../__tests__/__src__/properties/ITestPropertiesSchema";
import { ZosFilesConstants } from "../../../../../index";
>>>>>>>
import { ITestPropertiesSchema } from "../../../../../../../__tests__/__src__/properties/ITestPropertiesSchema";
import { Get, ZosFilesConstants } from "../../../../../index"; |
<<<<<<<
'ngDropdowns', 'ngLodash', 'angularCharts', 'ngClipboard', 'uuid4', 'angularFileUpload', 'ui.gravatar']);
=======
'ngDropdowns', 'ngLodash', 'angularCharts', 'uuid4', 'angularFileUpload']);
>>>>>>>
'ngDropdowns', 'ngLodash', 'angularCharts', 'uuid4', 'angularFileUpload', 'ui.gravatar']);
<<<<<<<
initModule.config(['$routeProvider', 'ngClipProvider', ($routeProvider: che.route.IRouteProvider, ngClipProvider: any) => {
=======
initModule.config(['$routeProvider', ($routeProvider) => {
>>>>>>>
initModule.config(['$routeProvider', ($routeProvider: che.route.IRouteProvider) => {
<<<<<<<
// add .swf path location using ngClipProvider
const ngClipProviderPath = DEV ? 'bower_components/zeroclipboard/dist/ZeroClipboard.swf' : 'assets/zeroclipboard/ZeroClipboard.swf';
ngClipProvider.setPath(ngClipProviderPath);
=======
>>>>>>> |
<<<<<<<
const textContainer = options.selection.append("g").classed("text-container", true);
if (this._addTitleElement) {
textContainer.append("title").text(text);
}
const normalizedText = StringMethods.combineWhitespace(text);
const textArea = textContainer.append("g").classed("text-area", true);
=======
// compute shear parameters
const shearDegrees = (options.textShear || 0);
const shearRadians = shearDegrees * Math.PI / 180;
const lineHeight = this._measurer.measure().height;
const shearShift = lineHeight * Math.tan(shearRadians);
// When we apply text shear, the primary axis grows and the secondary axis
// shrinks, due to trigonometry. The text shear feature uses the normal
// wrapping logic with a subsituted bounding box of the corrected size
// (computed below). When rendering the wrapped lines, we rotate the text
// container by the text rotation angle AND the shear angle then carefully
// offset each one so that they are still aligned to the primary alignment
// option.
const shearCorrectedPrimaryDimension = primaryDimension / Math.cos(shearRadians) - Math.abs(shearShift);
const shearCorrectedSecondaryDimension = secondaryDimension * Math.cos(shearRadians);
// normalize and wrap text
const normalizedText = Utils.StringMethods.combineWhitespace(text);
>>>>>>>
// compute shear parameters
const shearDegrees = (options.textShear || 0);
const shearRadians = shearDegrees * Math.PI / 180;
const lineHeight = this._measurer.measure().height;
const shearShift = lineHeight * Math.tan(shearRadians);
// When we apply text shear, the primary axis grows and the secondary axis
// shrinks, due to trigonometry. The text shear feature uses the normal
// wrapping logic with a subsituted bounding box of the corrected size
// (computed below). When rendering the wrapped lines, we rotate the text
// container by the text rotation angle AND the shear angle then carefully
// offset each one so that they are still aligned to the primary alignment
// option.
const shearCorrectedPrimaryDimension = primaryDimension / Math.cos(shearRadians) - Math.abs(shearShift);
const shearCorrectedSecondaryDimension = secondaryDimension * Math.cos(shearRadians);
// normalize and wrap text
const normalizedText = StringMethods.combineWhitespace(text);
<<<<<<<
this._wrapper.wrap(
normalizedText,
this._measurer,
primaryDimension,
secondaryDimension,
).wrappedText : normalizedText;
=======
this._wrapper.wrap(
normalizedText,
this._measurer,
shearCorrectedPrimaryDimension,
shearCorrectedSecondaryDimension,
).wrappedText : normalizedText;
const lines = wrappedText.split("\n");
>>>>>>>
this._wrapper.wrap(
normalizedText,
this._measurer,
shearCorrectedPrimaryDimension,
shearCorrectedSecondaryDimension,
).wrappedText : normalizedText;
const lines = wrappedText.split("\n");
<<<<<<<
let translate = [0, 0];
=======
// correct the intial x/y offset of the text container accounting shear and alignment
const shearCorrectedXOffset = Writer.XOffsetFactor[options.xAlign] *
shearCorrectedPrimaryDimension * Math.sin(shearRadians);
const shearCorrectedYOffset = Writer.YOffsetFactor[options.yAlign] *
(shearCorrectedSecondaryDimension - (lines.length) * lineHeight);
const shearCorrection = shearCorrectedXOffset - shearCorrectedYOffset;
// build and apply transform
const xForm = d3.transform("");
xForm.rotate = options.textRotation + shearDegrees;
>>>>>>>
// correct the intial x/y offset of the text container accounting shear and alignment
const shearCorrectedXOffset = Writer.XOffsetFactor[options.xAlign] *
shearCorrectedPrimaryDimension * Math.sin(shearRadians);
const shearCorrectedYOffset = Writer.YOffsetFactor[options.yAlign] *
(shearCorrectedSecondaryDimension - (lines.length) * lineHeight);
const shearCorrection = shearCorrectedXOffset - shearCorrectedYOffset;
// build and apply transform
let translate = [0, 0];
let rotate = options.textRotation + shearDegree;
<<<<<<<
translate = [width, 0];
=======
xForm.translate = [width + shearCorrection, 0];
>>>>>>>
translate = [width + shearCorrection, 0];
<<<<<<<
translate = [0, height];
=======
xForm.translate = [-shearCorrection, height];
>>>>>>>
translate = [-shearCorrection, height];
<<<<<<<
translate = [width, height];
=======
xForm.translate = [width, height + shearCorrection];
>>>>>>>
translate = [width, height + shearCorrection];
<<<<<<<
textArea.attr("transform", `translate(${translate[0]}, ${translate[1]}) rotate(${options.textRotation})`);
this.addClipPath(textContainer);
=======
textArea.attr("transform", xForm.toString());
// // DEBUG
// textArea.append("rect").attr({
// x: Math.max(0, shearShift),
// y: 0,
// width: shearCorrectedPrimaryDimension,
// height: shearCorrectedSecondaryDimension,
// fill: "none",
// stroke: "blue"
// });
// TODO This has never taken into account the transform at all, so it's
// certainly in the wrong place. Why do we need it?
this.addClipPath(textContainer);
>>>>>>>
textArea.attr("transform", `translate(${translate[0]}, ${translate[1]}) rotate(${rotate})`);
// // DEBUG
// textArea.append("rect").attr({
// x: Math.max(0, shearShift),
// y: 0,
// width: shearCorrectedPrimaryDimension,
// height: shearCorrectedSecondaryDimension,
// fill: "none",
// stroke: "blue"
// });
// TODO This has never taken into account the transform at all, so it's
// certainly in the wrong place. Why do we need it?
this.addClipPath(textContainer);
<<<<<<<
private writeLine(line: string, g: d3Selection<any>, width: number, xAlign: string, yOffset: number) {
=======
private writeLine(
line: string, g: d3.Selection<any>, width: number,
xAlign: string, xOffset: number, yOffset: number) {
>>>>>>>
private writeLine(
line: string, g: d3Selection<any>, width: number,
xAlign: string, xOffset: number, yOffset: number) {
<<<<<<<
private writeText(
text: string,
writingArea: d3Selection<any>,
width: number,
height: number,
xAlign: string,
yAlign: string) {
const lines = text.split("\n");
=======
private writeLines(
lines: string[],
writingArea: d3.Selection<any>,
width: number,
shearShift: number,
xAlign: string) {
>>>>>>>
private writeLines(
lines: string[],
writingArea: d3Selection<any>,
width: number,
shearShift: number,
xAlign: string) {
<<<<<<<
private addClipPath(selection: d3Selection<any>) {
=======
private addClipPath(selection: d3.Selection<any>) {
>>>>>>>
private addClipPath(selection: d3Selection<any>) { |
<<<<<<<
import { checkersGameDef } from './checkers';
=======
import { reversiGameDef } from './reversi';
import { cornerusGameDef } from './cornerus';
>>>>>>>
import { checkersGameDef } from './checkers';
import { reversiGameDef } from './reversi';
import { cornerusGameDef } from './cornerus';
<<<<<<<
checkers: checkersGameDef,
=======
reversi: reversiGameDef,
>>>>>>>
checkers: checkersGameDef,
reversi: reversiGameDef,
<<<<<<<
GAMES_MAP.checkers,
=======
GAMES_MAP.cornerus,
GAMES_MAP.seabattle,
>>>>>>>
GAMES_MAP.checkers,
GAMES_MAP.cornerus,
GAMES_MAP.seabattle, |
<<<<<<<
mancala: mancalaGameDef,
=======
zooparade: zooParadeGameDef,
>>>>>>>
mancala: mancalaGameDef,
zooparade: zooParadeGameDef,
<<<<<<<
GAMES_MAP.mancala,
=======
GAMES_MAP.zooparade,
>>>>>>>
GAMES_MAP.mancala,
GAMES_MAP.zooparade, |
<<<<<<<
import { rotaGameDef } from './rota';
=======
import { secretcodesGameDef } from './secretcodes';
import { hangmanGameDef } from './hangman';
>>>>>>>
import { rotaGameDef } from './rota';
import { secretcodesGameDef } from './secretcodes';
import { hangmanGameDef } from './hangman';
<<<<<<<
rota: rotaGameDef,
=======
secretcodes: secretcodesGameDef,
hangman: hangmanGameDef,
>>>>>>>
rota: rotaGameDef,
secretcodes: secretcodesGameDef,
hangman: hangmanGameDef, |
<<<<<<<
import { Ctx } from 'boardgame.io';
=======
import { ActivePlayers, IGameArgs, IGameCtx } from 'boardgame.io/core';
>>>>>>>
import { ActivePlayers, IGameArgs, IGameCtx } from 'boardgame.io/core';
import { Ctx } from 'boardgame.io';
<<<<<<<
const onBegin = {
phases: {
[Phases.lobby]: (G: IG, ctx: Ctx) => {
if (ctx.numPlayers === 2) {
G.teams[0].playersID = ['0'];
G.teams[0].spymasterID = '0';
G.teams[1].playersID = ['1'];
G.teams[1].spymasterID = '1';
}
},
[Phases.play]: (G: IG, ctx: Ctx) => {
const cards = ctx.random
.Shuffle(words)
.slice(0, 25)
.map((word) => makeCard(word));
const startingTeamIndex = ctx.random.Die(2) % 2;
const startingTeam = G.teams[startingTeamIndex];
startingTeam.start = true;
const key = ctx.random.Shuffle(cards).slice(0, 18) as Card[];
key.map((card, index) => {
if (index === 0) card.color = CardColor.assassin;
else if (index <= 8) card.color = CardColor.blue;
else if (index <= 16) card.color = CardColor.red;
else card.color = startingTeam ? CardColor.red : CardColor.blue;
});
G.cards = cards;
ctx.events.endTurn({
next: (function () {
return startingTeam.spymasterID;
})(),
});
},
},
turns: {
[Phases.play]: (G: IG, ctx: Ctx) => {
ctx.events.setStage(Stages.giveClue);
},
},
};
const GameConfig = {
=======
const GameConfig: IGameArgs = {
>>>>>>>
const GameConfig: IGameArgs = {
<<<<<<<
first: (G: IG): number => parseInt(G.teams.find((team) => team.start).spymasterID),
next: (_, ctx: Ctx) => (ctx.playOrderPos + 1) % 2,
playOrder: (G: IG): string[] => G.teams.map((team: Team) => team.spymasterID),
=======
first: () => 0,
next: () => 0,
playOrder: (G: IG, ctx: IGameCtx): string[] => getActivePlayersWithoutSpymaster(getCurrentTeam(G), ctx),
>>>>>>>
first: () => 0,
next: () => 0,
playOrder: (G: IG, ctx: Ctx): string[] => getActivePlayersWithoutSpymaster(getCurrentTeam(G), ctx), |
<<<<<<<
import { HMigrateDefinition } from "./hMigrate/HMigrate.definintion";
=======
import { CopyDefinition } from "./copy/Copy.definition";
>>>>>>>
import { HMigrateDefinition } from "./hMigrate/HMigrate.definintion";
import { CopyDefinition } from "./copy/Copy.definition"; |
<<<<<<<
import {DtInputModule} from '@dynatrace/angular-components/input';
=======
import { ChartUI } from './chart/chart-ui';
>>>>>>>
import {DtInputModule} from '@dynatrace/angular-components/input';
import { ChartUI } from './chart/chart-ui'; |
<<<<<<<
import {ButtonGroupUi} from "../button-group/button-group-ui";
=======
import { ExpandableSectionUi } from '../expandable-section/expandable-section-ui';
import {ExpandablePanelUi} from '../expandable-panel/expandable-panel-ui';
>>>>>>>
import {ButtonGroupUi} from "../button-group/button-group-ui";
import { ExpandableSectionUi } from '../expandable-section/expandable-section-ui';
import {ExpandablePanelUi} from '../expandable-panel/expandable-panel-ui';
<<<<<<<
{ path: 'button-group', component: ButtonGroupUi },
=======
{ path: 'expandable-panel', component: ExpandablePanelUi },
{ path: 'expandable-section', component: ExpandableSectionUi },
>>>>>>>
{ path: 'button-group', component: ButtonGroupUi },
{ path: 'expandable-panel', component: ExpandablePanelUi },
{ path: 'expandable-section', component: ExpandableSectionUi }, |
<<<<<<<
DtIconModule,
=======
// DtIconModule,
DtRadioModule,
>>>>>>>
DtIconModule,
DtRadioModule,
<<<<<<<
DtIconModule.forRoot({svgIconLocation: '/lib/assets/icons/{{name}}.svg'}),
=======
DtRadioModule,
// TODO @thomaspink: Add again if universal supports XHR.
// Issue: ***REMOVED***/***REMOVED***
// DtIconModule.forRoot({svgIconLocation: '/lib/assets/icons/{{name}}.svg'}),
>>>>>>>
DtIconModule.forRoot({svgIconLocation: '/lib/assets/icons/{{name}}.svg'}),
DtRadioModule, |
<<<<<<<
import { DocsAlertModule } from './components/alert/docs-alert.module';
=======
import { DocsIconModule } from './components/icon/docs-icon.module';
>>>>>>>
import { DocsAlertModule } from './components/alert/docs-alert.module';
import { DocsIconModule } from './components/icon/docs-icon.module'; |
<<<<<<<
export * from './progress-circle/index';
export * from './switch/index';
=======
export * from './progress-circle/index';
export * from './breadcrumbs/index';
>>>>>>>
export * from './progress-circle/index';
export * from './switch/index';
export * from './breadcrumbs/index'; |
<<<<<<<
import { ZosFilesAttributes, TransferMode } from "../../utils/ZosFilesAttributes";
import { Utilities, Tag } from "../utilities";
=======
import { Readable } from "stream";
>>>>>>>
import { ZosFilesAttributes, TransferMode } from "../../utils/ZosFilesAttributes";
import { Utilities, Tag } from "../utilities";
import { Readable } from "stream";
<<<<<<<
binary: boolean = false,
localEncoding?: string): Promise<IZosFilesResponse> {
=======
binary: boolean = false,
task?: ITaskWithStatus): Promise<IZosFilesResponse> {
>>>>>>>
binary: boolean = false,
localEncoding?: string,
task?: ITaskWithStatus): Promise<IZosFilesResponse> {
<<<<<<<
payload = fs.readFileSync(inputFile);
await this.bufferToUSSFile(session, ussname, payload, binary, localEncoding);
=======
const uploadStream = IO.createReadStream(inputFile);
await this.streamToUSSFile(session, ussname, uploadStream, binary, task);
>>>>>>>
const uploadStream = IO.createReadStream(inputFile);
await this.streamToUSSFile(session, ussname, uploadStream, binary, localEncoding, task);
<<<<<<<
=======
/**
* Check if USS directory exists
* @param {AbstractSession} session - z/OS connection info
* @param {string} ussname - the name of uss folder
* @return {Promise<boolean>}
*/
public static async isDirectoryExist(session: AbstractSession, ussname: string): Promise<boolean> {
ussname = path.posix.normalize(ussname);
ussname = encodeURIComponent(ussname);
const parameters: string = `${ZosFilesConstants.RES_USS_FILES}?path=${ussname}`;
try {
const response: any = await ZosmfRestClient.getExpectJSON(session, ZosFilesConstants.RESOURCE + parameters);
if (response.items) {
return true;
}
} catch (err) {
if (err) {
return false;
}
}
return false;
}
>>>>>>>
/**
* Check if USS directory exists
* @param {AbstractSession} session - z/OS connection info
* @param {string} ussname - the name of uss folder
* @return {Promise<boolean>}
*/
public static async isDirectoryExist(session: AbstractSession, ussname: string): Promise<boolean> {
ussname = path.posix.normalize(ussname);
ussname = encodeURIComponent(ussname);
const parameters: string = `${ZosFilesConstants.RES_USS_FILES}?path=${ussname}`;
try {
const response: any = await ZosmfRestClient.getExpectJSON(session, ZosFilesConstants.RESOURCE + parameters);
if (response.items) {
return true;
}
} catch (err) {
if (err) {
return false;
}
}
return false;
}
<<<<<<<
const tempUssname = path.posix.join(ussname, dir.dirName);
const isDirectoryExists = await this.isDirectoryExist(session, tempUssname);
if(!isDirectoryExists) {
return Create.uss(session, tempUssname, "directory");
}
=======
const tempUssname = path.posix.join(ussname, dir.dirName);
const isDirectoryExists = await this.isDirectoryExist(session, tempUssname);
if (!isDirectoryExists) {
return Create.uss(session, tempUssname, "directory");
}
>>>>>>>
const tempUssname = path.posix.join(ussname, dir.dirName);
const isDirectoryExists = await this.isDirectoryExist(session, tempUssname);
if (!isDirectoryExists) {
return Create.uss(session, tempUssname, "directory");
} |
<<<<<<<
{name: 'Expandable panel', route: '/expandable-panel'},
{name: 'Expandable section', route: '/expandable-section'},
=======
{name: 'Input', route: '/input'},
>>>>>>>
{name: 'Expandable panel', route: '/expandable-panel'},
{name: 'Expandable section', route: '/expandable-section'},
{name: 'Input', route: '/input'}, |
<<<<<<<
import { DocsKeyValueListModule } from './components/key-value-list/docs-key-value-list.module';
=======
import { FormsModule } from '@angular/forms';
import {DtThemingModule} from '@dynatrace/angular-components';
>>>>>>>
import { DocsKeyValueListModule } from './components/key-value-list/docs-key-value-list.module';
import { FormsModule } from '@angular/forms';
import {DtThemingModule} from '@dynatrace/angular-components';
<<<<<<<
DocsKeyValueListModule,
=======
DtThemingModule,
>>>>>>>
DocsKeyValueListModule,
DtThemingModule, |
<<<<<<<
import { ProgressBarUI } from './progress-bar/progress-bar-ui';
=======
import { ChartUI } from './chart/chart-ui';
>>>>>>>
import { ChartUI } from './chart/chart-ui';
import { ProgressBarUI } from './progress-bar/progress-bar-ui';
<<<<<<<
DtProgressBarModule,
=======
DtChartModule,
>>>>>>>
DtChartModule,
DtProgressBarModule,
<<<<<<<
ProgressBarUI,
=======
ChartUI,
>>>>>>>
ChartUI,
ProgressBarUI, |
<<<<<<<
import { DocsShowMoreModule } from './components/show-more/docs-show-more.module';
=======
import { FormsModule } from '@angular/forms';
import {DtThemingModule} from '@dynatrace/angular-components';
>>>>>>>
import { DocsShowMoreModule } from './components/show-more/docs-show-more.module';
import { FormsModule } from '@angular/forms';
import {DtThemingModule} from '@dynatrace/angular-components';
<<<<<<<
DocsShowMoreModule,
=======
DtThemingModule,
>>>>>>>
DocsShowMoreModule,
DtThemingModule, |
<<<<<<<
DtIconModule,
DtShowMoreModule,
=======
>>>>>>>
DtShowMoreModule, |
<<<<<<<
DtIconModule,
=======
DtRadioModule,
>>>>>>>
DtIconModule,
DtRadioModule,
<<<<<<<
import { HttpClientModule } from '@angular/common/http';
=======
import { RadioUI } from './radio/radio.ui';
>>>>>>>
import { RadioUI } from './radio/radio.ui';
import { HttpClientModule } from '@angular/common/http'; |
<<<<<<<
{name: 'Alert', route: '/alert-component'},
{name: 'Breadcrumbs', route: '/breadcrumbs'},
{name: 'Button', route: '/button'},
{name: 'Button Group', route: '/button-group'},
{name: 'Card', route: '/card'},
{name: 'Chart', route: '/chart'},
{name: 'Checkbox', route: '/checkbox'},
{name: 'Context dialog', route: '/context-dialog'},
{name: 'Copy To Clipboard', route: '/copy-to-clipboard'},
{name: 'Expandable panel', route: '/expandable-panel'},
{name: 'Expandable section', route: '/expandable-section'},
{name: 'Inline Editor', route: '/inline-editor'},
{name: 'Form field', route: '/form-field'},
{name: 'Icon', route: '/icon'},
{name: 'Input', route: '/input'},
{name: 'Key-Value list', route: '/key-value-list'},
{name: 'Links', route: '/links'},
{name: 'Loading distractor', route: '/loading-distractor'},
{name: 'Pagination', route: '/pagination'},
{name: 'Progress circle', route: '/progress-circle'},
{name: 'Radio', route: '/radio'},
{name: 'Show more', route: '/show-more'},
{name: 'Switch', route: '/switch'},
{name: 'Table', route: '/table'},
{name: 'Tag', route: '/tag'},
{name: 'Tile', route: '/tile'},
=======
{ name: 'Alert', route: '/alert' },
{ name: 'Breadcrumbs', route: '/breadcrumbs' },
{ name: 'Button', route: '/button' },
{ name: 'Button Group', route: '/button-group' },
{ name: 'Card', route: '/card' },
{ name: 'Chart', route: '/chart' },
{ name: 'Checkbox', route: '/checkbox' },
{ name: 'Context dialog', route: '/context-dialog' },
{ name: 'Expandable panel', route: '/expandable-panel' },
{ name: 'Expandable section', route: '/expandable-section' },
{ name: 'Inline Editor', route: '/inline-editor' },
{ name: 'Form field', route: '/form-field' },
{ name: 'Icon', route: '/icon' },
{ name: 'Input', route: '/input' },
{ name: 'Key value list', route: '/key-value-list' },
{ name: 'Link', route: '/style#link' },
{ name: 'Loading distractor', route: '/loading-distractor' },
{ name: 'Pagination', route: '/pagination' },
{ name: 'Progress circle', route: '/progress-circle' },
{ name: 'Radio', route: '/radio' },
{ name: 'Show more', route: '/show-more' },
{ name: 'Styles', route: '/style' },
{ name: 'Switch', route: '/switch' },
{ name: 'Table', route: '/table' },
{ name: 'Tag', route: '/tag' },
{ name: 'Tile', route: '/tile' },
>>>>>>>
{ name: 'Alert', route: '/alert' },
{ name: 'Breadcrumbs', route: '/breadcrumbs' },
{ name: 'Button', route: '/button' },
{ name: 'Button Group', route: '/button-group' },
{ name: 'Card', route: '/card' },
{ name: 'Chart', route: '/chart' },
{ name: 'Checkbox', route: '/checkbox' },
{ name: 'Context dialog', route: '/context-dialog' },
{ name: 'Copy To Clipboard', route: '/copy-to-clipboard'},
{ name: 'Expandable panel', route: '/expandable-panel' },
{ name: 'Expandable section', route: '/expandable-section' },
{ name: 'Inline Editor', route: '/inline-editor' },
{ name: 'Form field', route: '/form-field' },
{ name: 'Icon', route: '/icon' },
{ name: 'Input', route: '/input' },
{ name: 'Key value list', route: '/key-value-list' },
{ name: 'Link', route: '/style#link' },
{ name: 'Loading distractor', route: '/loading-distractor' },
{ name: 'Pagination', route: '/pagination' },
{ name: 'Progress circle', route: '/progress-circle' },
{ name: 'Radio', route: '/radio' },
{ name: 'Show more', route: '/show-more' },
{ name: 'Styles', route: '/style' },
{ name: 'Switch', route: '/switch' },
{ name: 'Table', route: '/table' },
{ name: 'Tag', route: '/tag' },
{ name: 'Tile', route: '/tile' }, |
<<<<<<<
{name: 'Alert', route: '/alert-component'},
{name: 'Breadcrumbs', route: '/breadcrumbs'},
{name: 'Button', route: '/button'},
{name: 'Button Group', route: '/button-group'},
{name: 'Card', route: '/card'},
{name: 'Chart', route: '/chart'},
{name: 'Checkbox', route: '/checkbox'},
{name: 'Context dialog', route: '/context-dialog'},
{name: 'Expandable panel', route: '/expandable-panel'},
{name: 'Expandable section', route: '/expandable-section'},
{name: 'Inline Editor', route: '/inline-editor'},
{name: 'Form field', route: '/form-field'},
{name: 'Icon', route: '/icon'},
{name: 'Input', route: '/input'},
{name: 'Key-Value list', route: '/key-value-list'},
{name: 'Links', route: '/links'},
{name: 'Loading distractor', route: '/loading-distractor'},
{name: 'Pagination', route: '/pagination'},
{name: 'Progress circle', route: '/progress-circle'},
{name: 'Progress bar', route: '/progress-bar'},
{name: 'Radio', route: '/radio'},
{name: 'Show more', route: '/show-more'},
{name: 'Switch', route: '/switch'},
{name: 'Table', route: '/table'},
{name: 'Tag', route: '/tag'},
{name: 'Tile', route: '/tile'},
=======
{ name: 'Alert', route: '/alert' },
{ name: 'Breadcrumbs', route: '/breadcrumbs' },
{ name: 'Button', route: '/button' },
{ name: 'Button Group', route: '/button-group' },
{ name: 'Card', route: '/card' },
{ name: 'Chart', route: '/chart' },
{ name: 'Checkbox', route: '/checkbox' },
{ name: 'Context dialog', route: '/context-dialog' },
{ name: 'Expandable panel', route: '/expandable-panel' },
{ name: 'Expandable section', route: '/expandable-section' },
{ name: 'Inline Editor', route: '/inline-editor' },
{ name: 'Form field', route: '/form-field' },
{ name: 'Icon', route: '/icon' },
{ name: 'Input', route: '/input' },
{ name: 'Key value list', route: '/key-value-list' },
{ name: 'Link', route: '/style#link' },
{ name: 'Loading distractor', route: '/loading-distractor' },
{ name: 'Pagination', route: '/pagination' },
{ name: 'Progress circle', route: '/progress-circle' },
{ name: 'Radio', route: '/radio' },
{ name: 'Show more', route: '/show-more' },
{ name: 'Styles', route: '/style' },
{ name: 'Switch', route: '/switch' },
{ name: 'Table', route: '/table' },
{ name: 'Tag', route: '/tag' },
{ name: 'Tile', route: '/tile' },
>>>>>>>
{ name: 'Alert', route: '/alert' },
{name: 'Breadcrumbs', route: '/breadcrumbs'},
{name: 'Button', route: '/button'},
{name: 'Button Group', route: '/button-group'},
{name: 'Card', route: '/card'},
{name: 'Chart', route: '/chart'},
{name: 'Checkbox', route: '/checkbox'},
{name: 'Context dialog', route: '/context-dialog'},
{name: 'Expandable panel', route: '/expandable-panel'},
{name: 'Expandable section', route: '/expandable-section'},
{name: 'Inline Editor', route: '/inline-editor'},
{name: 'Form field', route: '/form-field'},
{name: 'Icon', route: '/icon'},
{name: 'Input', route: '/input'},
{ name: 'Key value list', route: '/key-value-list' },
{ name: 'Link', route: '/style#link' },
{name: 'Loading distractor', route: '/loading-distractor'},
{name: 'Pagination', route: '/pagination'},
{name: 'Progress circle', route: '/progress-circle'},
{name: 'Progress bar', route: '/progress-bar'},
{name: 'Radio', route: '/radio'},
{name: 'Show more', route: '/show-more'},
{ name: 'Styles', route: '/style' },
{name: 'Switch', route: '/switch'},
{name: 'Table', route: '/table'},
{name: 'Tag', route: '/tag'},
{name: 'Tile', route: '/tile'}, |
<<<<<<<
{name: 'ButtonGroup', route: '/button-group'},
=======
{name: 'Expandable panel', route: '/expandable-panel'},
{name: 'Expandable section', route: '/expandable-section'},
>>>>>>>
{name: 'ButtonGroup', route: '/button-group'},
{name: 'Expandable panel', route: '/expandable-panel'},
{name: 'Expandable section', route: '/expandable-section'}, |
<<<<<<<
import { DocsKeyValueListComponent } from './components/key-value-list/docs-key-value-list.component';
=======
import { DocsPaginationComponent } from './components/pagination/docs-pagination.component';
import { DocsRadioComponent } from './components/radio/docs-radio.component';
import { DocsShowMoreComponent } from './components/show-more/docs-show-more.component';
import { DocsCheckboxComponent } from './components/checkbox/docs-checkbox.component';
import { DocsProgressCircleComponent } from './components/progress-circle/docs-progress-circle.component';
>>>>>>>
import { DocsKeyValueListComponent } from './components/key-value-list/docs-key-value-list.component';
import { DocsPaginationComponent } from './components/pagination/docs-pagination.component';
import { DocsRadioComponent } from './components/radio/docs-radio.component';
import { DocsShowMoreComponent } from './components/show-more/docs-show-more.component';
import { DocsCheckboxComponent } from './components/checkbox/docs-checkbox.component';
import { DocsProgressCircleComponent } from './components/progress-circle/docs-progress-circle.component';
<<<<<<<
{ path: 'key-value-list', component: DocsKeyValueListComponent },
=======
{ path: 'pagination', component: DocsPaginationComponent },
{ path: 'radio', component: DocsRadioComponent },
{ path: 'show-more', component: DocsShowMoreComponent },
{ path: 'checkbox', component: DocsCheckboxComponent },
{ path: 'progress-circle', component: DocsProgressCircleComponent },
>>>>>>>
{ path: 'key-value-list', component: DocsKeyValueListComponent },
{ path: 'pagination', component: DocsPaginationComponent },
{ path: 'radio', component: DocsRadioComponent },
{ path: 'show-more', component: DocsShowMoreComponent },
{ path: 'checkbox', component: DocsCheckboxComponent },
{ path: 'progress-circle', component: DocsProgressCircleComponent }, |
<<<<<<<
import * as languageclient from 'vscode-languageclient';
=======
import { createTelemetryReporter, callWithTelemetryAndErrorHandling, IActionContext, AzureUserInput, registerUIExtensionVariables } from 'vscode-azureextensionui';
import * as languageclient from 'vscode-languageclient/node';
>>>>>>>
import * as languageclient from 'vscode-languageclient/node';
<<<<<<<
// If this throws, the telemetry event in activate() will catch & log it
await client.onReady();
//logger.log(`${JSON.stringify(initialSchemaAssociations)}`, 'SendInitialSchemaAssociation');
client.sendNotification(SchemaAssociationNotification.type, initialSchemaAssociations);
// TODO: Should we get rid of these events and handle other events like Ctrl + Space? See when this event gets fired and send updated schema on that event.
client.onRequest(CUSTOM_SCHEMA_REQUEST, (resource: any) => {
//logger.log('Custom schema request. Resource: ' + JSON.stringify(resource), 'CustomSchemaRequest');
// TODO: Can this return the location of the new schema file?
return schemaContributor.requestCustomSchema(resource); // TODO: Have a single instance for the extension but dont return a global from this namespace.
});
// TODO: Can we get rid of this? Never seems to happen.
client.onRequest(CUSTOM_CONTENT_REQUEST, (uri: any) => {
//logger.log('Custom content request.', 'CustomContentRequest');
return schemaContributor.requestCustomSchemaContent(uri);
});
=======
await client.onReady().then(() => {
// Notify the server which schemas to use.
client.sendNotification(SchemaAssociationNotification.type, initialSchemaAssociations);
// Fired whenever the server is about to validate a YAML file (e.g. on content change),
// and allows us to return a custom schema to use for validation.
client.onRequest(CUSTOM_SCHEMA_REQUEST, (resource: string) => {
// TODO: Have a single instance for the extension but dont return a global from this namespace
return schemaContributor.requestCustomSchema(resource);
});
// Fired whenever the server encounters a URI scheme that it doesn't recognize,
// and allows us to use the URI to determine the schema's content.
client.onRequest(CUSTOM_CONTENT_REQUEST, (uri: string) => {
return schemaContributor.requestCustomSchemaContent(uri);
});
}).catch((reason) => {
logger.log(JSON.stringify(reason), 'ClientOnReadyError');
extensionVariables.reporter.sendTelemetryEvent('extension.languageserver.onReadyError', { 'reason': JSON.stringify(reason) });
});
>>>>>>>
// If this throws, the telemetry event in activate() will catch & log it
await client.onReady();
// Notify the server which schemas to use.
client.sendNotification(SchemaAssociationNotification.type, initialSchemaAssociations);
// Fired whenever the server is about to validate a YAML file (e.g. on content change),
// and allows us to return a custom schema to use for validation.
client.onRequest(CUSTOM_SCHEMA_REQUEST, (resource: string) => {
// TODO: Have a single instance for the extension but dont return a global from this namespace
return schemaContributor.requestCustomSchema(resource);
});
// Fired whenever the server encounters a URI scheme that it doesn't recognize,
// and allows us to use the URI to determine the schema's content.
client.onRequest(CUSTOM_CONTENT_REQUEST, (uri: string) => {
return schemaContributor.requestCustomSchemaContent(uri);
}); |
<<<<<<<
export { Header } from './header'
export { CardWrapper } from './cardWrapper'
=======
export { JolocomButton } from './jolocomButton'
>>>>>>>
export { CardWrapper } from './cardWrapper'
export { JolocomButton } from './jolocomButton' |
<<<<<<<
import { BackendMiddleware } from 'src/backendMiddleware'
=======
import { NavigationActions } from 'react-navigation'
import { KeyChain } from 'src/lib/keychain'
// TODO MOVE
type Dispatch = (action: AnyAction) => void;
>>>>>>>
import { BackendMiddleware } from 'src/backendMiddleware'
import { NavigationActions } from 'react-navigation'
import { KeyChain } from 'src/lib/keychain'
// TODO MOVE
type Dispatch = (action: AnyAction) => void; |
<<<<<<<
} from '../../lib/util'
=======
} from 'src/lib/util'
import { cancelReceiving } from '../sso'
>>>>>>>
} from 'src/lib/util' |
<<<<<<<
import { loading } from 'src/reducers/account/loading'
import { appState } from 'src/reducers/account/appState'
=======
>>>>>>>
import { loading } from 'src/reducers/account/loading'
import { appState } from 'src/reducers/account/appState'
<<<<<<<
export interface AppState {
isLocalAuthSet: boolean
isLocalAuthVisible: boolean
isPopup: boolean
isAppLocked: boolean
}
export type LoadingState = boolean
=======
>>>>>>>
export interface AppState {
isLocalAuthSet: boolean
isLocalAuthVisible: boolean
isPopup: boolean
isAppLocked: boolean
}
export type LoadingState = boolean
<<<<<<<
loading: LoadingState
appState: AppState
=======
>>>>>>>
loading: LoadingState
appState: AppState
<<<<<<<
loading,
appState,
=======
>>>>>>>
loading,
appState, |
<<<<<<<
},
/**
* Message indicating that the data set was recalled successfully.
* @type {IMessageDefinition}
*/
datasetRecalledSuccessfully: {
message: "Data set recalled successfully.",
},
};
=======
},
/**
* Message indicating that the data set has been renamed successfully.
* @type {IMessageDefinition}
*/
dataSetRenamedSuccessfully: {
message: "Data set renamed successfully.",
},
/**
* Message indicating that the data set was recalled successfully.
* @type {IMessageDefinition}
*/
datasetMigratedSuccessfully: {
message: "Data set migrated successfully.",
},
/**
* Message indicating that the data set was copied successfully
* @type {IMessageDefinition}
*/
datasetCopiedSuccessfully: {
message: "Data set copied successfully."
},
};
>>>>>>>
},
/**
* Message indicating that the data set was recalled successfully.
* @type {IMessageDefinition}
*/
datasetRecalledSuccessfully: {
message: "Data set recalled successfully.",
},
/**
* Message indicating that the data set has been renamed successfully.
* @type {IMessageDefinition}
*/
dataSetRenamedSuccessfully: {
message: "Data set renamed successfully.",
},
/**
* Message indicating that the data set was recalled successfully.
* @type {IMessageDefinition}
*/
datasetMigratedSuccessfully: {
message: "Data set migrated successfully.",
},
/**
* Message indicating that the data set was copied successfully
* @type {IMessageDefinition}
*/
datasetCopiedSuccessfully: {
message: "Data set copied successfully."
},
}; |
<<<<<<<
import { Entropy, RegistrationProgress } from 'src/ui/registration/'
import { JolocomTheme } from 'src/styles/jolocom-theme'
import { Exception } from 'src/ui/generic/'
=======
import { SeedPhrase, RegistrationProgress, Entropy } from 'src/ui/registration/'
import { Exception /*BottomNavBar*/ } from 'src/ui/generic/'
>>>>>>>
import { Entropy, RegistrationProgress } from 'src/ui/registration/'
import { Exception } from 'src/ui/generic/'
<<<<<<<
const bottomTabBarBackground =
Platform.OS === 'android'
? '#fafafa' // FIXME add to theme
: JolocomTheme.primaryColorBlack
=======
>>>>>>> |
<<<<<<<
import { NotificationScheduler } from './ui/notifications/containers/devNotificationScheduler'
import { NotificationFilter } from './lib/notifications'
=======
import { BottomBar } from './ui/navigation/container/bottomBar'
>>>>>>>
import { BottomBar } from './ui/navigation/container/bottomBar'
import { NotificationScheduler } from './ui/notifications/containers/devNotificationScheduler'
import { NotificationFilter } from './lib/notifications'
<<<<<<<
notifications: NotificationFilter.all,
tabBarIcon: IdentityMenuIcon,
=======
tabBarIcon: IdentityIcon,
>>>>>>>
tabBarIcon: IdentityIcon,
notifications: NotificationFilter.all,
<<<<<<<
notifications: NotificationFilter.all,
tabBarIcon: (props: {
tintColor: string
focused: boolean
fillColor?: string
}) => {
props.fillColor = Colors.bottomTabBarBg
return new DocumentsMenuIcon(props)
},
=======
tabBarIcon: DocsIcon,
>>>>>>>
tabBarIcon: DocsIcon,
notifications: NotificationFilter.all,
<<<<<<<
notifications: NotificationFilter.onlyDismissible,
tabBarIcon: RecordsMenuIcon,
=======
tabBarIcon: HistoryIcon,
>>>>>>>
tabBarIcon: HistoryIcon,
notifications: NotificationFilter.onlyDismissible,
<<<<<<<
notifications: NotificationFilter.onlyDismissible,
tabBarIcon: SettingsMenuIcon,
=======
tabBarIcon: SettingsIcon,
>>>>>>>
tabBarIcon: SettingsIcon,
notifications: NotificationFilter.onlyDismissible, |
<<<<<<<
import { PaymentRequest } from 'jolocom-lib/js/interactionTokens/paymentRequest'
import {
InteractionTransportType,
EstablishChannelType,
EstablishChannelRequest,
} from '@jolocom/sdk/js/src/lib/interactionManager/types'
=======
import {
InteractionTransportType,
EstablishChannelType,
EstablishChannelRequest,
} from '@jolocom/sdk/js/src/lib/interactionManager/types'
import { ResolutionType, ResolutionRequest } from '@jolocom/sdk/js/src/lib/interactionManager/resolutionFlow'
>>>>>>>
import {
InteractionTransportType,
EstablishChannelType,
EstablishChannelRequest,
} from '@jolocom/sdk/js/src/lib/interactionManager/types'
import {
ResolutionType,
ResolutionRequest,
} from '@jolocom/sdk/js/src/lib/interactionManager/resolutionFlow'
<<<<<<<
=======
import { ThunkAction } from 'src/store'
import { JolocomSDK } from 'react-native-jolocom'
import { navigatorResetHome } from 'src/actions/navigation'
>>>>>>>
import { ThunkAction } from 'src/store'
import { JolocomSDK } from 'react-native-jolocom'
import { navigatorResetHome } from 'src/actions/navigation' |
<<<<<<<
import { AuthenticationFlowState } from './types'
=======
import { isAuthenticationRequest } from './guards'
>>>>>>>
import { AuthenticationFlowState } from './types'
import { isAuthenticationRequest } from './guards' |
<<<<<<<
import { ThunkAction } from '../../store'
import { entropyToMnemonic } from 'bip39'
=======
import { accountActions } from '..'
const humanTimeout = () => new Promise(resolve => setTimeout(resolve, 1000))
>>>>>>>
import { ThunkAction } from '../../store'
import { entropyToMnemonic } from 'bip39'
const humanTimeout = () => new Promise(resolve => setTimeout(resolve, 1000)) |
<<<<<<<
import {routeList} from '../routeList'
export enum ErrorCode {
Unknown = 'Unknown',
// actions/account/index
WalletInitFailed = 'WalletInit',
SaveClaimFailed = 'SaveClaim',
SaveExternalCredentialFailed = 'SaveExtCred',
// actions/sso/authenticationRequest
AuthenticationRequestFailed = 'AuthRequest',
AuthenticationResponseFailed = 'AuthResponse',
// actions/sso/paymentRequest
PaymentRequestFailed = 'PayRequest',
PaymentResponseFailed = 'PayResponse',
// actions/sso/index
CredentialOfferFailed = 'CredOffer',
CredentialsReceiveFailed = 'CredsReceive',
CredentialRequestFailed = 'CredRequest',
CredentialResponseFailed = 'CredResponse',
ParseJWTFailed = 'ParseJWT',
// actions/registration
RegistrationFailed = 'Registration',
}
// NOTE: these strings are localized, remember to update locale files
const errorMessages: { [key in ErrorCode]: string } = {
[ErrorCode.Unknown]: 'Unknown Error',
[ErrorCode.WalletInitFailed]: 'Unable to initialize wallet',
[ErrorCode.SaveClaimFailed]: 'Could not save claim',
[ErrorCode.SaveExternalCredentialFailed]:
'Could not save external credential',
[ErrorCode.AuthenticationRequestFailed]: 'Authentication request failed',
[ErrorCode.AuthenticationResponseFailed]: 'Authentication response failed',
[ErrorCode.PaymentRequestFailed]: 'Payment request failed',
[ErrorCode.PaymentResponseFailed]: 'Payment response failed',
[ErrorCode.CredentialOfferFailed]: 'Credential offer failed',
[ErrorCode.CredentialsReceiveFailed]: 'Could not receive credentials',
[ErrorCode.CredentialRequestFailed]: 'Credential request failed',
[ErrorCode.CredentialResponseFailed]: 'Credential response failed',
[ErrorCode.ParseJWTFailed]: 'Could not parse JSONWebToken',
[ErrorCode.RegistrationFailed]: 'Registration failed',
}
=======
import { routeList } from '../routeList'
import strings from '../locales/strings'
import ErrorCode from './errorCodes'
>>>>>>>
import { routeList } from '../routeList'
import strings from '../locales/strings'
import ErrorCode from './errorCodes'
export { ErrorCode } |
<<<<<<<
const deviceAuth = {
ENTER_YOUR_PIN: 'Enter your PIN',
FORGOT_YOUR_PIN: 'Forgot your PIN?',
I_WILL_USE_PIN_INSTEAD: 'Use PIN instead',
SKIP: 'Skip',
YOUR_PIN_WAS_SET_UP: 'Your PIN was set up',
SETTINGS: 'Settings',
CANCEL: 'Cancel',
RESET: 'Reset',
CHANGE_PIN: 'Change PIN',
CURRENT_PASSCODE: 'Current passcode',
CREATE_NEW_PASSCODE: 'Create new passcode',
WRONG_PIN: 'Wrong PIN',
PASSWORD_SUCCESSFULLY_CHANGED: 'PIN successfully changed!',
CREATE_PASSCODE: 'Create PIN',
VERIFY_PASSCODE: 'Verify PIN',
IN_ORDER_TO_PROTECT_YOUR_DATA:
'In order to protect your data from other users and maintain confidentiality',
YOU_WONT_BE_ABLE_TO_EASILY_CHECK_IT_AGAIN:
'You won’t be able to easily check it again, so please memorise it',
PINS_DONT_MATCH: "PINs don't match",
ANY_FUTURE_PASSCODE_RESTORE:
'Any future passcode restore is possible only with your secret phrase',
}
=======
const termsOfService = {
SMARTWALLET_INTRODUCING_TERMS_AND_CONDITIONS_AND_PRIVACY_POLICY:
'SmartWallet introducing Terms and Conditions and Privacy Policy',
YOU_CAN_FIND_THE_GERMAN_AND_ENGLISH_VERSION_OF_THE_DOCUMENTS_BELOW:
'You can find the German and English version of the documents below. Please note that the German version is legally binding',
I_UNDERSTAND_AND_ACCEPT_THE_TERMS_OF_SERVICE_AND_PRIVACY_POLICY:
'I understand and accept the Terms of Service and Privacy Policy',
ACCEPT_NEW_TERMS: 'Accept new terms',
}
>>>>>>>
const deviceAuth = {
ENTER_YOUR_PIN: 'Enter your PIN',
FORGOT_YOUR_PIN: 'Forgot your PIN?',
I_WILL_USE_PIN_INSTEAD: 'Use PIN instead',
SKIP: 'Skip',
YOUR_PIN_WAS_SET_UP: 'Your PIN was set up',
SETTINGS: 'Settings',
CANCEL: 'Cancel',
RESET: 'Reset',
CHANGE_PIN: 'Change PIN',
CURRENT_PASSCODE: 'Current passcode',
CREATE_NEW_PASSCODE: 'Create new passcode',
WRONG_PIN: 'Wrong PIN',
PASSWORD_SUCCESSFULLY_CHANGED: 'PIN successfully changed!',
CREATE_PASSCODE: 'Create PIN',
VERIFY_PASSCODE: 'Verify PIN',
IN_ORDER_TO_PROTECT_YOUR_DATA:
'In order to protect your data from other users and maintain confidentiality',
YOU_WONT_BE_ABLE_TO_EASILY_CHECK_IT_AGAIN:
'You won’t be able to easily check it again, so please memorise it',
PINS_DONT_MATCH: "PINs don't match",
ANY_FUTURE_PASSCODE_RESTORE:
'Any future passcode restore is possible only with your secret phrase',
}
const termsOfService = {
SMARTWALLET_INTRODUCING_TERMS_AND_CONDITIONS_AND_PRIVACY_POLICY:
'SmartWallet introducing Terms and Conditions and Privacy Policy',
YOU_CAN_FIND_THE_GERMAN_AND_ENGLISH_VERSION_OF_THE_DOCUMENTS_BELOW:
'You can find the German and English version of the documents below. Please note that the German version is legally binding',
I_UNDERSTAND_AND_ACCEPT_THE_TERMS_OF_SERVICE_AND_PRIVACY_POLICY:
'I understand and accept the Terms of Service and Privacy Policy',
ACCEPT_NEW_TERMS: 'Accept new terms',
}
<<<<<<<
...deviceAuth,
=======
...termsOfService,
>>>>>>>
...deviceAuth,
...termsOfService, |
<<<<<<<
import { Platform, Image } from 'react-native'
import { createElement } from 'react'
import {
createStackNavigator,
createBottomTabNavigator,
NavigationScreenOptions,
NavigationRoute,
NavigationScreenProp
} from 'react-navigation'
import { Claims, Interactions, Records, ClaimDetails } from 'src/ui/home/'
=======
import { Platform } from 'react-native'
import { StackNavigator, TabNavigator } from 'react-navigation'
import { Claims, Records, ClaimDetails } from 'src/ui/home/'
import { Documents, DocumentDetails } from 'src/ui/documents'
>>>>>>>
import { Platform, Image } from 'react-native'
import { createElement } from 'react'
import {
createStackNavigator,
createBottomTabNavigator,
NavigationScreenOptions,
NavigationRoute,
NavigationScreenProp
} from 'react-navigation'
import { Claims, Records, ClaimDetails } from 'src/ui/home/'
import { Documents, DocumentDetails } from 'src/ui/documents'
<<<<<<<
const navOptScreenWCancel = {
headerStyle: {
backgroundColor:
Platform.OS === 'android'
? JolocomTheme.primaryColorBlack
: JolocomTheme.primaryColorGrey,
},
headerBackImage,
...Platform.select({
ios: {
headerBackTitleStyle: {
color: JolocomTheme.primaryColorPurple,
},
headerTintColor: { color: JolocomTheme.primaryColorPurple },
},
}),
}
=======
const headerTitleStyle = {
fontSize: JolocomTheme.headerFontSize,
fontFamily: JolocomTheme.contentFontFamily,
fontWeight: '300',
}
>>>>>>>
const headerTitleStyle = {
fontSize: JolocomTheme.headerFontSize,
fontFamily: JolocomTheme.contentFontFamily,
fontWeight: '300',
}
<<<<<<<
const bottomTabBarBackground =
=======
const navOptScreenWCancel = {
headerStyle: {
backgroundColor: defaultHeaderBackgroundColor,
},
headerTitleStyle: {
color: JolocomTheme.primaryColorWhite
},
headerBackImage,
...Platform.select({
ios: {
headerBackTitleStyle: {
color: JolocomTheme.primaryColorPurple,
}
}
}),
}
const bottomNavBarBackground =
>>>>>>>
const navOptScreenWCancel = {
headerStyle: {
backgroundColor: defaultHeaderBackgroundColor,
},
headerTitleStyle: {
color: JolocomTheme.primaryColorWhite
},
headerBackImage,
...Platform.select({
ios: {
headerBackTitleStyle: {
color: JolocomTheme.primaryColorPurple,
}
}
}),
}
const bottomTabBarBackground =
<<<<<<<
export const BottomTabBarRoutes = {
[routeList.Claims]: {
screen: Claims,
title: 'My identity',
navigationOptions: {
tabBarIcon: IdentityMenuIcon,
}
=======
export const BottomNavRoutes = TabNavigator(
{
[routeList.Claims]: {
screen: Claims,
navigationOptions: () => ({
...commonNavigationOptions,
headerTitle: I18n.t('My identity'),
tabBarIcon: IdentityMenuIcon,
}),
},
[routeList.Documents]: {
screen: Documents,
navigationOptions: () => ({
...commonNavigationOptions,
headerTitle: I18n.t('Documents'),
tabBarIcon: (props: {
tintColor: string
focused: boolean
fillColor?: string
}) => {
props.fillColor = bottomNavBarBackground
return new DocumentsMenuIcon(props)
},
}),
},
[routeList.Records]: {
screen: Records,
navigationOptions: () => ({
...commonNavigationOptions,
headerTitle: I18n.t('Login records'),
tabBarIcon: RecordsMenuIcon,
}),
},
[routeList.Settings]: {
screen: Settings,
navigationOptions: () => ({
...commonNavigationOptions,
headerTitle: I18n.t('Settings'),
tabBarIcon: SettingsMenuIcon,
}),
},
>>>>>>>
export const BottomTabBarRoutes = {
[routeList.Claims]: {
screen: Claims,
title: 'My identity',
navigationOptions: {
tabBarIcon: IdentityMenuIcon,
}
<<<<<<<
[routeList.Exception]: { screen: Exception, navigationOptions: noHeaderNavOpts },
},
{
defaultNavigationOptions: commonNavigationOptions
}
)
=======
[routeList.DocumentDetails]: {
screen: DocumentDetails,
navigationOptions: {
...navOptScreenWCancel,
headerTitleStyle,
},
},
[routeList.Exception]: { screen: Exception, navigationOptions },
})
>>>>>>>
[routeList.DocumentDetails]: {
screen: DocumentDetails,
navigationOptions: {
...navOptScreenWCancel,
headerTitleStyle,
},
},
[routeList.Exception]: { screen: Exception, navigationOptions: noHeaderNavOpts },
}, {
defaultNavigationOptions: commonNavigationOptions
}) |
<<<<<<<
import { Flow } from './flow'
import { Interaction } from './interaction'
import { CredentialOfferFlowState } from './types'
=======
import { isCredentialOfferRequest, isCredentialOfferResponse, isCredentialReceive } from './guards'
type ValidationErrorMap = {
invalidIssuer?: boolean
invalidSubject?: boolean
}
export type OfferWithValidity = SignedCredentialWithMetadata & {
validationErrors: ValidationErrorMap
}
>>>>>>>
import { Flow } from './flow'
import { Interaction } from './interaction'
import { CredentialOfferFlowState } from './types'
import {
isCredentialOfferRequest,
isCredentialOfferResponse,
isCredentialReceive,
} from './guards'
<<<<<<<
// TODO Go back to JSONWebToken<JWTEncodable> and use guard functions when
// casting
public async handleInteractionToken(
token: JWTEncodable,
messageType: InteractionType,
): Promise<any> {
switch (messageType) {
case InteractionType.CredentialOfferRequest:
return this.handleOfferRequest(token as CredentialOfferRequest)
case InteractionType.CredentialOfferResponse:
return this.handleOfferResponse(token as CredentialOfferResponse)
case InteractionType.CredentialsReceive:
return this.handleCredentialReceive(token as CredentialsReceive)
default:
throw new Error('Interaction type not found')
}
}
=======
public async handleInteractionToken(
token: JWTEncodable,
messageType: InteractionType,
): Promise<any> {
// TODO Push once all is good FIX
switch (messageType) {
case InteractionType.CredentialOfferRequest:
if (isCredentialOfferRequest(token))
return this.handleOfferRequest(token)
case InteractionType.CredentialOfferResponse:
if (isCredentialOfferResponse(token))
return this.handleOfferResponse(token)
case InteractionType.CredentialsReceive:
if (isCredentialReceive(token))
return this.handleCredentialReceive(token)
default:
throw new Error('Interaction type not found')
}
}
>>>>>>>
public async handleInteractionToken(
token: JWTEncodable,
messageType: InteractionType,
): Promise<any> {
switch (messageType) {
case InteractionType.CredentialOfferRequest:
if (isCredentialOfferRequest(token))
return this.handleOfferRequest(token)
case InteractionType.CredentialOfferResponse:
if (isCredentialOfferResponse(token))
return this.handleOfferResponse(token)
case InteractionType.CredentialsReceive:
if (isCredentialReceive(token))
return this.handleCredentialReceive(token)
default:
throw new Error('Interaction type not found')
}
} |
<<<<<<<
export const compileAndTransform = (dir: string, file: string): {} => {
=======
type TransformOptions = {
prepack: boolean;
};
const compileAndTransform = (
dir: string,
file: string,
options?: TransformOptions
): {} => {
>>>>>>>
type TransformOptions = {
prepack: boolean;
};
const compileAndTransform = (
dir: string,
file: string,
options?: TransformOptions
): {} => {
<<<<<<<
=======
compileAndTransform('testcases/simple', 'Main.elm', { prepack: true });
compileAndTransform('testcases/bench', 'Main.elm', { prepack: true });
>>>>>>> |
<<<<<<<
}
=======
CacheEntity,
} from '.'
export { SettingEntity } from './settingEntity'
export { CredentialEntity } from './credentialEntity'
export { MasterKeyEntity } from './masterKeyEntity'
export { PersonaEntity } from './personaEntity'
export { SignatureEntity } from './signatureEntity'
export { VerifiableCredentialEntity } from './verifiableCredentialEntity'
export { CacheEntity } from './cacheEntity'
>>>>>>>
CacheEntity,
} |
<<<<<<<
// import { routeList } from 'src/routeList'
// import { DecoratedClaims, CategorizedClaims } from 'src/reducers/account'
// import { categoryForType } from 'src/actions/account/categories'
// import { claimsMetadata } from 'jolocom-lib'
// import { SignedCredential } from 'jolocom-lib/js/credentials/signedCredential/signedCredential'
// import { initialState } from 'src/reducers/account/claims'
=======
import { routeList } from 'src/routeList'
import { DecoratedClaims, CategorizedClaims } from 'src/reducers/account'
import { VerifiableCredential } from 'jolocom-lib/js/credentials/verifiableCredential'
import { getClaimMetadataByCredentialType, getCredentialUiCategory } from '../../lib/util'
>>>>>>>
import { routeList } from 'src/routeList'
import { DecoratedClaims } from 'src/reducers/account'
// import { VerifiableCredential } from 'jolocom-lib/js/credentials/verifiableCredential'
// import { getClaimMetadataByCredentialType, getCredentialUiCategory } from '../../lib/util'
<<<<<<<
// export const openClaimDetails = (claim: DecoratedClaims) => {
// return (dispatch: Dispatch<AnyAction>) => {
// dispatch({
// type: 'SET_SELECTED',
// selected: claim
// })
// dispatch(navigationActions.navigate({
// routeName: routeList.ClaimDetails
// }))
// }
// }
// export const saveClaim = (claimsItem: DecoratedClaims) => {
// return async (dispatch: Dispatch<AnyAction>, getState: Function, backendMiddleware : BackendMiddleware) => {
// const state = getState()
// const { jolocomLib, keyChainLib, encryptionLib, ethereumLib } = backendMiddleware
// let newClaims = {}
// newClaims = state.account.claims.toJS().claims
// // TODO: change the key of claimsMetadata to be the type[1]
// let claimsMetadataType = ''
// switch(claimsItem.type[1]) {
// case 'ProofOfNameCredential':
// claimsMetadataType = 'name'
// break
// case 'ProofOfMobilePhoneNumberCredential':
// claimsMetadataType = 'mobilePhoneNumber'
// break
// case 'ProofOfEmailCredential':
// claimsMetadataType = 'emailAddress'
// break
// default:
// break
// }
// const credential = jolocomLib.credentials.createCredential(
// claimsMetadata[claimsMetadataType],
// claimsItem.claims[0].value.trim(),
// state.account.did.toJS().did
// )
// const encryptionPass = await keyChainLib.getPassword()
// const currentDid = getState().account.did.get('did')
// const personaData = await storageLib.get.persona({did: currentDid})
// const { encryptedWif } = personaData[0].controllingKey
// const decryptedWif = encryptionLib.decryptWithPass({
// cipher: encryptedWif,
// pass: encryptionPass
// })
// const { privateKey } = ethereumLib.wifToEthereumKey(decryptedWif)
// const wallet = jolocomLib.wallet.fromPrivateKey(Buffer.from(privateKey, 'hex'))
// // const verifiableCredential = await wallet.signCredential(credential)
// // if (claimsItem.claims[0].id && claimsItem.claims[0].id !== '') {
// // await storageLib.delete.verifiableCredential(claimsItem.claims[0].id)
// // }
// // await storageLib.store.verifiableCredential(verifiableCredential)
// dispatch({
// type: 'SET_CLAIMS_FOR_DID',
// claims: newClaims
// })
// dispatch(navigationActions.navigatorReset({
// routeName: routeList.Home
// }))
// }
// }
=======
export const openClaimDetails = (claim: DecoratedClaims) => {
return (dispatch: Dispatch<AnyAction>) => {
dispatch({
type: 'SET_SELECTED',
selected: claim
})
dispatch(navigationActions.navigate({
routeName: routeList.ClaimDetails
}))
}
}
export const saveClaim = (claimsItem: DecoratedClaims) => {
return async (dispatch: Dispatch<AnyAction>, getState: Function, backendMiddleware: BackendMiddleware) => {
const state = getState()
const { jolocomLib, storageLib, keyChainLib, encryptionLib, ethereumLib } = backendMiddleware
const credential = jolocomLib.credentials.createCredential(
getClaimMetadataByCredentialType(claimsItem.type),
claimsItem.claims[0].value.trim(),
state.account.did.toJS().did
)
const currentDid = getState().account.did.get('did')
const encryptionPass = await keyChainLib.getPassword()
const personaData = await storageLib.get.persona({ did: currentDid })
const { encryptedWif } = personaData[0].controllingKey
const decryptedWif = encryptionLib.decryptWithPass({
cipher: encryptedWif,
pass: encryptionPass
})
const { privateKey } = ethereumLib.wifToEthereumKey(decryptedWif)
const wallet = jolocomLib.wallet.fromPrivateKey(Buffer.from(privateKey, 'hex'))
const verifiableCredential = await wallet.signCredential(credential)
if (claimsItem.claims[0].id) {
await storageLib.delete.verifiableCredential(claimsItem.claims[0].id)
}
await storageLib.store.verifiableCredential(verifiableCredential)
await setClaimsForDid()
dispatch(navigationActions.navigatorReset({
routeName: routeList.Home
}))
}
}
>>>>>>>
export const openClaimDetails = (claim: DecoratedClaims) => {
return (dispatch: Dispatch<AnyAction>) => {
dispatch({
type: 'SET_SELECTED',
selected: claim
})
dispatch(navigationActions.navigate({
routeName: routeList.ClaimDetails
}))
}
}
export const saveClaim = (claimsItem: DecoratedClaims) => {
return async (dispatch: Dispatch<AnyAction>, getState: Function, backendMiddleware: BackendMiddleware) => {
// const state = getState()
// const { jolocomLib, storageLib, keyChainLib, encryptionLib, ethereumLib } = backendMiddleware
// const credential = jolocomLib.credentials.createCredential(
// getClaimMetadataByCredentialType(claimsItem.type),
// claimsItem.claims[0].value.trim(),
// state.account.did.toJS().did
// )
// const currentDid = getState().account.did.get('did')
// const encryptionPass = await keyChainLib.getPassword()
// const personaData = await storageLib.get.persona({ did: currentDid })
// const { encryptedWif } = personaData[0].controllingKey
// const decryptedWif = encryptionLib.decryptWithPass({
// cipher: encryptedWif,
// pass: encryptionPass
// })
// const { privateKey } = ethereumLib.wifToEthereumKey(decryptedWif)
// const wallet = jolocomLib.wallet.fromPrivateKey(Buffer.from(privateKey, 'hex'))
// const verifiableCredential = await wallet.signCredential(credential)
// if (claimsItem.claims[0].id) {
// await storageLib.delete.verifiableCredential(claimsItem.claims[0].id)
// }
// await storageLib.store.verifiableCredential(verifiableCredential)
// await setClaimsForDid()
dispatch(navigationActions.navigatorReset({
routeName: routeList.Home
}))
}
}
<<<<<<<
// const prepareClaimsForState = (claims: SignedCredential[]) => {
// // TODO: Handle the category 'Other' for the claims that don't match any of predefined categories
// const categorizedClaims = {}
// const initialClaimsState = initialState
// Object.keys(categoryForType).forEach(category => {
// const claimsForCategory : DecoratedClaims[] = []
// claims.forEach(claim => {
// const name = claim.getDisplayName()
// const fieldName = Object.keys(claim.getCredentialSection())[1]
// const value = claim.getCredentialSection()[fieldName]
// if (typeInCategory(category, claim.getType())) {
// claimsForCategory.push(
// { displayName: name,
// type: claim.getType(),
// claims: [
// { id: claim.getId(),
// name: fieldName,
// value }
// ]
// } as DecoratedClaims
// )
// }
// })
// if (claimsForCategory.length === 0) {
// categorizedClaims[category] = initialClaimsState.claims[category]
// } else {
// initialClaimsState.claims[category].forEach(claim => {
// let count = 0
// claimsForCategory.forEach(dbClaim => {
// if (areCredTypesEqual(claim.type, dbClaim.type)) {
// count++
// }
// })
// if (count === 0) {
// claimsForCategory.push(claim)
// }
// })
// categorizedClaims[category] = claimsForCategory
// }
// })
// return categorizedClaims
// }
// // TODO: use the method from JolocomLib
// const areCredTypesEqual = (first: string[], second: string[]): boolean => {
// return first.every((el, index) => el === second[index])
// }
// const typeInCategory = (category: string, type: string[]): boolean => {
// const found = categoryForType[category].find(t => areCredTypesEqual(type, t))
// return (found && found.length > 0) || false
// }
=======
const prepareClaimsForState = (credentials: VerifiableCredential[]) => {
const categorizedClaims = {}
const decoratedCredentials = credentials.map(vCred => {
const claimData = vCred.getCredentialSection()
const claimFieldName = Object.keys(claimData).filter(key => key !== 'id')[0]
return {
displayName: vCred.getDisplayName(),
type: vCred.getType(),
claims: [{
id: vCred.getId(),
name: claimFieldName,
value: claimData[claimFieldName]
}]
}
})
decoratedCredentials.forEach(decoratedCred => {
const uiCategory = getCredentialUiCategory(decoratedCred.type)
try {
categorizedClaims[uiCategory].push(decoratedCred)
} catch (err) {
categorizedClaims[uiCategory] = [decoratedCred]
}
})
return categorizedClaims
}
>>>>>>>
// const prepareClaimsForState = (credentials: VerifiableCredential[]) => {
// const categorizedClaims = {}
// const decoratedCredentials = credentials.map(vCred => {
// const claimData = vCred.getCredentialSection()
// const claimFieldName = Object.keys(claimData).filter(key => key !== 'id')[0]
// return {
// displayName: vCred.getDisplayName(),
// type: vCred.getType(),
// claims: [{
// id: vCred.getId(),
// name: claimFieldName,
// value: claimData[claimFieldName]
// }]
// }
// })
// decoratedCredentials.forEach(decoratedCred => {
// const uiCategory = getCredentialUiCategory(decoratedCred.type)
// try {
// categorizedClaims[uiCategory].push(decoratedCred)
// } catch (err) {
// categorizedClaims[uiCategory] = [decoratedCred]
// }
// })
// return categorizedClaims
// } |
<<<<<<<
workspace.findFiles('**/.crane/tree', '').then(projectFile => {
if (projectFile.length > 0) {
console.log('Project File Found Loading File...');
this.langClient.sendRequest({ method: "buildFromProject" });
} else {
this.processFiles();
}
});
}
public processFiles() {
=======
if (workspace.rootPath == undefined) return;
>>>>>>>
workspace.findFiles('**/.crane/tree', '').then(projectFile => {
if (projectFile.length > 0) {
console.log('Project File Found Loading File...');
this.langClient.sendRequest({ method: "buildFromProject" });
} else {
this.processFiles();
}
});
}
public processFiles() {
if (workspace.rootPath == undefined) return; |
<<<<<<<
context.subscriptions.push(duplicateLineCommand);
context.subscriptions.push(downloadPHPLibraries);
=======
>>>>>>>
context.subscriptions.push(downloadPHPLibraries); |
<<<<<<<
import { Namespaces } from "./util/Namespaces";
=======
import { Namespaces } from "./util/namespaces";
import { Debug } from "./util/Debug";
>>>>>>>
import { Namespaces } from "./util/Namespaces";
import { Debug } from "./util/Debug"; |
<<<<<<<
import { TreeBuilder, FileNode, FileSymbolCache, SymbolType, AccessModifierNode, ClassNode } from "./hvy/treeBuilder";
=======
import { TreeBuilder, FileNode, ClassNode } from "./hvy/treeBuilder";
import { Debug } from './util/Debug';
>>>>>>>
import { TreeBuilder, FileNode, FileSymbolCache, SymbolType, AccessModifierNode, ClassNode } from "./hvy/treeBuilder";
import { Debug } from './util/Debug';
<<<<<<<
var requestType: RequestType<any, any, any> = { method: "findSymbolInTree" };
connection.onRequest(requestType, (request) =>
{
// If request.word starts with $ then variable
// If request.word starts with $this-> then class property
// If request.word contains ( then function or class instantiation
// If request.word starts with $this-> and ( then class method
let word = request.word;
let position = request.position;
word = word.toLowerCase();
let node = null;
// Search symbol cache
workspaceTree.forEach(fileNode =>
{
let matches = fileNode.symbolCache.filter(item => {
return item.name.toLowerCase() == word;
});
let t = "";
});
// Return filenodes with matches
return { node: node };
});
=======
function workspaceProcessed(projectPath, treePath) {
Debug.info("Workspace files have processed");
saveProjectTree(projectPath, treePath).then(savedTree => {
notifyClientOfWorkComplete();
if (savedTree) {
Debug.info('Project tree has been saved');
}
});
}
>>>>>>>
function workspaceProcessed(projectPath, treePath) {
Debug.info("Workspace files have processed");
saveProjectTree(projectPath, treePath).then(savedTree => {
notifyClientOfWorkComplete();
if (savedTree) {
Debug.info('Project tree has been saved');
}
});
}
var requestType: RequestType<any, any, any> = { method: "findSymbolInTree" };
connection.onRequest(requestType, (request) =>
{
// If request.word starts with $ then variable
// If request.word starts with $this-> then class property
// If request.word contains ( then function or class instantiation
// If request.word starts with $this-> and ( then class method
let word = request.word;
let position = request.position;
word = word.toLowerCase();
let node = null;
// Search symbol cache
workspaceTree.forEach(fileNode =>
{
let matches = fileNode.symbolCache.filter(item => {
return item.name.toLowerCase() == word;
});
let t = "";
});
// Return filenodes with matches
return { node: node };
}); |
<<<<<<<
=======
"use strict";
var underscore = require('../vendor/_.js');
>>>>>>>
<<<<<<<
var found = <attributes.Signature> this.get_attribute("Signature");
var sig = (found != null) ? found.sig : null;
=======
var found = underscore.find(this.attrs, (a:attributes.Attribute) => a.name === "Signature");
var sig = (found != null) ? found.sig : undefined;
>>>>>>>
var found = <attributes.Signature> this.get_attribute("Signature");
var sig = (found != null) ? found.sig : null;
<<<<<<<
this.code = this.get_attribute('Code');
=======
this.code = underscore.find(this.attrs, (a:attributes.Attribute) => a.name === 'Code');
>>>>>>>
this.code = this.get_attribute('Code');
<<<<<<<
exceptions = (_ref3 = (_ref4 = this.get_attribute("Exceptions")) != null ? _ref4.exceptions : void 0) != null ? _ref3 : [];
anns = (_ref5 = this.get_attribute("RuntimeVisibleAnnotations")) != null ? _ref5.raw_bytes : void 0;
adefs = (_ref6 = this.get_attribute("AnnotationDefault")) != null ? _ref6.raw_bytes : void 0;
sig = (_ref7 = this.get_attribute("Signature")) != null ? _ref7.sig : void 0;
=======
exceptions = (_ref3 = (_ref4 = underscore.find(this.attrs, function (a:attributes.Attribute) {
return a.name === 'Exceptions';
})) != null ? _ref4.exceptions : void 0) != null ? _ref3 : [];
anns = (_ref5 = underscore.find(this.attrs, function (a:attributes.Attribute) {
return a.name === 'RuntimeVisibleAnnotations';
})) != null ? _ref5.raw_bytes : void 0;
adefs = (_ref6 = underscore.find(this.attrs, function (a:attributes.Attribute) {
return a.name === 'AnnotationDefault';
})) != null ? _ref6.raw_bytes : void 0;
sig = (_ref7 = underscore.find(this.attrs, function (a:attributes.Attribute) {
return a.name === 'Signature';
})) != null ? _ref7.sig : void 0;
>>>>>>>
exceptions = (_ref3 = (_ref4 = this.get_attribute("Exceptions")) != null ? _ref4.exceptions : void 0) != null ? _ref3 : [];
anns = (_ref5 = this.get_attribute("RuntimeVisibleAnnotations")) != null ? _ref5.raw_bytes : void 0;
adefs = (_ref6 = this.get_attribute("AnnotationDefault")) != null ? _ref6.raw_bytes : void 0;
sig = (_ref7 = this.get_attribute("Signature")) != null ? _ref7.sig : void 0; |
<<<<<<<
export * from "./utils/append-custom-params";
export * from "./utils/ArcGISRequestError";
export * from "./utils/ArcGISAuthError";
export * from "./utils/check-for-errors";
export * from "./utils/clean-url";
=======
>>>>>>>
export * from "./utils/append-custom-params";
export * from "./utils/ArcGISRequestError";
export * from "./utils/ArcGISAuthError";
export * from "./utils/check-for-errors";
export * from "./utils/clean-url";
<<<<<<<
export * from "./utils/get-portal-url";
export * from "./utils/get-portal";
export * from "./utils/GrantTypes";
export * from "./utils/HTTPMethods";
export * from "./utils/IAuthenticationManager";
export * from "./utils/IFetchTokenParams";
export * from "./utils/IGenerateTokenParams";
export * from "./utils/IParams";
export * from "./utils/IRequestOptions";
export * from "./utils/ITokenRequestOptions";
export * from "./utils/process-params";
export * from "./utils/ResponseFormats";
export * from "./utils/retryAuthError";
export * from "./utils/warn";
=======
export * from "./utils/params";
export * from "./utils/IParamBuilder";
export * from "./utils/IParamsBuilder";
export * from "./utils/process-params";
export * from "./utils/clean-url";
export * from "./utils/append-custom-params";
export * from "./types/feature";
export * from "./types/geometry";
export * from "./types/group";
export * from "./types/item";
export * from "./types/symbol";
export * from "./types/user";
export * from "./types/webmap";
>>>>>>>
export * from "./utils/GrantTypes";
export * from "./utils/HTTPMethods";
export * from "./utils/IAuthenticationManager";
export * from "./utils/IFetchTokenParams";
export * from "./utils/IGenerateTokenParams";
export * from "./utils/IParams";
export * from "./utils/IParamBuilder";
export * from "./utils/IParamsBuilder";
export * from "./utils/IRequestOptions";
export * from "./utils/ITokenRequestOptions";
export * from "./utils/process-params";
export * from "./utils/ResponseFormats";
export * from "./utils/retryAuthError";
export * from "./utils/warn";
export * from "./types/feature";
export * from "./types/geometry";
export * from "./types/group";
export * from "./types/item";
export * from "./types/symbol";
export * from "./types/user";
export * from "./types/webmap"; |
<<<<<<<
default as StandaloneSearchBox
} from "./components/places/StandaloneSearchBox"
export { default as Autocomplete } from "./components/places/Autocomplete"
export { useGoogleMap } from './map-context'
=======
default as StandaloneSearchBox,
StandaloneSearchBoxProps
} from "./components/places/StandaloneSearchBox";
export { default as Autocomplete, AutocompleteProps } from "./components/places/Autocomplete";
>>>>>>>
default as StandaloneSearchBox,
StandaloneSearchBoxProps
} from "./components/places/StandaloneSearchBox";
export {
default as Autocomplete,
AutocompleteProps
} from "./components/places/Autocomplete";
export {
useGoogleMap
} from './map-context' |
<<<<<<<
import { Builder, By, WebDriver, Origin, Capabilities, WebElement } from 'selenium-webdriver';
import { Config, BrowserConfig, StoryInput, CreeveyStoryParams, noop, isDefined } from '../../types';
=======
import { Builder, By, WebDriver, Origin, Capabilities } from 'selenium-webdriver';
import { Config, BrowserConfig, StoryInput, CreeveyStoryParams, noop, isDefined, StorybookGlobals } from '../../types';
>>>>>>>
import { Builder, By, WebDriver, Origin, Capabilities, WebElement } from 'selenium-webdriver';
import { Config, BrowserConfig, StoryInput, CreeveyStoryParams, noop, isDefined, StorybookGlobals } from '../../types';
<<<<<<<
const ignoreStyles = await insertIgnoreStyles(browser, ignoreElements);
if (!captureElement) {
screenshot = await browser.takeScreenshot();
} else {
const { elementRect, windowRect } = await browser.executeScript<{
elementRect?: DOMRect;
windowRect: { width: number; height: number; x: number; y: number };
}>(function (selector: string) {
window.scrollTo(0, 0);
return {
elementRect: document.querySelector(selector)?.getBoundingClientRect(),
windowRect: {
width: window.innerWidth,
height: window.innerHeight,
x: Math.round(window.scrollX),
y: Math.round(window.scrollY),
},
};
}, captureElement);
if (!elementRect) throw new Error(`Couldn't find element with selector: '${captureElement}'`);
const isFitIntoViewport =
elementRect.width + elementRect.left <= windowRect.width &&
elementRect.height + elementRect.top <= windowRect.height;
screenshot = isFitIntoViewport
? await browser.findElement(By.css(captureElement)).takeScreenshot()
: await takeCompositeScreenshot(browser, windowRect, elementRect);
}
await removeIgnoreStyles(browser, ignoreStyles);
return screenshot;
=======
const { elementRect, windowRect } = await browser.executeScript<{
elementRect?: DOMRect;
windowRect: { width: number; height: number; x: number; y: number };
}>(function (selector: string) {
window.scrollTo(0, 0);
return {
elementRect: document.querySelector(selector)?.getBoundingClientRect(),
windowRect: {
width: window.innerWidth,
height: window.innerHeight,
x: Math.round(window.scrollX),
y: Math.round(window.scrollY),
},
};
}, captureElement);
if (!elementRect) throw new Error(`Couldn't find element with selector: '${captureElement}'`);
const isFitIntoViewport =
elementRect.width + elementRect.left <= windowRect.width &&
elementRect.height + elementRect.top <= windowRect.height;
if (isFitIntoViewport) return browser.findElement(By.css(captureElement)).takeScreenshot();
// TODO pointer-events: none, need to research
return takeCompositeScreenshot(browser, windowRect, elementRect);
>>>>>>>
const ignoreStyles = await insertIgnoreStyles(browser, ignoreElements);
if (!captureElement) {
screenshot = await browser.takeScreenshot();
} else {
const { elementRect, windowRect } = await browser.executeScript<{
elementRect?: DOMRect;
windowRect: { width: number; height: number; x: number; y: number };
}>(function (selector: string) {
window.scrollTo(0, 0);
return {
elementRect: document.querySelector(selector)?.getBoundingClientRect(),
windowRect: {
width: window.innerWidth,
height: window.innerHeight,
x: Math.round(window.scrollX),
y: Math.round(window.scrollY),
},
};
}, captureElement);
if (!elementRect) throw new Error(`Couldn't find element with selector: '${captureElement}'`);
const isFitIntoViewport =
elementRect.width + elementRect.left <= windowRect.width &&
elementRect.height + elementRect.top <= windowRect.height;
screenshot = isFitIntoViewport
? await browser.findElement(By.css(captureElement)).takeScreenshot()
: // TODO pointer-events: none, need to research
await takeCompositeScreenshot(browser, windowRect, elementRect);
}
await removeIgnoreStyles(browser, ignoreStyles);
return screenshot; |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.