caboose-cms 0.3.23 → 0.3.24

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjRhNDNkZjU2Mjg1Yjc5ODg2ZGJjYjk5YzBjOTg2NWIwMDI2NWRjNg==
+    MTVlMDBhZjQ0MzU1OWEyMjUwNDcwZjNkMDE0MzJmMTU3NmQwYzcwZQ==
   data.tar.gz: !binary |-
-    NDUzODg4YzcyZmRjMzdiMjE2N2U3NmM0MDRjYWIxZTUxNTdiZDI0Ng==
+    NTE0NTFlMTgxYjMwZDZhYjI5Yjk5ZTVhMzBiMmYwODcyOWQzYTZhMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODhkMTgwZjkyYmJkMThmNjI2NTNkZDJjNjBiODk0ZWQxZWE3OGFiODRiZDVk
-    N2ZhNDBkMjM2MDRiOTQ4MjkxMGY0MDkxNDFkYTU0Y2U4ZjA1Y2M4MTgwMjhj
-    MGI3ZWQ1MjU1YmNjNWFmYmNkZjVmNzkzNWQ0ZmEyYjBkZGNkMjU=
+    N2Q5ZTAxNzdkZDAwZDNhM2M4N2RkNGQxOWZlODlkZjIxM2VkZWM1YTE1YmI0
+    MTQ5MTVkOTZhYWE3NjFlZThhZTgxYjkyZWIwOGQ4MTNmOTQ2ZjBjYTFhZGRh
+    ZGFlNWM5ZTVlNWIyYjljYzA1OTcwYzMyM2I4NjRiYTdjMGIyNDQ=
   data.tar.gz: !binary |-
-    MTk2MTc5MTQyZGU2NzdlYzc1OWRlOGFkZTRmNzNlZjA5YzM3YmFmM2M0MDRh
-    Y2U0NmMyYzQzZjFhNWViMmJmMjY4NmIzZTQ2ZmI1N2I1MDJmYmQ3ODE3Njlm
-    OWYwN2Y2MWU3ZTc3YWY2MTE4ZjFlMzEwYWQ5ODE1OGY2NmIxNmE=
+    NGZjYzdmZTliMTM4NDYwZDI3MTAyNTRjMzY3MWU5MTY4YTBhM2FmZjEzYTcw
+    YzcxZGZlNmUwODJlYTlkMWM5MDlhMjg5MDY1Njg2NTZiNTQzZDA3ODIxMWYy
+    ZTQ2MTI0ZDk4ODAyOGI0MWY5Mjg2MTU3ZjA2Y2JmNzk2YjQ0NTY=

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

@@ -23,7 +23,7 @@ Attribute.prototype = {
   
   update_url: false,
   options_url: false,
-  options: false,
+  options: false, 
   
   save: function(after) {
     if (this.before_update) this.before_update();    
@@ -51,7 +51,7 @@ Attribute.prototype = {
   
   populate_options: function(after) {
     if (!this.options_url)
-      return;
+      return;    
     if (this.options)
     {
       if (after) after();

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

@@ -48,7 +48,14 @@ BoundSelect = BoundControl.extend({
         .css('padding-left', '+=' + w)
         .css('width', '-=' + w);
     }
+    
+    //this.update_options();
       
+    //var this2 = this;
+    //this.attribute.populate_options(function() {
+    //  this2.print_options(this2);
+    //});    
+    
     var this2 = this;
     this.attribute.populate_options(function() {
       var select = $('<select/>')
@@ -72,6 +79,35 @@ BoundSelect = BoundControl.extend({
       $('#'+this2.el+'_select').css('width', $('#'+this2.el).outerWidth());      
     });
   },
+             
+  //update_options: function() {    
+  //  var that = this;
+  //  this.attribute.populate_options(function() {          
+  //    var select = $('<select/>')
+  //      .attr('id', that.el + '_select')
+  //      .addClass('fake')
+  //      .css('width', $('#'+that.el).outerWidth())
+  //      .on('change', function() {
+  //        $('#'+that.el).val($('#'+that.el+'_select').val());
+  //        that.save();                     
+  //      });
+  //          
+  //    $.each(that.attribute.options, function(i, option) {      
+  //      var opt = $('<option/>')
+  //        .val(option.value)
+  //        .html(option.text);
+  //      if (option.value == that.attribute.value)
+  //        opt.attr('selected', 'true');
+  //      select.append(opt);
+  //    });
+  //    
+  //    if ($('#' + that.el + '_select').length) 
+  //      $('#' + that.el + '_select').remove();
+  //    
+  //    $('#'+that.el+'_container').append(select);    
+  //    $('#'+that.el+'_select').css('width', $('#'+that.el).outerWidth());
+  //  });
+  //},
   
   view: function() {
     

data/app/views/caboose/page_blocks/admin_edit.html.erb

@@ -45,6 +45,9 @@ $(document).ready(function() {
 </script>
 <% if use_tinymce %>
 <%= tinymce_assets %>
+<script type='textjavascript'>
+document.domain = "<%= Rails.application.config.action_controller.asset_host %>";
+</script>
 <%= tinymce :caboose, width: '800px', height:'300px' %>
 <% end %>
 <% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.23'
+  VERSION = '0.3.24'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.23
+  version: 0.3.24
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails