From fa243d5303c9287d4cafd90a5f6b329ee09ba735 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Thu, 20 Jun 2013 00:42:20 -0400
Subject: [PATCH] fixes

---
 www/assets/js/ui.js   | 14 ++++++++++++++
 www/assets/js/util.js | 12 ++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/www/assets/js/ui.js b/www/assets/js/ui.js
index 7c4e0c22..2eaabba7 100644
--- a/www/assets/js/ui.js
+++ b/www/assets/js/ui.js
@@ -9,6 +9,16 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
+/* window focus/blur */
+$(window).focus(function() {
+    FOCUSED = true;
+    clearInterval(TITLE_BLINK);
+    TITLE_BLINK = false;
+    document.title = PAGETITLE;
+}).blur(function() {
+    FOCUSED = false;
+});
+
 /* Generalized show/hide function */
 function generateToggle(chevron, div) {
     $(chevron).click(function() {
@@ -29,6 +39,7 @@ function generateToggle(chevron, div) {
 
 /* setup show/hide toggles */
 generateToggle("#usercountwrap", "#userlist");
+$("#usercountwrap").click(scrollChat);
 generateToggle("#librarytoggle", "#librarywrap");
 generateToggle("#userpltoggle", "#userplaylistwrap");
 generateToggle("#playlisttoggle", "#playlist_controls");
@@ -57,6 +68,9 @@ $("#logout").click(function() {
 });
 
 /* chatbox */
+$("#messagebuffer").mouseenter(function() { SCROLLCHAT = false; });
+$("#messagebuffer").mouseleave(function() { SCROLLCHAT = true; });
+
 $("#chatline").keydown(function(ev) {
     if(ev.keyCode == 13) {
         var msg = $("#chatline").val();
diff --git a/www/assets/js/util.js b/www/assets/js/util.js
index 1ff525a1..d8cfaee6 100644
--- a/www/assets/js/util.js
+++ b/www/assets/js/util.js
@@ -283,7 +283,8 @@ function rebuildPlaylist() {
 
 /* menus */
 function showOptionsMenu() {
-    PLAYER.hide();
+    if(PLAYER)
+        PLAYER.hide();
     var modal = $("<div/>").addClass("modal hide fade")
         .appendTo($("body"));
     var head = $("<div/>").addClass("modal-header")
@@ -426,7 +427,8 @@ function showOptionsMenu() {
     });
 
     modal.on("hidden", function() {
-        PLAYER.unhide();
+        if(PLAYER)
+            PLAYER.unhide();
         applyOpts();
         modal.remove();
     });
@@ -509,7 +511,8 @@ function applyOpts() {
 applyOpts();
 
 function showLoginMenu() {
-    PLAYER.hide();
+    if(PLAYER)
+        PLAYER.hide();
     var modal = $("<div/>").addClass("modal hide fade")
         .appendTo($("body"));
     var head = $("<div/>").addClass("modal-header")
@@ -580,7 +583,8 @@ function showLoginMenu() {
     }
     var footer = $("<div/>").addClass("modal-footer").appendTo(modal);
     modal.on("hidden", function() {
-        PLAYER.unhide();
+        if(PLAYER)
+            PLAYER.unhide();
         modal.remove();
     });
     modal.modal();