Revize d87ebc88

Fixed problems with interactions, generalized loading process of attributes from JSON (refs #7516)

sources/imiger-core/src/main/webapp/js/timeline/auxiliary/RestSource.js

@@ -79 +79 @@
         _convertGraph : function(data) {
             var archetypes = data.vertexArchetypes;
             var nodes = new Array(data.vertices.length), edges = new Array(data.edges.length);
+            var attrNames = data.attributeTypes.map(function(attr) { return attr.name; })
+                ,beginAttrIdx = attrNames.indexOf('begin')
+                ,endAttrIdx = attrNames.indexOf('end');
 
             for(var i = 0; i < data.vertices.length; i++) {
                 var v = data.vertices[i];
@@ -95 +98 @@
                     name: v.name, 
                     description: v.text,
                     stereotype: archetype,
-                    properties: prop,
-                    begin: v.attributes[1][1]
+                    properties: prop
                 };
-                if (typeof v.attributes[2] !== 'undefined') {
-                    node.end = v.attributes[2][1];
+                if (beginAttrIdx !== -1 && typeof v.attributes[beginAttrIdx] !== 'undefined') {
+                    node.begin = v.attributes[beginAttrIdx][1];
+                }
+                if (endAttrIdx !== -1 && typeof v.attributes[endAttrIdx] !== 'undefined') {
+                    node.end = v.attributes[endAttrIdx][1];
                 }
                 nodes[i] = node;
             }

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

@@ -632 +632 @@
                 var ev = new CustomEvent('timelineClick', { detail: entity.getId() });
                 window.parent.document.dispatchEvent(ev);
 
-                if (this._selected) {
-                    this.blur();
-                    e.preventDefault();
-                    this._selected = false;
-                    if (this._selectedEntity === entity.getId()) {
-                        return;
+                if (document.modeForm.mode.value === 'move' && e.altKey === false) {
+                    if (this._selected) {
+                        this.blur();
+                        e.preventDefault();
+                        this._selected = false;
+                        if (this._selectedEntity === entity.getId()) {
+                            return;
+                        }
                     }
+
+                    this.focusItem(bandItem.getEntity(), false);
+                    this._fireEvent("itemClick", entity);
+                    // FIALA Event for item click
+                    this._fireEvent("itemLogClick", entity);
+                    this._selected = true;
+                    this._selectedEntity = entity.getId();
                 }
-                
-                this.focusItem(bandItem.getEntity(), false);
-                this._fireEvent("itemClick", entity);
-                // FIALA Event for item click
-                this._fireEvent("itemLogClick", entity);
-                this._selected = true;
-                this._selectedEntity = entity.getId();
             },
 
             /**