more settings

Author: mkaminsky11

index.html

@@ -141,6 +141,25 @@ <h6>
 						<select id="font-select" onchange="settings.fontChange()">
 						</select>
 					</div>
+					
+					<div class="select-box">
+					  <p>Indent Size</p>
+					  <span><i class="fa fa-caret-down"></i></span>
+					  <select id="indent-size-select" onchange="settings.indentUnitChange()">
+					    <option value="1">1 char</option>
+					    <option value="2">2 chars</option>
+					    <option value="4">4 chars</option>
+					    <option value="8">8 chars</option>
+						</select>
+					</div>
+					
+					<div class="select-box select-box-small">
+						<p>Indent With Tabs</p>
+						<label class="check-switch" id="side-indent-tabs-label">
+						    <input type="checkbox" id="side-indent-tabs" checked>
+						    <span onclick="settings.indentWithTabsChange()"></span>
+						</label>	
+					</div>
 
 					<div class="select-box select-box-small">
 						<p>Line Numbers</p>

js/broadcast.js

@@ -18,10 +18,15 @@ broadcast.init = function(){
 };
 
 broadcast.show = function(){
-	$("#broadcast").css("opacity",0).css("display","block");
-	window.setTimeout(function(){
-		$("#broadcast").velocity("transition.bounceUpIn");
-	}, 500);
+	if($("#broadcast").css("display") === "none"){
+		$("#broadcast").css("opacity",0).css("display","block");
+		window.setTimeout(function(){
+			$("#broadcast").velocity("transition.bounceUpIn");
+		}, 500);
+	}
+	else{
+		$("#broadcast").velocity("callout.bounce");
+	}
 };
 
 broadcast.close = function(){
@@ -32,6 +37,14 @@ broadcast.close = function(){
 	});
 };
 
+broadcast.minimapWarn = function(){
+	
+}
+
+broadcast.reset = function(){
+	$("#broadcast > div").css("display","none");
+}
+
 broadcast.ad_ok = function(){
 	connection.send(JSON.stringify({type:"survey",vote:"yes"}));
 }

js/editor.js

@@ -244,7 +244,7 @@ for(var j = 0; j < themes.length; j++){
 
 //populates the font select
 for(var k = 2; k <= 30; k++){
-	$("#font-select").html($("#font-select").html() + "<option value='" + k + "'>" + k + "</option>");
+	$("#font-select").html($("#font-select").html() + "<option value='" + k + "'>" + k + "px</option>");
 }
 
 //sets default settings
@@ -317,6 +317,30 @@ settings.font = function(size){
 	$(".CodeMirror").css("fontSize", size +"px");
 }
 
+settings.indentUnitChange = function(){
+  settings.indentUnit(parseInt($("#indent-size-select").val()));
+  settings.change();
+}
+
+settings.indentUnit = function(size){
+  for(var i = 0; i < editors.length; i++){
+		editors[i].editor.setOption("indentUnit",size);
+	}
+  this.state.indentUnit = size;
+}
+
+settings.indentWithTabsChange = function(){
+  settings.indentWithTabs();
+  settings.change();
+}
+
+settings.indentWithTabs = function(){
+	this.state.indentWithTabs = !this.state.indentWithTabs;
+	for(var i = 0; i < editors.length; i++){
+		editors[i].editor.setOption("indentWithTabs", this.state.indentWithTabs);
+	}
+}
+
 settings.init = function(){
   connect.settings.getSettings(function(prefs){
     //theme
@@ -326,12 +350,21 @@ settings.init = function(){
     $("#font-select").val(prefs.fontSize);
     settings.font(prefs.fontSize);
     //
+    $("#indent-size-select").val(prefs.indentUnit);
+    settings.indentUnit(prefs.indentUnit);
+    //
+    if(prefs.indentWithTabs !== settings.state.indentWithTabs){
+      $("#side-indent-tabs").prop("checked", !$("#side-indent-tabs").prop("checked"));
+    }
+    //
     if(prefs.minimap !== settings.state.minimap){
       $("#side-minimap").prop("checked", !$("#side-minimap").prop("checked"));
     }
+    //
     if(prefs.lineNumbers !== settings.state.lineNumbers){
       $("#side-nums").prop("checked", !$("#side-nums").prop("checked"));
     }
+    //
     if(prefs.lineWrap !== settings.state.lineWrap){
       $("#side-wrap").prop("checked", !$("#side-wrap").prop("checked"));
     }
@@ -358,7 +391,9 @@ settings.state = {
 	lineWrap: true,
 	minimap: false,
 	fontSize: 12,
-	theme: "monokai"
+	theme: "monokai",
+	indentUnit: 4,
+	indentWithTabs: true
 };
 
 /**

js/ready.js

@@ -13,11 +13,11 @@ $(document).ready(function(){
 		mode: "text",
     	theme: settings.state.theme,
     	lineWrapping: settings.state.lineWrap, 
-    	indentUnit: 4, 
-    	indentWithTabs: true,
+    	indentUnit: settings.state.indentUnit, 
+    	indentWithTabs: settings.state.indentWithTabs,
     	foldGutter: true,
-		gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
-	  minimap: settings.state.minimap
+		  gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
+	    minimap: settings.state.minimap
 	});
 	//sets the introduction text
 	var txtFile = new XMLHttpRequest();