caboose-cms 0.8.50 → 0.8.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11ccf530449523a7c1acc40056546a113ea02603
-  data.tar.gz: 46446d0c93c7a5a8ba9e4e95c58fa50ed810abae
+  metadata.gz: 8a4aad5fd207db5f2deb5a57391e8da46c926966
+  data.tar.gz: affde0cc83a0a9a3c470779c4d3e9a825bdfe4db
 SHA512:
-  metadata.gz: eee9bdeb8df4a068b3fab66d6b8c775ca29c699d01074c099eb2bac0fcbdd33a5b8b79be3a4ef37698bc01f7231fd67e15e5e8f35c80ce6f6ee3abdda8a644ce
-  data.tar.gz: 9721bd6f8b12ec8c789126c0fbf8a9bf424c572dc3bb5a20a78c6db1d4cb5729f888736a058d04b0b915cb44e87a102035c4f9403d74bb8840f18f4415583bcc
+  metadata.gz: 2711f20fa46a45ccb0b7d3d94caf218878e43e5da840c74a0c93d86fc91c6b0f5416f20880e2180e2c07c604955ec439863f0648b88cb5936c718c4c5e52dc91
+  data.tar.gz: 67a19e2eb4b842ee3a67a206fc82153a8445f88ba648295d6d4d726313a931daaa0936e1ff222bccf78081d4477d90d5b16e56d52555fda827c355e92583387a

data/app/assets/javascripts/caboose/admin_media_index.js

@@ -6,7 +6,8 @@ MediaController.prototype = {
   top_cat_id: false,
   cat: false,
   cat_id: false,
-  categories: false,  
+  categories: false,
+  media: false,
   s3_upload_url: false,
 	aws_access_key_id: false,		
 	policy: false,
@@ -43,6 +44,39 @@ MediaController.prototype = {
     that.refresh_media();
     that.print_controls();    
   },
+  
+  refresh_categories: function(after) 
+  {
+    var that = this;
+    $.ajax({
+      url: '/admin/media-categories/flat-tree',
+      type: 'get',
+      async: false,      
+      success: function(resp) { 
+        that.categories = resp;
+        if (!that.cat_id)
+          that.cat_id = that.categories[0].id;
+        that.print_categories();
+        if (after) after();
+      }        
+    });
+  },
+  
+  refresh_media: function() 
+  {
+    var that = this;
+    $.ajax({
+      url: '/admin/media/json',
+      type: 'get',
+      async: false,
+      data: { media_category_id: that.cat_id },
+      success: function(resp) {
+        that.media = resp;        
+        that.selected_media = [];
+        that.print_media();                
+      }        
+    });
+  },
 
   change_sort_order: function(list) {
     var that = this;
@@ -162,41 +196,7 @@ MediaController.prototype = {
       $("#the_uploader").slideDown();      
     }
   },
-    
-  refresh_categories: function(after) 
-  {
-    var that = this;
-    $.ajax({
-      url: '/admin/media-categories/flat-tree',
-      type: 'get',
-      async: false,      
-      success: function(resp) { 
-        that.categories = resp;
-        if (!that.cat_id)
-          that.cat_id = that.categories[0].id;
-        that.print_categories();
-        if (after) after();
-      }        
-    });
-  },
-  
-  refresh_media: function() 
-  {
-    var that = this;
-    $.ajax({
-      url: '/admin/media/json',
-      type: 'get',
-      async: false,
-      data: { media_category_id: that.cat_id },
-      success: function(resp) {
-        that.cat = resp;
-        that.cat_id = that.cat.id;
-        that.selected_media = [];
-        that.print_media();                
-      }        
-    });
-  },
-  
+        
   check_processing_status: function() 
   {     
     var that = this;
@@ -306,9 +306,9 @@ MediaController.prototype = {
     var that = this;
     var ul = $('<ul/>');
     var processing = false;
-    if (that.cat.media.length > 0)
+    if (that.media.length > 0)
     {      
-      $.each(that.cat.media, function(i, m) {
+      $.each(that.media, function(i, m) {
         if (m.media_type == 'image' && m.processed == false)
           processing = true
         var li = $('<li/>')
@@ -345,7 +345,7 @@ MediaController.prototype = {
       setTimeout(function() { that.check_processing_status(); }, 2000);
     }
     
-    $.each(that.cat.media, function(i, m) {
+    $.each(that.media, function(i, m) {
       $('li.media').draggable({
         multiple: true,
         revert: 'invalid',
@@ -381,7 +381,7 @@ MediaController.prototype = {
     
     // See if they're all selected
     var all_selected = true;
-    $.each(that.cat.media, function(i, m) {
+    $.each(that.media, function(i, m) {
       if (that.selected_media.indexOf(m.id) == -1)
       {
         all_selected = false
@@ -396,7 +396,7 @@ MediaController.prototype = {
     // And re-select everything if not everything was previously selected
     if (!all_selected)
     {
-      $.each(that.cat.media, function(i, m) {
+      $.each(that.media, function(i, m) {
         $('#media' + m.id).addClass('selected ui-selected');
         that.selected_media[i] = m.id;
       });
@@ -489,7 +489,7 @@ MediaController.prototype = {
       url: '/admin/media-categories',
       type: 'post',
       data: {
-        parent_id: that.cat.id,
+        parent_id: that.cat_id,
         name: name
       },
       success: function(resp) {
@@ -533,9 +533,9 @@ MediaController.prototype = {
   {
     var that = this;
     var m = false;
-    if (that.cat.media.length > 0)
+    if (that.media.length > 0)
     {      
-      $.each(that.cat.media, function(i, m2) {        
+      $.each(that.media, function(i, m2) {        
         if (parseInt(m2.id) == parseInt(media_id))
         {
           m = m2;

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.50'
+  VERSION = '0.8.51'
 end

metadata

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