From 1b426b13f3f50a6e80eb9382c2caaa2a0c8d4a23 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 30 Aug 2015 13:11:02 +0300
Subject: [PATCH] release 0.1.3

---
 lib/BetterDiscord.js | 45 +++++++++++++-------------------------------
 lib/config.json      |  2 +-
 2 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/lib/BetterDiscord.js b/lib/BetterDiscord.js
index 61a462af..866724ef 100644
--- a/lib/BetterDiscord.js
+++ b/lib/BetterDiscord.js
@@ -1,8 +1,8 @@
 /* BetterDiscordApp Entry
- * Version: 1.1
+ * Version: 1.2
  * Author: Jiiks | http://jiiks.net
  * Date: 27/08/2015 - 15:51
- * Last Update: 29/08/2015 - 22:300
+ * Last Update: 30/08/2015 - 13:10
  * https://github.com/Jiiks/BetterDiscordApp
  */
 
@@ -43,32 +43,6 @@ BetterDiscord.prototype.init = function() {
     });
 
     return;
-
-	console.log("BetterDiscord v" + version + " Initialized");
-
-
-    self.getUtils().getWebContents().on('did-finish-load', function() {
-
-    });
-
-    self.getUtils().getWebContents().on('dom-ready', function() {
-        self.getUtils().execJs('var version = "0.1.2";');
-
-        self.getUtils().injectJavaScript("//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js"); //jquery
-
-        //CSS
-        self.getUtils().execJs('function injectCss() { $(\'head\').append(\'<link rel=\"stylesheet\" type=\"text\/css\" href=\"https:\/\/rawgit.com\/Jiiks\/BetterDiscordApp\/master\/css\/main.min.css\">\') }');
-        self.getUtils().execJs('var deferCount = 0; function defer() { if(window.jQuery) { injectCss() } else { setTimeout( function() { if(deferCount < 100) { deferCount++; defer(); } else { alert("BetterDiscord failed to load :( try restarting Discord. code:0x01"); } }, 100 ); } } deferCount = 0; defer();');
-
-        //JavaScript
-        setTimeout(function() {
-            self.getUtils().injectJavaScript("//cdnjs.cloudflare.com/ajax/libs/jquery-cookie/1.4.1/jquery.cookie.min.js");
-            self.getUtils().injectJavaScript("https://rawgit.com/Jiiks/BetterDiscordApp/806eeabd2473d7b65746bc67a4c1e2cf77a55bd6/js/main.min.js");
-          //  setTimeout(funct)
-           // self.getUtils().execJs("var mainCore = new Core(); mainCore.init();");
-        }, 2000);
-    });
-
 }
 
 BetterDiscord.prototype.start = function() {
@@ -97,15 +71,22 @@ BetterDiscord.prototype.start = function() {
         //CSS
         self.getUtils().execJs('function injectMainCss() { $(\'head\').append( \'<link rel=\"stylesheet\" type=\"text\/css\" href=\"\/\/'+_updater.CDN+'\/Jiiks\/BetterDiscordApp\/'+_hash+'\/css\/main.min.css\">\' ) }');
 
-
-      //self.getUtils().execJs('function injectCss() { $(\'head\').append(\'<link rel=\"stylesheet\" type=\"text\/css\" href=\"https:\/\/rawgit.com\/Jiiks\/BetterDiscordApp\/master\/css\/main.min.css\">\') }');
         self.getUtils().execJs('var deferCount = 0; function defer() { if(window.jQuery) { injectMainCss() } else { setTimeout( function() { if(deferCount < 100) { deferCount++; defer(); } else { alert("BetterDiscord failed to load :( try restarting Discord. code:0x01"); } }, 100 ); } } deferCount = 0; defer();');
 
         self.getUtils().injectJavaScript("//cdnjs.cloudflare.com/ajax/libs/jquery-cookie/1.4.1/jquery.cookie.min.js", true);
-        self.getUtils().injectJavaScript("//" + _updater.CDN + "/Jiiks/BetterDiscordApp/"+_hash+"/js/main.min.js", true);
+        self.getUtils().injectJavaScript("//" + _updater.CDN + "/Jiiks/BetterDiscordApp/"+_hash+"/js/main.js", true);
+
+
+        self.getUtils().download("//" + _updater.CDN + "/Jiiks/BetterDiscordApp/"+_hash+"/js/emotedata_twitch.js", function(emotedata) {
+            self.getUtils().execJs("emotesTwitch = " + emotedata);
+        });
+
+        self.getUtils().download("//" + _updater.CDN + "/Jiiks/BetterDiscordApp/"+_hash+"/js/emotedata_ffz.js", function(emotedata) {
+            self.getUtils().execJs("emotesFfz = " + emotedata);
+        });
 
         //Start BDA
-        self.getUtils().execJs("var mainCore; var startBda = function() { mainCore = new Core(); mainCore.init(); }");
+        self.getUtils().execJs('var mainCore; var startBda = function() { $("#twitchcord-button-container").ready(function() { console.log("its ready now"); }); mainCore = new Core(); mainCore.init(); }');
         self.getUtils().execJs("function startDefer() { if(window.Core && window.jQuery && $.cookie){ startBda(); } else { setTimeout(function() { startDefer(); }, 100) } } startDefer(); ")
     });
 
diff --git a/lib/config.json b/lib/config.json
index fd032163..60043e50 100644
--- a/lib/config.json
+++ b/lib/config.json
@@ -1,6 +1,6 @@
 {
   "Core": {
-    "Version": "0.1.2"
+    "Version": "0.1.3"
   },
   "EmoteModule": {
     "Twitch":{