caboose-cms 0.8.48 → 0.8.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 255ce561d2226d8422e2e477ee76ade15ab27146
-  data.tar.gz: d75dcb17753fd76a2d00942451d4a97a5751bef0
+  metadata.gz: 091f82cc86810f3dab7c831b57ea71393e58978d
+  data.tar.gz: 3e142f512d2060fb6093cf17affd4b3534957da1
 SHA512:
-  metadata.gz: 65b464bd6815b6b5ca88f6f01ce658485d4e36f229b90a1471b8303cde91aa900273e0b7be1e48ffa2b6fe536863c32877611f6776f95f3e95b3d1edb8df4f12
-  data.tar.gz: 346a1741c2eb97ffc1f6d49e19c03c36cd605279113e7abef9a8a3a3302c96179e74039482e56c06f585ec6ae2d6f08bd60c63479ec6a789d248fefce98ae3c6
+  metadata.gz: 5bd3a7fe332320c2e14984633f9d912d3ef8644a39563fa618bb028e0af3bf98b216791c83869b2c9a10dec49a4be6d6e7ac3ba3ada0c3e92ae3be824b14b9df
+  data.tar.gz: ed842f7437da1cab3409725e6e74202337cd7cef536609add106f249393801ccc0735e865313fc2f6eccbe150541309c0ca69afb18f99d7463c9b243c1105b6f

data/app/assets/javascripts/caboose/block_modal_controllers/media_modal_controller.js

@@ -104,14 +104,15 @@ var MediaModalController = DefaultBlockModalController.extend({
   {
     var that = this;
     
-    var select = $('<select/>').attr('id', 'categories').change(function(e) {             
-      that.select_category($(this).val()); 
-    });   
-    that.print_categories_helper(that.top_category, select, '');
+    //var select = $('<select/>').attr('id', 'categories').change(function(e) {             
+    //  that.select_category($(this).val()); 
+    //});   
+    //that.print_categories_helper(that.top_category, select, '');
     
     var div = $('<div/>').attr('id', 'top_controls')
       .append($('<p/>')
-        .append(select).append(' | ')
+        //.append(select).append(' | ')
+        .append($('<select/>').attr('id', 'categories')).append(' | ')        
         .append($('<a/>').attr('href', '#').html('New Category'                                                 ).click(function(e) { e.preventDefault(); that.add_category();     })).append(' | ')              
         .append($('<a/>').attr('href', '#').html('Upload to this Category'                                      ).click(function(e) { e.preventDefault(); that.toggle_uploader();  })).append(' | ')
         .append($('<a/>').attr('href', '#').html(that.file_view == 'thumbnail' ? 'List View' : 'Thumbnail View' ).click(function(e) { e.preventDefault(); that.toggle_file_view(); }))
@@ -119,7 +120,18 @@ var MediaModalController = DefaultBlockModalController.extend({
       .append($('<div/>').attr('id', 'new_cat_message'))              
       .append($('<div/>').attr('id', 'uploader'   ).append($('<div/>').attr('id', 'the_uploader')));     
             
-    $('#top_controls').replaceWith(div);              
+    $('#top_controls').replaceWith(div);
+    that.print_categories();
+  },
+  
+  print_categories: function()
+  {
+    var that = this;
+    var select = $('<select/>').attr('id', 'categories').change(function(e) {             
+      that.select_category($(this).val()); 
+    });   
+    that.print_categories_helper(that.top_category, select, '');
+    $('#categories').replaceWith(select);
   },
   
   print_categories_helper: function(cat, select, prefix) 
@@ -303,11 +315,11 @@ var MediaModalController = DefaultBlockModalController.extend({
               success: function(resp) {},
               async: false          
             });
-            that.refresh_media(function() { that.refresh_categories(function() { that.print(); }); });
+            that.refresh_media(function() { that.refresh_categories(function() { that.print_categories(); that.print_media(); }); });
           },   
           FileUploaded: function(ip, file)
           {
-            that.refresh_media(function() { that.refresh_categories(function() { that.print(); }); });            
+            that.refresh_media(function() { that.refresh_categories(function() { that.print_media(); }); });            
           },          
           UploadComplete: function(up, files) {
             that.refresh_media(function() { that.refresh_categories(function() { that.print(); }); });

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.48'
+  VERSION = '0.8.49'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.48
+  version: 0.8.49
 platform: ruby
 authors:
 - William Barry