adds option to disable twitchify emotes attached to #9198

Tokanova · Apr 2, 2016 · 946a8f9 · 946a8f9
1 parent a230203
commit 946a8f9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/goon/browserassets/html/browserOutput.html b/goon/browserassets/html/browserOutput.html
@@ -33,6 +33,7 @@
 		<div id="options">
 			<a href="#" class="toggle" id="toggleOptions" title="Options"><i class="icon-cog"></i></a>
 			<div class="sub" id="subOptions">
+				<a href="#" id="toggleEmotes" class="toggleEmotes"><span>Toggle Emotes</a>
 				<a href="#" class="decreaseFont" id="decreaseFont"><span>Decrease font size</span> <i class="icon-font">-</i></a>
 				<a href="#" class="increaseFont" id="increaseFont"><span>Increase font size</span> <i class="icon-font">+</i></a>
 				<a href="#" class="chooseFont" id="chooseFont">Change font <i class="icon-font"></i></a>
@@ -45,4 +46,4 @@
 	</div>
 	<script type="text/javascript" src="browserOutput.js"></script>
 </body>
-</html>
+</html>
diff --git a/goon/browserassets/js/browserOutput.js b/goon/browserassets/js/browserOutput.js
@@ -849,6 +849,14 @@ $(function() {
 		}
 		setCookie('pingdisabled', (opts.pingDisabled ? 'true' : 'false'), 365);
 	});
+
+	$('.toggleEmotes').click(function(e) {
+		if(opts.enableTwitchify) {
+			opts.enableTwitchify = false;
+		} else {
+			opts.enableTwitchify = true;
+		}
+	});
 
 	$('#saveLog').click(function(e) {
 		var saved = '';
@@ -962,4 +970,4 @@ $(function() {
 	}
 	$('#userBar').show();
 	opts.priorChatHeight = $(window).height();
-});
+});