From 06cbe215a32be04f99f41a6eb8947d4e721ade95 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Fri, 2 Dec 2011 17:49:48 +0100
Subject: [PATCH] CC-3149: Playlist Builder, fix JS for editing
 title/description

---
 airtime_mvc/public/js/airtime/library/spl.js | 38 ++++++++++++--------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index 2b56d1686..c0957b805 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -364,21 +364,23 @@ function editName() {
     $("#playlist_name_input")
         .removeClass('element_hidden')
         .val(playlistName)
-        .blur(function(){
-            var input = $(this);
-            var url;
-	        url = '/Playlist/set-playlist-name';
+        .keydown(function(event){
+        	if(event.keyCode === 13) {
+                event.preventDefault();
+                var input = $(this);
+                var url;
+    	        url = '/Playlist/set-playlist-name';
 
-	        $.post(url, {format: "json", name: input.val()}, function(json){
-	            if(json.playlist_error == true){
-	                alertPlaylistErrorAndReload();
-	            }
-                input.addClass('element_hidden');
-                nameElement.text(json.playlistName);
-                redrawDataTablePage();
-	        });
+    	        $.post(url, {format: "json", name: input.val()}, function(json){
+    	            if(json.playlist_error == true){
+    	                alertPlaylistErrorAndReload();
+    	            }
+                    input.addClass('element_hidden');
+                    nameElement.text(json.playlistName);
+                    redrawDataTablePage();
+    	        });
+        	}
         })
-        .keydown(submitOnEnter)
         .focus();
 }
 
@@ -441,9 +443,12 @@ function setUpSPL() {
         $.post(url, {format: "json", description: description}, function(json){
             if(json.playlist_error == true){
                 alertPlaylistErrorAndReload();
-            }else{
+            }
+            else{
                 textarea.val(json.playlistDescription);
             }
+            
+            $("#fieldset-metadate_change").addClass("closed");
         });
     });
 
@@ -455,9 +460,12 @@ function setUpSPL() {
         $.post(url, {format: "json"}, function(json){
             if(json.playlist_error == true){
                 alertPlaylistErrorAndReload();
-            }else{
+            }
+            else{
                 textarea.val(json.playlistDescription);
             }
+            
+            $("#fieldset-metadate_change").addClass("closed");
         });
     });