Revize 7a5bd6eb

Fixed events calls, imlemented include and exclude for Timeline (refs #7516)

sources/imiger-core/src/main/webapp/js/components/node.js

@@ -323 +323 @@
 		this.isExcluded = true;
 		this.remove(true);
 
+        var notifyTimeline = new CustomEvent('imigerExclude', { detail: { entityID: this.id } });
+        document.dispatchEvent(notifyTimeline);
+
 		app.viewportComponent.removeNode(this);
 	}
 
@@ -335 +338 @@
 		this.isExcluded = false;
 		this.remove(false);
 
+        var notifyTimeline = new CustomEvent('imigerInclude', { detail: { entityID: this.id } });
+        document.dispatchEvent(notifyTimeline);
+
 		app.viewportComponent.addNode(this);
 	}
 
@@ -407 +413 @@
 	_onNodeClick(e) {
 		e.stopPropagation();
 
+        var archetypeString = app.archetype.vertex[this.archetype].name;
+        if (archetypeString !== 'person') archetypeString = 'item';
+        var notifyTimeline;
+
 		if (this.isExcluded) {
 			this.highlightWithNeighbours(!this.isHighlighted);
 
+            if (e.detail !== this.id) {
+                notifyTimeline = new CustomEvent('imigerClick', { detail: { entityID: this.id, archetype: archetypeString } });
+                document.dispatchEvent(notifyTimeline);
+            }
+
 		} else {
 			if (this._panning === true) {
 				this._panning = false;
@@ -419 +434 @@
 			if (document.modeForm.mode.value === 'exclude' || (document.modeForm.mode.value === 'move' && e.altKey === true)) {
 				this.exclude();
 				app.sidebarComponent.excludedNodeListComponent.addNode(this);
+
 			} else if (document.modeForm.mode.value === 'move') {
 				this.highlightWithNeighbours(!this.isHighlighted);
 
 				if (e.detail !== this.id) {
-				    var archetypeString = app.archetype.vertex[this.archetype].name;
-				    if (archetypeString !== 'person') archetypeString = 'item';
-                    var notifyTimeline = new CustomEvent('imigerClick', { detail: { entityID: this.id, archetype: archetypeString } });
-                    window.frames[0].document.dispatchEvent(notifyTimeline);
+                    notifyTimeline = new CustomEvent('imigerClick', { detail: { entityID: this.id, archetype: archetypeString } });
+                    document.dispatchEvent(notifyTimeline);
                 }
 
 				if (this.isHighlighted) {

sources/imiger-core/src/main/webapp/js/timeline/cz/kajda/timeline/Timeline.js

@@ -484 +484 @@
             _attachTimelineEventListeners : function() {
                 $(window).on("resize", new Closure(this, this._handleResizing));
                 $(document).on("imigerClick", new Closure(this, this._handleIMiGErClick));
+                $(document).on("imigerExclude", new Closure(this, this._handleIMiGErExclude));
+                $(document).on("imigerInclude", new Closure(this, this._handleIMiGErInclude));
                 this._htmlElement
                         .on("mouseover", "*", new Closure(this, this._handleMouseOver))
                         .on("wheel", new Closure(this, this._handleZooming))
@@ -500 +502 @@
                     .addListener("dropped", this, this._handleWrapperDropped);
             },
 
+            _handleIMiGErExclude : function(e) {
+                var entity = this.getEntities().get(e.originalEvent.detail.entityID);
+                $('div[data-entity=' + entity.getId() + ']').hide();
+            },
+
+            _handleIMiGErInclude : function(e) {
+                var entity = this.getEntities().get(e.originalEvent.detail.entityID);
+                $('div[data-entity=' + entity.getId() + ']').show();
+            },
+
             _handleIMiGErClick : function(e) {
                 var entity = this.getEntities().get(e.originalEvent.detail.entityID),
                     bandItem = this._bandGroup.getBand(e.originalEvent.detail.archetype).getBandItem(entity.getId());
@@ -512 +524 @@
                         return;
                     }
                 }
-                
+
                 this.focusItem(bandItem.getEntity(), false);
                 this._fireEvent("itemClick", entity);
                 // FIALA Event for item click