Merge branch 'canary' into dev

Author: kevinchekovfeeney

lib/utils.js

@@ -75,14 +75,15 @@ Utils.empty = function(obj) {
 }
 
 /**
- * Generates a unique blank node id
+ * Generates a unique node id
  */
-Utils.genBNID = function() {
+Utils.genBNID = function(base) {
+    base = base || ""
     const r = Math.random()
         .toString(36)
         .substring(7)
     const d = new Date()
-    const bnid = `_:${r}${d.getTime()}`
+    const bnid = `doc:${base}${r}${d.getTime()}`
     return bnid
 }
 
@@ -109,18 +110,16 @@ Utils.getShorthand = function(link) {
 Utils.compareIDs = function(ida, idb) {
     if (ida === idb) return true
     if (this.unshorten(ida) === idb) return true
+    if (this.shorten(ida) === idb) return true
     if (this.unshorten(ida) === this.unshorten(idb)) return true
-    const sha = this.getShorthand(ida)
-    const shb = this.getShorthand(idb)
-    if (sha && (sha === idb || sha === shb)) return true
-    if (shb && shb === ida) return true
     return false
 }
 
 /**
  * Shortens a URL to its compressed format - returns the full URL if not possible
  */
 Utils.shorten = function(url, prefixes) {
+    if(!url) return url
     prefixes = prefixes || Utils.standard_urls
     for (const pref in prefixes) {
         if (prefixes[pref] == url.substring(0, prefixes[pref].length)) {
@@ -134,6 +133,7 @@ Utils.shorten = function(url, prefixes) {
  * Expands a URL to its full URL format - returns the passed string if not possible to expand
  */
 Utils.unshorten = function(url) {
+    if(!url) return url
     if (this.validURL(url)) return url
     if (!url) return url
     const bits = url.split(':')
@@ -150,6 +150,7 @@ Utils.unshorten = function(url) {
  * Valid URLs are those that start with http:// or https://
  */
 Utils.validURL = function(str) {
+    if(str && typeof str != "string") str = "" + str
     if (str && (str.substring(0, 7) === 'http://' || str.substring(0, 8) === 'https://'))
         return true
     return false

lib/viewer/documentFrame.js

@@ -98,7 +98,7 @@ DocumentFrame.prototype.loadData = function(jsonld, cls, classframes){
 }
 
 DocumentFrame.prototype.load = function(classframes, doc){
-    this.document = new ObjectFrame(doc["@type"], doc, classframes)    
+    this.document = new ObjectFrame(doc["@type"], doc, classframes)  
 }
 
 
@@ -116,7 +116,7 @@ DocumentFrame.prototype.loadSchemaFrames = function(classframes, cls){
 			this.document.loadClassFrames(classframes);
 			if(!this.document.subjid){
 				this.document.newDoc = true;
-				this.document.fillFromSchema("_:");
+				this.document.fillFromSchema(FrameHelper.genBNID(FrameHelper.urlFragment(cls)+"_"));
 			}
 		}
 	}
@@ -152,9 +152,9 @@ DocumentFrame.prototype.filterFrame = function(loadRenderer){
  * adds render and compare functions to object frames
  */
 DocumentFrame.prototype.applyRules = function(doc, config, mymatch){
-	doc = (doc ? doc : this.document);
+    doc = doc || this.document;
+    if(!doc) return
 	config = (config ? config : this.config);
-	var self = this;
 	var onmatch = function(frame, rule){
 		config.setFrameDisplayOptions(frame, rule);
 		if(mymatch) mymatch(frame, rule);