caboose-cms 0.9.90 → 0.9.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8db1d5dd7b28bb3c07904747001fc0057bcbd240
-  data.tar.gz: 0441edec2da5b23eeb8791ae95412b5d67c3aed2
+  metadata.gz: 99839730ea370085978e97d59472d8cf8f865d14
+  data.tar.gz: e96993941de7a4617bcfa774260f0325b52d2f95
 SHA512:
-  metadata.gz: e6cab2ac89d12cceeb46d228c5390c4897769caea0eb5c550c7774047c373de126ac3c8521efea95966abfa89bc582bc2b7a59ec00f7e0e4c84bf23aaf426d62
-  data.tar.gz: 8a6895eb6dc5b837a80f52726d8cd9c8dad6fd82b4c0fe1ecf619138c68a7b88e53eaffc925e4f3ef57b908b9f9a32a6323f420346db9f2da153ebca52807b3d
+  metadata.gz: 0b1b04cf4e4733518d28a41e726dce56da82ab6af368af1e011b7b19852f2a56bcbca601bc9ae550f7e07126474bbc088b5667741211fe60d8083d1466e2edb7
+  data.tar.gz: 628e14e0078e2ea8a64497d441a2c36dd0c2105c4dbe0ecbbf0dec059a35699c470309dfc37c416d5b5b5497788610c827ffae92a573a6597f854aed841234bd

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

@@ -17,6 +17,8 @@ MediaController.prototype = {
   allow_edit: false,
   feather_editor: false,  
   last_upload_processed: false,
+  ajax_count: 0,
+  ajax_limit: 20,
   
   init: function(params) {
     var that = this;
@@ -180,6 +182,7 @@ MediaController.prototype = {
           },          
           UploadComplete: function(up, files) {
             that.refresh();
+            that.ajax_count = 0;
             if (that.uploader)
             {
               $("#the_uploader").slideUp(400, function() {
@@ -197,21 +200,24 @@ MediaController.prototype = {
   check_processing_status: function() 
   {     
     var that = this;
+    console.log("ajax count: " + that.ajax_count + " out of " + that.ajax_limit);
     if (!that.last_upload_processed)
       that.last_upload_processed = new Date();
-        
-    $.ajax({
-      url: '/admin/media/last-upload-processed',
-      type: 'get',            
-      success: function(resp) {                
-        var d = Date.parse(resp['last_upload_processed']);        
-        if (d > that.last_upload_processed)          
-          that.refresh_media();          
-        else
-          setTimeout(function() { that.check_processing_status(); }, 2000);          
-        that.last_upload_processed = d;                                                        
-      }        
-    });
+    if ( that.ajax_count < that.ajax_limit ) {
+      $.ajax({
+        url: '/admin/media/last-upload-processed',
+        type: 'get',            
+        success: function(resp) {
+          that.ajax_count += 1;
+          var d = Date.parse(resp['last_upload_processed']);        
+          if (d > that.last_upload_processed)          
+            that.refresh_media();          
+          else
+            setTimeout(function() { that.check_processing_status(); }, 3000);          
+          that.last_upload_processed = d;                                                        
+        }
+      });
+    }
   },
     
   print_categories: function() 
@@ -357,7 +363,7 @@ MediaController.prototype = {
     if (that.refresh_unprocessed_images == true && processing)
     {
       //setTimeout(function() { that.refresh_media(); }, 2000);
-      setTimeout(function() { that.check_processing_status(); }, 2000);
+      setTimeout(function() { that.check_processing_status(); }, 3000);
     }
     
     $.each(that.media, function(i, m) {

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.90'
+  VERSION = '0.9.91'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.90
+  version: 0.9.91
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg