From ed8c2107c7dcb3d7fdba044a589930d22d5223ae Mon Sep 17 00:00:00 2001
From: laviad <avi.laviad@mymedia.club>
Date: Sat, 13 Jul 2019 02:14:41 +0300
Subject: [PATCH] Fix addAspectToMatches to work also with classes

---
 meld.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/meld.js b/meld.js
index d31bda5..fc37e77 100644
--- a/meld.js
+++ b/meld.js
@@ -400,18 +400,19 @@ define(function () {
 
 	function addAspectToMatches(target, pointcut, aspect) {
 		var removers = [];
+
+		let propertyNames = Object.getOwnPropertyNames(target.__proto__)
 		// Assume the pointcut is a an object with a .test() method
-		for (var p in target) {
-			// TODO: Decide whether hasOwnProperty is correct here
-			// Only apply to own properties that are functions, and match the pointcut regexp
-			if (typeof target[p] == 'function' && pointcut.test(p)) {
-				// if(object.hasOwnProperty(p) && typeof object[p] === 'function' && pointcut.test(p)) {
-				removers.push(addAspectToMethod(target, p, aspect));
-			}
+		for (var p of propertyNames) {
+				let isFunction = typeof target[p] == 'function'
+				let isMatched = pointcut.test(p)
+				if (isFunction && isMatched) {
+						removers.push(addAspectToMethod(target, p, aspect));
+				}
 		}
 
 		return createRemover(removers);
-	}
+}
 
 	function createRemover(removers) {
 		return {