caboose-cms 0.2.48 → 0.2.49

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDUzMTk2MWQ2ZmU5YmFjYzUwODdhMGI3ZjgyNzFmYzhkMDc3ZmUzYg==
+    YjM5MGEzZTBkZmZjMTlhMzE0YTI0NDk5NGViMzcxMzc1NGEwMWUwZQ==
   data.tar.gz: !binary |-
-    MmVkODUwZjhmYmEwYmJiMzkwMTNkZGNmYmQ5NGIxMjJiMmNlNmZhNA==
+    MjFmYTZiNTBlOTViNmUzNDIyMGNiOWNiNTY4M2I3MmI0YjY1NDA2OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODlmY2VlZjczODY3YjUwMmZmY2Q0NTkwNjg1OWFmNjczMzY2NjkzN2Q5YjA5
-    MGU5MGZiOTlkNWIxNGNlOTkxNjliY2I5YzA2YjEzNzRiZjUxMDY3ZmEyMzIz
-    N2ExMDVlNzAyMGY1MWU0YTNjZTE1NjZlODg5NWMwNmVkMjZjYTQ=
+    MzAzMTZkMTQzMjJmMDExOWYyMjQzNTg4NjkxNmVkOTdhMWYwM2FmZTZkOWVh
+    N2Q3ZjgyNTgxZTQzNzc2MjU0N2I0NmZmMjYyYTJmYmM4YWIyZDhlYTVmMzk1
+    ODcwZTM0NThkOTMxMjNkMjc3Nzc0Njg3NzEyNDdjOGZkNDg2NTM=
   data.tar.gz: !binary |-
-    YmI1M2FhOTc4NDRhYjkxZTNhZWUwYjBlNzU0NDM1ZjFkYTZjZGE1NGY3Zjk0
-    OTYwNjEwMzQ2NGQ2M2ViZTg3ODg5N2FmNTY5ZDNiYjU2NjY1Y2YyN2VmZjAw
-    MmVlZDYyOGRiNjNjYjcyMjEyZWYyNWRmMDhkYTMxYjIwNjdmOTk=
+    MTA3ODJlNmY4YmJhMDEwNDQ5Y2Y2MjA2ZWFhNjRhNjdiZGI1YjYwN2MzZmU1
+    NWNlOGY5YmVkZmE3OGNmZjIzMTViOTIxM2FiZWJmNmQ4YmQ2ZWRlZDU1ZGZk
+    ZjNhM2FkMTAwMDIyYjMwM2NjZGEyMTA4ZTNiNjVlNGJlYzc1YWY=

data/app/assets/javascripts/caboose/model/bound_richtext.js

@@ -35,8 +35,12 @@ BoundRichText = BoundControl.extend({
       }
       else
         $('#'+this2.el).removeClass('dirty');
-    });                             
-    $('#'+this.el).on('blur', function() { this2.save(); });
+    });
+    
+    setTimeout(function() { 
+      var ed = tinymce.EditorManager.get(this2.el);
+      ed.on('blur', function(e) { this2.save(); }); 
+    }, 1500);    
   },
   
   show_controls: function() {
@@ -135,3 +139,7 @@ BoundRichText = BoundControl.extend({
   }
   
 });
+
+BoundRichText.test1 = function() {
+  alert('Testing');
+};

data/app/models/caboose/page_bar_generator.rb

@@ -39,16 +39,11 @@ module Caboose
   	end
   	
   	def fix_desc
+  	  @options['desc'] = 0 and return if @options['desc'].nil?
   	  return if @options['desc'] == 1
   	  return if @options['desc'] == 0
-  	  if @options['desc'] == 'true'
-  	    @options['desc'] = 1
-  	    return
-  	  end
-  	  if @options['desc'] == 'false'
-  	    @options['desc'] = 1
-  	    return
-  	  end
+  	  @options['desc'] = 1 and return if @options['desc'] == 'true' || @options['desc'].is_a?(TrueClass)
+  	  @options['desc'] = 0 and return if @options['desc'] == 'false' || @options['desc'].is_a?(FalseClass)  	  
   	  @options['desc'] = @options['desc'].to_i 
   	end
   	
@@ -67,6 +62,7 @@ module Caboose
   	end
   	
   	def items  	    	  
+    	#return @options['model'].constantize.where(where).limit(limit).offset(offset).reorder(reorder).all
     	return @options['model'].constantize.where(where).limit(limit).offset(offset).reorder(reorder).all
   	end
   		
@@ -193,7 +189,7 @@ module Caboose
     end
     
     def reorder
-      str = "id" 
+      str = "id"
       if (!@options['sort'].nil? && @options['sort'].length > 0)
         str = "#{@options['sort']}"
       end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.48'
+  VERSION = '0.2.49'
 end

metadata

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