Revize 5ef58552

Fixed bugs after merge (refs #7562)

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

@@ -413 +413 @@
 	_onNodeClick(e) {
 		e.stopPropagation();
 
-        var archetypeString = app.archetype.vertex[this.archetype].name;
+        var archetypeString = app.archetype.vertex[this.archetype].name.toLowerCase();;
         if (archetypeString !== 'person') archetypeString = 'item';
         var notifyTimeline;
 

sources/imiger-core/src/main/webapp/js/showGraphApp.js

@@ -126 +126 @@
 
 		// timeline
         document.addEventListener('timelineClick', function (e) {
-            var node = app.nodeList[e.detail];
+            var nodeIDs = app.nodeList.map(function(node) { return node.id; });
+            var node = app.nodeList[nodeIDs.indexOf(e.detail)];
             if (node !== undefined) {
                 node._onNodeClick(e);
             }

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

@@ -114 +114 @@
                 if (beginAttrIdx !== -1 && typeof v.attributes[beginAttrIdx] !== 'undefined') {
                     parsed = parseInt(v.attributes[beginAttrIdx][1], 10);
 
-                    if (isNaN(parsed)) {
+                    if (isNaN(parsed) || parsed < 4000) {
                         node.begin = v.attributes[beginAttrIdx][1];
                     } else {
                         date = new Date(parsed);
@@ -125 +125 @@
                 if (endAttrIdx !== -1 && typeof v.attributes[endAttrIdx] !== 'undefined') {
                     parsed = parseInt(v.attributes[endAttrIdx][1], 10);
 
-                    if (isNaN(parsed)) {
+                    if (isNaN(parsed) || parsed < 4000) {
                         node.end = v.attributes[endAttrIdx][1];
                     } else {
                         date = new Date(parsed);