Merge branch 'dev' of https://github.com/terminusdb/terminus-client into dev

Author: KittyJose

lib/viewer/documentFrame.js

@@ -83,14 +83,11 @@ DocumentFrame.prototype.loadData = function(jsonld, cls, classframes){
 	}
 	if(cls){
 		if(!this.document){
-            alert("Yo")
             this.document = new ObjectFrame(cls, jsonld, classframes);
 		}
 		else {
-            alert("Yo2")
 			this.document.loadJSONLDDocument(jsonld);
         }
-        alert(this.document.subjid)
 	}
 	else {
 		console.log("Missing Class" + " " + "Failed to add dataframes due to missing class");
@@ -130,7 +127,7 @@ DocumentFrame.prototype.filterFrame = function(loadRenderer){
 		if(typeof rule.render() != "undefined"){
 			frame.render = rule.render();
 		}
-		else {
+/*		else {
 			if(rule.renderer()){
 				var renderer = loadRenderer(rule.renderer(), frame, rule.args);		
 			}
@@ -139,7 +136,7 @@ DocumentFrame.prototype.filterFrame = function(loadRenderer){
 					return renderer(fframe);
 				}
 			}
-		}
+		}*/
 		if(rule.compare()){
 			frame.compare = rule.compare();
 		}

lib/viewer/objectFrame.js

@@ -397,9 +397,11 @@ ObjectFrame.prototype.addProperty = function (prop, cls) {
 			nprop.addValueFrame(ndata);
 		}
 		if (typeof this.properties[prop] === 'undefined') {
-			this.properties[prop] = [];
+			this.properties[prop] = nprop;
 		}
-		this.properties[prop].push(nprop);
+		else {
+            //this.properties[prop].push(nprop);
+        }
 		return nprop;
 	}
 	return false;