Merge branch 'master' of https://github.com/shichuan/javascript-patterns

chuanxshi · chuanxshi · commit 4b7988e66abd · 2018-06-10T23:15:39.000+08:00
diff --git a/code-reuse-patterns/prototypal-inheritance.html b/code-reuse-patterns/prototypal-inheritance.html
@@ -39,30 +39,33 @@
 			Person.prototype.getName = function () {
 				return this.name;
 			};
+
 			// create a new person
 			var papa = new Person();
+
 			// inherit
 			var kid = object(papa);
+
 			// test that both the own property
 			// and the prototype property were inherited
 			console.log(kid.getName()); // "Adam"
 
-
 			// parent constructor
 			function Person() {
 				// an "own" property
 				this.name = "Adam";
 			}
+
 			// a property added to the prototype
 			Person.prototype.getName = function () {
 				return this.name;
 			};
+
 			// inherit
 			var kid = object(Person.prototype);
 			console.log(typeof kid.getName); // "function", because it was in the prototype
 			console.log(typeof kid.name); // "undefined", because only the prototype was inherited
 
-
 			/* Addition to ECMAScript 5 */
 			var child = Object.create(parent);
 
diff --git a/general-patterns/for-in-loops.html b/general-patterns/for-in-loops.html
@@ -1,4 +1,4 @@
-﻿<!doctype html>
+<!doctype html>
 <html lang="en">
 	<head>
 		<title>JavaScript Patterns</title>
@@ -9,22 +9,19 @@
 			/* Title: for-in loops
 			 * Description: optimized for-in loops
 			 */
-
 			// the object
 			var man = {
 				hands:2,
 				legs:2,
 				heads:1
 			};
-
 			// somewhere else in the code
 			// a method was added to all objects
 			if (typeof Object.prototype.clone === 'undefined') {
 				Object.prototype.clone = function () {
 				};
 			}
-
-
+			
 			// antipattern
 			// for-in loop without checking hasOwnProperty()
 			for (var i in man) {
@@ -37,32 +34,25 @@
 			 * heads : 1
 			 * clone: function()
 			 */
-
-
 			// preferred 1
 			for (var i in man) {
 				if (man.hasOwnProperty(i)) { // filter
 					console.log(i, ":", man[i]);
 				}
 			}
-
 			/*
 			 * result in the console
 			 * hands : 2
 			 * legs : 2
 			 * heads : 1
 			 */
-
-
 			// preferred 2
 			// benefit is you can avoid naming collisions in case the `man` object has redefined `hasOwnProperty`
 			for (var i in man) {
 				if (Object.prototype.hasOwnProperty.call(man, i)) { // filter
 					console.log(i, ":", man[i]);
 				}
 			}
-
-
 			// preferred 3
 			// use a local variable to "cache" `Object.prototype.hasOwnProperty`
 			var i,
@@ -72,8 +62,28 @@
 					console.log(i, ":", man[i]);
 				}
 			}
-
-
+			
+			
+			//Preferred 4 
+			/* Check if object has properties before print output
+			 *  using Object.keys(obj) and length built ins. A good method for 
+			 *  not wasting resources and avoiding errors with larger objects
+			 */  
+			if (Object.keys(man).length > 0){
+			     for (var item in man)
+				 console.log(item,':',man[item]);
+			} else { 
+			    console.log('Empty Object');}
+			
+			/*	
+			 * hands : 2
+			 * legs : 2
+			 * heads : 1
+			 * clone : function() {
+			 *		    }
+			 */
+			
+			
 			// References
 			// http://net.tutsplus.com/tutorials/javascript-ajax/the-essentials-of-writing-high-quality-javascript/
 		</script>
