remove unnecessary hasOwnProperty calls after refactored for...in loops

app/content-scripts/click_to_play.js

@@ -163,10 +163,8 @@ const Click2PlayContentScript = (function(win, doc) {
 					const messageKeys = Object.keys(message);
 					for (let i = 0; i < messageKeys.length; i++) {
 						const app_id = messageKeys[i];
-						if (message.hasOwnProperty(app_id)) {
-							applyC2P(app_id, message[app_id].data, message[app_id].html);
-							delete message[app_id];
-						}
+						applyC2P(app_id, message[app_id].data, message[app_id].html);
+						delete message[app_id];
 					}
 				}
 			}

app/panel-android/components/content/FixedMenu.jsx

@@ -53,13 +53,11 @@ export default class FixedMenu extends React.Component {
 				const categories = Object.keys(this.antiTrackingData);
 				for (let i = 0; i < categories.length; i++) {
 					const category = categories[i];
-					if (this.antiTrackingData.hasOwnProperty(category)) {
-						const apps = Object.keys(this.antiTrackingData[category]);
-						for (let j = 0; j < apps.length; j++) {
-							const app = apps[j];
-							if (this.antiTrackingData[category][app] === 'unsafe') {
-								total++;
-							}
+					const apps = Object.keys(this.antiTrackingData[category]);
+					for (let j = 0; j < apps.length; j++) {
+						const app = apps[j];
+						if (this.antiTrackingData[category][app] === 'unsafe') {
+							total++;
 						}
 					}
 				}

app/panel/components/StatsView.jsx

@@ -196,7 +196,7 @@ const StatsView = (props) => {
 							<I18nWithLink cssClasses="modal-title-text" value="panel_stats_pitch_modal_text" />
 						</div>
 						<div className="modal-buttons-container">
-							<div className="modal-filled-button" onClick={subscribe}>{t('Get_Ghostery_Plus_bang')}</div>
+							<div className="modal-filled-button" onClick={subscribe}>{t('get_ghostery_plus_bang')}</div>
 						</div>
 						{ !loggedIn && (
 							<div className="modal-text-container">

app/panel/components/Subscribe.jsx

@@ -43,7 +43,7 @@ const Subscribe = ({ match }) => {
 				<span className="pitch-learn-more">{t('subscribe_pitch_learn_more')}</span>
 			</PanelToTabLink>
 			<div>
-				<span className="pitch-become-subscriber" onClick={_handleBecomeClick}>{t('Get_Ghostery_Plus_bang')}</span>
+				<span className="pitch-become-subscriber" onClick={_handleBecomeClick}>{t('get_ghostery_plus_bang')}</span>
 			</div>
 			{(loggedIn === 'false') && (
 				<NavLink to="/login" className="pitch-already-subscriber">

src/background.js

@@ -165,12 +165,10 @@ function setGhosteryDefaultBlocking() {
 	const app_ids = Object.keys(bugDb.db.apps);
 	for (let i = 0; i < app_ids.length; i++) {
 		const app_id = app_ids[i];
-		if (bugDb.db.apps.hasOwnProperty(app_id)) {
-			const category = bugDb.db.apps[app_id].cat;
-			if (categoriesBlock.indexOf(category) >= 0 &&
-			!selected_app_ids.hasOwnProperty(app_id)) {
-				selected_app_ids[app_id] = 1;
-			}
+		const category = bugDb.db.apps[app_id].cat;
+		if (categoriesBlock.indexOf(category) >= 0 &&
+		!selected_app_ids.hasOwnProperty(app_id)) {
+			selected_app_ids[app_id] = 1;
 		}
 	}
 	panelData.set({ selected_app_ids });

src/classes/BugDb.js

@@ -84,61 +84,57 @@ class BugDb extends Updatable {
 		const appIds = Object.keys(db.apps);
 		for (let i = 0; i < appIds.length; i++) {
 			appId = appIds[i];
-			if (db.apps.hasOwnProperty(appId)) {
-				category = db.apps[appId].cat;
-				if (t(`category_${category}`) === `category_${category}`) {
-					category = 'uncategorized';
-				}
-				blocked = selectedApps.hasOwnProperty(appId);
+			category = db.apps[appId].cat;
+			if (t(`category_${category}`) === `category_${category}`) {
+				category = 'uncategorized';
+			}
+			blocked = selectedApps.hasOwnProperty(appId);
 
-				// Because we have two trackers in the DB with the same name
-				if ((categories[category] && categories[category].trackers[db.apps[appId].name])) {
-					continue; // eslint-disable-line no-continue
-				}
+			// Because we have two trackers in the DB with the same name
+			if ((categories[category] && categories[category].trackers[db.apps[appId].name])) {
+				continue; // eslint-disable-line no-continue
+			}
 
-				if (categories.hasOwnProperty(category)) {
-					categories[category].num_total++;
-					if (blocked) {
-						categories[category].num_blocked++;
-					}
-				} else {
-					categories[category] = {
-						id: category,
-						name: t(`category_${category}`),
-						description: t(`category_${category}_desc`),
-						img_name: (category === 'advertising') ? 'adv' : // Because AdBlock blocks images with 'advertising' in the name.
-							(category === 'social_media') ? 'smed' : category, // Because AdBlock blocks images with 'social' in the name.
-						num_total: 1,
-						num_blocked: (blocked) ? 1 : 0,
-						trackers: []
-					};
+			if (categories.hasOwnProperty(category)) {
+				categories[category].num_total++;
+				if (blocked) {
+					categories[category].num_blocked++;
 				}
-				categories[category].trackers.push({
-					id: appId,
-					name: db.apps[appId].name,
-					description: '',
-					blocked,
-					shouldShow: true,
-					catId: category,
-				});
+			} else {
+				categories[category] = {
+					id: category,
+					name: t(`category_${category}`),
+					description: t(`category_${category}_desc`),
+					img_name: (category === 'advertising') ? 'adv' : // Because AdBlock blocks images with 'advertising' in the name.
+						(category === 'social_media') ? 'smed' : category, // Because AdBlock blocks images with 'social' in the name.
+					num_total: 1,
+					num_blocked: (blocked) ? 1 : 0,
+					trackers: []
+				};
 			}
+			categories[category].trackers.push({
+				id: appId,
+				name: db.apps[appId].name,
+				description: '',
+				blocked,
+				shouldShow: true,
+				catId: category,
+			});
 		}
 
 		const categoryNames = Object.keys(categories);
 		for (let i = 0; i < categoryNames.length; i++) {
 			categoryName = categoryNames[i];
-			if (categories.hasOwnProperty(categoryName)) {
-				const cat = categories[categoryName];
-				if (cat.trackers) {
-					cat.trackers.sort((a, b) => {
-						const a1 = a.name.toLowerCase();
-						const b1 = b.name.toLowerCase();
-						return (a1 > b1 ? 1 : (a1 < b1 ? -1 : 0));
-					});
-				}
-
-				categoryArray.push(cat);
+			const cat = categories[categoryName];
+			if (cat.trackers) {
+				cat.trackers.sort((a, b) => {
+					const a1 = a.name.toLowerCase();
+					const b1 = b.name.toLowerCase();
+					return (a1 > b1 ? 1 : (a1 < b1 ? -1 : 0));
+				});
 			}
+
+			categoryArray.push(cat);
 		}
 
 		// Sort categories by tracker numbers
@@ -182,9 +178,7 @@ class BugDb extends Updatable {
 		const regexesKeys = Object.keys(regexes);
 		for (let i = 0; i < regexesKeys.length; i++) {
 			const id = regexesKeys[i];
-			if (regexes.hasOwnProperty(id)) {
-				db.patterns.regex[id] = new RegExp(regexes[id], 'i');
-			}
+			db.patterns.regex[id] = new RegExp(regexes[id], 'i');
 		}
 
 		log('setting bugdb noneSelected/allSelected...');

src/classes/FoundBugs.js

@@ -206,50 +206,46 @@ class FoundBugs {
 		const ids = Object.keys(bugs);
 		for (let i = 0; i < ids.length; i++) {
 			id = ids[i];
-			if (bugs.hasOwnProperty(id)) {
-				appid = db.bugs[id].aid;
-				cid = db.apps[appid].cat;
-
-				if (cats_obj.hasOwnProperty(cid)) {
-					if (!cats_obj[cid].appIds.includes(appid)) {
-						cats_obj[cid].appIds.push(appid);
-						cats_obj[cid].trackers.push({
-							id: appid,
-							name: db.apps[appid].name,
-							blocked: bugs[id].blocked
-						});
-						if (bugs[id].blocked) {
-							cats_obj[cid].blocked++;
-						} else {
-							cats_obj[cid].allowed++;
-						}
-						cats_obj[cid].total++;
+			appid = db.bugs[id].aid;
+			cid = db.apps[appid].cat;
+
+			if (cats_obj.hasOwnProperty(cid)) {
+				if (!cats_obj[cid].appIds.includes(appid)) {
+					cats_obj[cid].appIds.push(appid);
+					cats_obj[cid].trackers.push({
+						id: appid,
+						name: db.apps[appid].name,
+						blocked: bugs[id].blocked
+					});
+					if (bugs[id].blocked) {
+						cats_obj[cid].blocked++;
+					} else {
+						cats_obj[cid].allowed++;
 					}
-				} else {
-					cats_obj[cid] = {
-						id: cid,
-						name: cid,
-						appIds: [appid],
-						trackers: [{
-							id: appid,
-							name: db.apps[appid].name,
-							blocked: bugs[id].blocked
-						}],
-						blocked: (bugs[id].blocked ? 1 : 0),
-						allowed: (bugs[id].blocked ? 0 : 1),
-						total: 1
-					};
+					cats_obj[cid].total++;
 				}
+			} else {
+				cats_obj[cid] = {
+					id: cid,
+					name: cid,
+					appIds: [appid],
+					trackers: [{
+						id: appid,
+						name: db.apps[appid].name,
+						blocked: bugs[id].blocked
+					}],
+					blocked: (bugs[id].blocked ? 1 : 0),
+					allowed: (bugs[id].blocked ? 0 : 1),
+					total: 1
+				};
 			}
 		}
 
 		// convert categories hash to array
 		const cids = Object.keys(cats_obj);
 		for (let i = 0; i < cids.length; i++) {
 			cid = cids[i];
-			if (cats_obj.hasOwnProperty(cid)) {
-				cats_arr.push(cats_obj[cid]);
-			}
+			cats_arr.push(cats_obj[cid]);
 		}
 
 		if (sorted) {

tools/leet/leet-en.js

@@ -68,9 +68,7 @@ const leet_convert = function(string) {
 	const characterKeys = Object.keys(characterMap);
 	for (let i = 0; i < characterKeys.length; i++) {
 		const letter = characterKeys[i];
-		if (characterMap.hasOwnProperty(letter)) {
-			output = output.replace(new RegExp(letter, 'g'), characterMap[letter]);
-		}
+		output = output.replace(new RegExp(letter, 'g'), characterMap[letter]);
 	}
 
 	return output;