From 1cd194bbfb292c26566205241d7fdf5dc73b3f11 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 7 Nov 2013 11:48:46 -0500
Subject: [PATCH] fix metadata editor tree redirect

---
 dashboard-ui/edititemmetadata.html       |  2 +-
 dashboard-ui/scripts/edititemmetadata.js |  9 ++++++++-
 dashboard-ui/scripts/librarybrowser.js   | 10 +++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html
index d3d770e265..bf5ad539c6 100644
--- a/dashboard-ui/edititemmetadata.html
+++ b/dashboard-ui/edititemmetadata.html
@@ -326,7 +326,7 @@
                         </div>
                         <ul id="ulSave" data-role="listview" class="ulForm" style="display: none;">
                             <li>
-                                <button type="submit" data-theme="b" data-icon="ok">
+                                <button id="btnSave" type="submit" data-theme="b" data-icon="ok">
                                     Save
                                 </button>
                             </li>
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 343ae68b3f..09d9975112 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -351,6 +351,7 @@
 
             $('#btnRefresh', page).button('enable');
             $('#btnDelete', page).button('enable');
+            $('#btnSave', page).button('enable');
 
             $('#refreshLoading', page).hide();
 
@@ -1193,6 +1194,7 @@
 
             $('#btnDelete', page).button('disable');
             $('#btnRefresh', page).button('disable');
+            $('#btnSave', page).button('disable');
 
             $('#refreshLoading', page).show();
 
@@ -1237,13 +1239,18 @@
 
                     $('#btnDelete', page).button('disable');
                     $('#btnRefresh', page).button('disable');
+                    $('#btnSave', page).button('disable');
 
                     $('#refreshLoading', page).show();
 
+                    var parentId = currentItem.ParentId;
+                    
                     ApiClient.deleteItem(currentItem.Id).done(function () {
 
-                        Dashboard.navigate('edititemmetadata.html?id=' + currentItem.ParentId);
+                        var elem = $('#' + parentId)[0];
 
+                        $('.libraryTree').jstree("select_node", elem, true)
+                            .jstree("delete_node", '#' + currentItem.Id);
                     });
                 }
 
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index b4d19ba04a..f34c655f1c 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -20,14 +20,14 @@
 
         loadSavedQueryValues: function (key, query) {
 
-            var values = localStorage.getItem(key + '_' + Dashboard.getCurrentUserId());
+            //var values = localStorage.getItem(key + '_' + Dashboard.getCurrentUserId());
 
-            if (values) {
+            //if (values) {
 
-                values = JSON.parse(values);
+            //    values = JSON.parse(values);
 
-                return $.extend(query, values);
-            }
+            //    return $.extend(query, values);
+            //}
 
             return query;
         },