Spring/spring-flo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgarde to angular 7.1.1 and jointjs 2.2.1

Browse Source
This commit is contained in:
BoykoAlex
2018-12-03 14:36:55 -05:00
parent 6dad59e371
commit 923fe5fde4
4 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/editor/editor.component.ts
View File

@@ -282,8 +282,6 @@ export class EditorComponent implements OnInit, OnDestroy {
}
ngOnInit() {
console.log('Initializing my component');
this.initGraph();
this.initPaper();
@@ -650,7 +648,7 @@ export class EditorComponent implements OnInit, OnDestroy {
}
handleDragFromPalette(dnDEvent: Flo.DnDEvent) {
console.log('Dragging from palette');
console.debug('Dragging from palette');
if (dnDEvent.view && !this.readOnlyCanvas) {
let location = this.paper.snapToGrid({x: dnDEvent.event.clientX, y: dnDEvent.event.clientY});
this.handleNodeDragging(dnDEvent.view, this.getTargetViewFromEvent(dnDEvent.event, location.x, location.y, [dnDEvent.view]), location.x, location.y, Constants.PALETTE_CONTEXT);
@@ -923,7 +921,7 @@ export class EditorComponent implements OnInit, OnDestroy {
* then update the view based on that new information.
*/
updateGraphRepresentation(): Promise<any> {
console.log(`Updating graph to represent '${this._dslText}'`);
console.debug(`Updating graph to represent '${this._dslText}'`);
if (this.metamodel && this.metamodel.textToGraph) {
return this.metamodel.textToGraph(this.editorContext, this._dslText).then(() => {
this.textToGraphConversionCompleted.next();
@@ -1138,7 +1136,7 @@ export class EditorComponent implements OnInit, OnDestroy {
});
this.paper.on('dragging-node-over-canvas', (dndEvent: Flo.DnDEvent) => {
console.log(`Canvas DnD type = ${dndEvent.type}`);
console.debug(`Canvas DnD type = ${dndEvent.type}`);
let location = this.paper.snapToGrid({x: dndEvent.event.clientX, y: dndEvent.event.clientY});
switch (dndEvent.type) {
case Flo.DnDEventType.DRAG:

8
src/lib/palette/palette.component.ts
View File

@@ -98,7 +98,7 @@ export class Palette implements OnInit, OnDestroy, OnChanges {
@Input()
set paletteSize(size: number) {
console.log('Palette Size: ' + size);
console.debug('Palette Size: ' + size);
if (this._paletteSize !== size) {
this._paletteSize = size;
this.rebuildPalette();
@@ -237,7 +237,7 @@ export class Palette implements OnInit, OnDestroy, OnChanges {
let groupAdded: Set<string> = new Set<string>();
let parentWidth: number = this._paletteSize;
console.log(`Parent Width: ${parentWidth}`);
console.debug(`Parent Width: ${parentWidth}`);
// The field closedGroups tells us which should not be shown
// Work out the list of active groups/nodes based on the filter text
@@ -342,7 +342,7 @@ export class Palette implements OnInit, OnDestroy, OnChanges {
});
this.palette.setDimensions(parentWidth, ypos);
this.paletteReady.emit(true);
console.log('buildPalette took ' + (new Date().getTime() - startTime) + 'ms');
console.debug('buildPalette took ' + (new Date().getTime() - startTime) + 'ms');
}
rebuildPalette() {
@@ -472,7 +472,7 @@ export class Palette implements OnInit, OnDestroy, OnChanges {
private handleDrag(event: any) {
// TODO offsetX/Y not on firefox
// console.debug("tracking move: x="+event.pageX+",y="+event.pageY);
// console.log('Element = ' + (this.clickedElement ? this.clickedElement.attr('metadata/name'): 'null'));
// console.debug('Element = ' + (this.clickedElement ? this.clickedElement.attr('metadata/name'): 'null'));
if (this.clickedElement && this.clickedElement.attr('metadata')) {
if (!this.viewBeingDragged) {