From 85f129c7381748c5e2343c1e6dcd32deb18a0b36 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 23 Jun 2013 11:02:53 -0400
Subject: [PATCH] fixes #358 - Weather validation in Server configuration

---
 ApiClient.js                           | 18 ------------------
 dashboard-ui/clientsettings.html       | 14 --------------
 dashboard-ui/scripts/clientsettings.js |  4 ----
 packages.config                        |  2 +-
 4 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/ApiClient.js b/ApiClient.js
index 31d11c9451..f047501d29 100644
--- a/ApiClient.js
+++ b/ApiClient.js
@@ -1245,24 +1245,6 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
             });
         };
 
-        /**
-         * Gets weather info
-         * @param {String} location - us zip code / city, state, country / city, country
-         * Omit location to get weather info using stored server configuration value
-         */
-        self.getWeatherInfo = function (location) {
-
-            var url = self.getUrl("weather", {
-                location: location
-            });
-
-            return self.ajax({
-                type: "GET",
-                url: url,
-                dataType: "json"
-            });
-        };
-
         /**
          * Gets all users from the server
          */
diff --git a/dashboard-ui/clientsettings.html b/dashboard-ui/clientsettings.html
index 6f1fa13e24..af0a25e0cf 100644
--- a/dashboard-ui/clientsettings.html
+++ b/dashboard-ui/clientsettings.html
@@ -11,20 +11,6 @@
                 <form id="clientSettingsForm">
 
                     <ul data-role="listview" class="ulForm">
-                        <li>
-                            <label for="txtWeatherLocation">Weather location: </label>
-                            <input id="txtWeatherLocation" name="txtWeatherLocation" type="text" />
-                            <div class="fieldDescription">
-                                US zip code / City, State, Country / City, Country
-                            </div>
-                        </li>
-                        <li>
-                            <label for="selectWeatherUnit">Weather display unit: </label>
-                            <select id="selectWeatherUnit" name="selectWeatherUnit">
-                                <option value="Celsius">Celsius</option>
-                                <option value="Fahrenheit">Fahrenheit</option>
-                            </select>
-                        </li>
                         <li>
                             <label for="txtMinResumePct">Min resume percentage: </label>
                             <input type="number" id="txtMinResumePct" name="txtMinResumePct" pattern="[0-9]*" required="required" min="0" max="100" />
diff --git a/dashboard-ui/scripts/clientsettings.js b/dashboard-ui/scripts/clientsettings.js
index 0b97bd465f..f6340bdf00 100644
--- a/dashboard-ui/scripts/clientsettings.js
+++ b/dashboard-ui/scripts/clientsettings.js
@@ -8,11 +8,9 @@
 
         ApiClient.getServerConfiguration().done(function (config) {
 
-            $('#txtWeatherLocation', page).val(config.WeatherLocation);
             $('#txtMinResumePct', page).val(config.MinResumePct);
             $('#txtMaxResumePct', page).val(config.MaxResumePct);
             $('#txtMinResumeDuration', page).val(config.MinResumeDurationSeconds);
-            $('#selectWeatherUnit', page).val(config.WeatherUnit).selectmenu("refresh");
 
             $('input:first', page).focus();
 
@@ -31,8 +29,6 @@
 
             ApiClient.getServerConfiguration().done(function (config) {
 
-                config.WeatherLocation = $('#txtWeatherLocation', form).val();
-                config.WeatherUnit = $('#selectWeatherUnit', form).val();
                 config.MinResumePct = $('#txtMinResumePct', form).val();
                 config.MaxResumePct = $('#txtMaxResumePct', form).val();
                 config.MinResumeDurationSeconds = $('#txtMinResumeDuration', form).val();
diff --git a/packages.config b/packages.config
index 1d3d4e10f6..fa2c717016 100644
--- a/packages.config
+++ b/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.124" targetFramework="net45" />
+  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.125" targetFramework="net45" />
   <package id="ServiceStack.Common" version="3.9.54" targetFramework="net45" />
   <package id="ServiceStack.Text" version="3.9.54" targetFramework="net45" />
 </packages>
\ No newline at end of file