1 files changed, 22 insertions, 1 deletions

diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 42035a595..ebd9da2f8 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -22,6 +22,9 @@ var dw_mediamanager = {
     size: false,
     forbidden_opts: {},
 
+    // File list view type
+    view: false,
+
     init: function () {
         var $content, $tree;
         $content = jQuery('#media__content');
@@ -60,6 +63,7 @@ var dw_mediamanager = {
                        }});
         $tree.delegate('a', 'click', dw_mediamanager.list);
 
+        dw_mediamanager.set_filelist_view(dw_mediamanager.view, false);
         jQuery('#mediamanager__form_sort').find('input[type=submit]').hide();
         dw_mediamanager.image_diff();
 
@@ -322,12 +326,28 @@ var dw_mediamanager = {
         $content = jQuery('#mediamanager__file_list');
 
         if ($link[0].id == 'mediamanager__link_thumbs') {
+            dw_mediamanager.set_filelist_view('thumbs', true);
+
+        } else if ($link[0].id == 'mediamanager__link_list') {
+            dw_mediamanager.set_filelist_view('list', true);
+        }
+    },
+
+    set_filelist_view: function (type, cookies) {
+        var $content = jQuery('#mediamanager__file_list');
+        if (!type) type = DokuCookie.getValue('view');
+
+        if (type == 'thumbs') {
             $content.removeClass('mediamanager-list');
             $content.addClass('mediamanager-thumbs');
+            if (cookies) DokuCookie.setValue('view', 'thumbs');
+            dw_mediamanager.view = 'thumbs';
 
-        } else if ($link[0].id == 'mediamanager__link_list') {
+        } else if (type == 'list') {
             $content.removeClass('mediamanager-thumbs');
             $content.addClass('mediamanager-list');
+            if (cookies) DokuCookie.setValue('view', 'list');
+            dw_mediamanager.view = 'list';
         }
     },
 
@@ -395,6 +415,7 @@ var dw_mediamanager = {
                 dw_mediamanager.update_resizable(0);
                 addInitEvent(revisionsForm);
                 jQuery('#mediamanager__form_sort').find('input[type=submit]').hide();
+                dw_mediamanager.set_filelist_view(dw_mediamanager.view, false);
                 dw_mediamanager.image_diff();
             },
             'html'