From d62b398a839a86b0d02d688a2006f69a41861098 Mon Sep 17 00:00:00 2001
From: apandada1 <apandada1@gmail.com>
Date: Mon, 20 Jan 2014 19:22:44 +0530
Subject: [PATCH] Don't render when .settings is clicked

---
 script.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/script.js b/script.js
index 294f44a..9a37d75 100644
--- a/script.js
+++ b/script.js
@@ -9,7 +9,7 @@ $(function() {
 		win = gui.Window.get()
 		win.show()
 		//win.showDevTools()
-        document.title = "Typhoon"
+		document.title = "Typhoon"
 
 		//Bind Handlers
 		$(".minimize").click(function() {
@@ -111,6 +111,7 @@ function generateStats(data, callback) {
 
 function render(location) {
 	$('.border .sync').addClass('busy');
+	$(".border .settings").show()
 
 	getWeatherData(location, function(rawdata) {
 		generateStats(rawdata, function(weather) {
@@ -302,19 +303,19 @@ $(document).ready(function() {
 });
 
 function init_settings() {
-    
+
 
 	//Prevents Dragging on certain elements
 	$('.border .settings, .border .sync, .border .close, .border .minimize, #locationModal, #errorMessage').click(function() {
 		if ($(this).hasClass("close")) {
-            window.close()
+			window.close()
 		} else if ($(this).hasClass("settings")) {
 			show_settings("all")
 		} else if ($(this).hasClass("sync")) {
 			render(localStorage.typhoon)
 		}
 	})
-    $('body').on("click", "a", function(e) {
+	$('body').on("click", "a", function(e) {
 			e.preventDefault()
 			gui.Shell.openExternal($(e.currentTarget).attr("href"))
 		})
@@ -329,7 +330,7 @@ function init_settings() {
 	    typingTimer = setTimeout(doneTyping, doneTypingInterval)
 	}).keydown(function(){
 	//on keydown, clear the countdown
-	    clearTimeout(typingTimer)
+		clearTimeout(typingTimer)
 	});
 
 	function doneTyping() {
@@ -368,12 +369,16 @@ function init_settings() {
 	$('#locationModal .toggleswitch span').click(function() {
 		$(this).parent().children().removeClass('selected')
 		localStorage.setItem("typhoon_" + $(this).parent().attr("class").replace("toggleswitch ", ""), $(this).addClass('selected').attr("data-type"))
+		$(".border .settings").hide()
 	})
 
 	//Color thing
 	$('.color span').click(function() {
 		localStorage.typhoon_color = $(this).attr("data-color")
 		background(null)
+		$('.color span[data-color=gradient]').click(function() {
+		$(".border .settings").hide()
+		})
 	})
 
 	//Control CSS
@@ -393,13 +398,6 @@ function show_settings(amount) {
 		$("#locationModal .full").hide()
 	}
 
-	if ($('#locationModal').css('display') != 'none') {
-		//We do a render instead
-		$(".border .sync").click()
-		$("#locationModal").fadeOut(350)
-		return;
-	}
-
 	//Show the Modal
 	$("#locationModal").fadeToggle(350)
 	if (amount != "noweather") {