From 62a6884bc6f792d22cebee78039a8111fd7dafd8 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sat, 24 Oct 2015 15:50:09 +0300
Subject: [PATCH] refactor&version

---
 devjs/main.js | 53 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/devjs/main.js b/devjs/main.js
index 22d27ea3..f0c86a98 100644
--- a/devjs/main.js
+++ b/devjs/main.js
@@ -7,7 +7,7 @@
  */
 
 var settingsPanel, emoteModule, utils, quickEmoteMenu;
-var jsVersion = 1.2;
+var jsVersion = 1.3;
 
 var mainObserver;
 
@@ -18,8 +18,6 @@ var ffzEmoteUrlEnd = "/1";
 var bttvEmoteUrlStart = "";
 var bttvEmoteUrlEnd = "";
 
-
-
 var settings = {
     "Save logs locally":          { "id": "bda-gs-0", "info": "Saves chat logs locally", "implemented":false },
     "Public Servers":             { "id": "bda-gs-1", "info": "Display public servers", "implemented":false},
@@ -33,8 +31,6 @@ var settings = {
     "Override Default Emotes":    { "id": "bda-es-5", "info": "Override default emotes", "implemented":false }
 };
 
-
-
 var defaultCookie = {
     "version":jsVersion,
     "bda-gs-0":false,
@@ -55,7 +51,6 @@ function Core() {
 
 }
 
-
 Core.prototype.init = function() {
     utils = new Utils();
     emoteModule = new EmoteModule();
@@ -200,28 +195,38 @@ EmoteModule.prototype.injectEmote = function(node) {
     if(!words) return;
 
     words.some(function(word) {
-		
-		
-		//Let's see how slow this is
-		$.each(subEmotesTwitch.channels, function() {
-			$.each(this.emotes, function() {
-				if(this.code == word) {
-					parentInnerHTML = parentInnerHTML.replace(word, "<img src=" + twitchEmoteUrlStart + this.image_id + twitchEmoteUrlEnd + " ><\/img>");
-				}
-			});
-		});
 
-        if (emotesTwitch.emotes.hasOwnProperty(word)) {
-            parentInnerHTML = parentInnerHTML.replace(word, "<img src=" + twitchEmoteUrlStart + emotesTwitch.emotes[word].image_id + twitchEmoteUrlEnd + " ><\/img>");
-		} else if(typeof emotesFfz !== 'undefined' && settingsCookie["bda-es-1"]) {
-            if(emotesFfz.hasOwnProperty(word)) {
+		var replaced = false;
+		
+		if(emotesTwitch.emotes.hasOwnProperty(word)) {
+			replaced = true;
+			parentInnerHTML = parentInnerHTML.replace(word, "<img src=" + twitchEmoteUrlStart + emotesTwitch.emotes[word].image_id + twitchEmoteUrlEnd + " ><\/img>");
+		}
+		
+		if(typeof emotesFfz !== 'undefined' && settingsCookie["bda-es-1"] && !replaced) {
+			if(emotesFfz.hasOwnProperty(word)) {
+				replaced = true;
                 parentInnerHTML = parentInnerHTML.replace(word, "<img src=" + ffzEmoteUrlStart + emotesFfz[word] + ffzEmoteUrlEnd + " ><\/img>");
-            } else if(typeof emotesBTTV !== 'undefined' && settingsCookie["bda-es-2"]) {
-                if(emotesBTTV.hasOwnProperty(word)) {
-                    parentInnerHTML = parentInnerHTML.replace(word, "<img src=" + bttvEmoteUrlStart + emotesBTTV[word] + bttvEmoteUrlEnd + " ><\/img>");
-                }
+            }
+		}
+		
+		if(typeof emotesBTTV !== 'undefined' && settingsCookie["bda-es-2"] && !replaced) {
+            if(emotesBTTV.hasOwnProperty(word)) {
+				replaced = true;
+                parentInnerHTML = parentInnerHTML.replace(word, "<img src=" + bttvEmoteUrlStart + emotesBTTV[word] + bttvEmoteUrlEnd + " ><\/img>");
             }
         }
+		
+		if(!replaced) {
+			$.each(subEmotesTwitch.channels, function() {
+				$.each(this.emotes, function() {
+					if(this.code == word) {
+						parentInnerHTML = parentInnerHTML.replace(word, "<img src=" + twitchEmoteUrlStart + this.image_id + twitchEmoteUrlEnd + " ><\/img>");
+					}
+				});
+			});
+		}
+			
     });
 
     var oldHeight = parent.parentElement.offsetHeight;