fix #320 for @leemuro

amark · Feb 21, 2017 · a700afb · a700afb · leemuro · Feb 21, 2017
1 parent 8aa649e
commit a700afb
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/gun.js b/gun.js
@@ -1874,7 +1874,7 @@
 			if(u === data){
 				return;
 			}
-			if(data[rel._] && (tmp = rel.is(data))){
+			if(data && data[rel._] && (tmp = rel.is(data))){
 				tmp = (cat.root.get(tmp)._);
 				if(u === tmp.put){
 					return;
@@ -1924,7 +1924,7 @@
 			if(u === data){
 				return;
 			}
-			if(data[rel._] && (tmp = rel.is(data))){
+			if(data && data[rel._] && (tmp = rel.is(data))){
 				tmp = (cat.root.get(tmp)._);
 				if(u === tmp.put){
 					return;

diff --git a/gun.min.js b/gun.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gun",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "Graph engine",
   "main": "index.js",
   "browser": "gun.min.js",

diff --git a/src/on.js b/src/on.js
@@ -29,7 +29,7 @@ function ok(at, ev){ var opt = this;
 	if(u === data){
 		return;
 	}
-	if(data[rel._] && (tmp = rel.is(data))){
+	if(data && data[rel._] && (tmp = rel.is(data))){
 		tmp = (cat.root.get(tmp)._);
 		if(u === tmp.put){
 			return;
@@ -79,7 +79,7 @@ function val(at, ev, to){
 	if(u === data){
 		return;
 	}
-	if(data[rel._] && (tmp = rel.is(data))){
+	if(data && data[rel._] && (tmp = rel.is(data))){
 		tmp = (cat.root.get(tmp)._);
 		if(u === tmp.put){
 			return;

diff --git a/test/common.js b/test/common.js
@@ -3437,6 +3437,25 @@ describe('Gun', function(){
 				done.last = true;
 			},300);
 		});
+
+		it('check null on map', function(done){
+			var list = gun.get('myList');
+			list.map(function(value, id){
+				if("hello world" === value){
+					done.one = true;
+				}
+				if(null === value){
+					done.two = true;
+				}
+				if(done.one && done.two){
+					if(done.c){ return } done.c = 1;
+					done();
+				}
+			});
+			list.path('message').put('hello world'); // outputs "message: hello world"
+			list.path('message').put(null); // throws Uncaught TypeError: Cannot read property '#' of null
+		});
+
 		return;
 		it.only('Custom extensions are chainable', function(done){
 			Gun.chain.filter = function(filter){