caboose-cms 0.4.111 → 0.4.112

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDllZmVlZTkzZTkxYTM2ZGFiN2UxYjkwMGQwZTZhNTEwOTVjNDhiMA==
+    MGFkMjljOGM1OWI1N2ZlMWQyOGJlZmYxNzI5Mzc3YTk4ZGM2MDg3NQ==
   data.tar.gz: !binary |-
-    MTE3Yzk2MTM0MDhhMGFiY2NlMDI5MDM0ZmY0YjJlZDUwYzc5NDhkMg==
+    MzI1ZjUwMTk4ZGY0NTZiMTZiMTM3NThjZGZkNmZhYmY2OTUwMGJlNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTdlNmZiYzU3MWU5N2I5ZGI5YjE3NDVkNTBlOGFhNjU4MmE0NjBiOGNiMmEy
-    MzQ5ZDg0MzBjNmI5ZWI0NmI3ZGZhY2VhM2RjZDJiYWI2M2YwOGEwY2JlOGU1
-    Zjk3ZWQyYWUxYTk4MDZmMjVkMzcwNGM4MTA3NDIwZTE5NzQyMDM=
+    M2Q5NDlhYTI0OGY4NDA0YjNkOWNhNjc2MjJkODgxMjE3NDJhMTk0MThjYzIw
+    YmM1OTc5NTY2YzBhNmZiNTY1NjE0NmE4ZDkyMTU5ZGViYjI5OTU3YmU3YTgw
+    Mzc3MDI0NDE1YzExYzJhZTM1MzU4Y2M0ODVkYzY1OGE2N2QzMmU=
   data.tar.gz: !binary |-
-    NTU4NzcxOTZkZGEyY2RmMGI1OGY2NGIxMjNlOGFjMGM3YzYyZGYyNzNjNTgz
-    N2U0OGM2NWY5YjM1ZDQyMzBlMjc3MTlhYTJkYjZkOGZlNDQ3NTE3Nzk3MDZh
-    ZTNkZTRiMjIxNDY1ZWE1OGFkODAwYjlkNGVhMmNiZDllZTdhZWM=
+    NzRhYjRmZGFhOGU4MjViNjNjNDE0NjIwZjgzMjdmZGE3NzdiYzJjYmY5NjVh
+    ZDVhZjljNmNkYTQ5NmIyOGZhYWU1YmIxYWExOGZhZjU2ODRjNDRhODE4OTk5
+    ZjRjYjNkY2RmZDU3NTQ1NjQyNGM1NzI1MGZmZjFhNTM5Yjg0YmY=

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

@@ -33,7 +33,7 @@ Attribute.prototype = {
   options: false,
   s3: false,
   
-  save: function(after) {
+  save: function(after) {          
     if (this.before_update) this.before_update();    
     var this2 = this;
     $.ajax({
@@ -59,7 +59,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_checkbox_multiple.js

@@ -11,87 +11,98 @@ BoundCheckboxMultiple = BoundControl.extend({
   checkboxes: false,
  
   init: function(params) {
-    
+    var that = this;
     for (var thing in params)
       this[thing] = params[thing];
     
     this.el = this.el ? this.el : this.model.name.toLowerCase() + '_' + this.model.id + '_' + this.attribute.name;
     this.message = this.el + '_message';
     this.placeholder = this.el + '_placeholder';
-    
-    var this2 = this;
-    $('#'+this.el).wrap($('<div/>')
+        
+    var div = $('<div/>')
       .attr('id', this.el + '_container')
       .addClass('mb_container')
-      .css('position', 'relative')
-    );
-    $('#'+this.el+'_container').empty();
-    $('#'+this.el+'_container').append($('<div/>')
-      .attr('id', this.placeholder)
-      .addClass('mb_placeholder')
-      .append($('<span/>').html(this.attribute.nice_name + ': '))
-    );
-    $('#'+this.el+'_container').append($('<input/>')
-      .attr('id', this.el + '_background')
-      .attr('disabled', true)
-      .css('background', '#fff')
-    );
-    if (this.attribute.width)
-      $('#'+this.el+'_background').css('width' , this.attribute.width);
-    
-    var this2 = this;
-    this.attribute.populate_options(function() {
-
-      var tbody = $('<tbody/>');
-      $.each(this2.attribute.options, function(i, option) {
+      .css('position', 'relative');
+    if (this.attribute.height)
+      div.css('height', '' + this.attribute.height + 'px').css('overflow-y', 'scroll');        
+    $('#'+this.el).wrap(div);    
+    $('#'+this.el+'_container').empty();        
 
-        tbody.append($('<tr/>')
-          .append($('<td/>')
-            .attr('id', this2.el + '_' + i)
+    if (this.attribute.options_url)      
+    {
+      ModelBinder.wait_for_options(this.attribute.options_url, function(options) {
+        that.attribute.options = options; 
+        that.cancel();
+      });            
+    }             
+  },
+  
+  view: function() {
+    var that = this;    
+    var tbody = $('<tbody/>');    
+    $.each(that.attribute.options, function(i, option) {
+      var checked = that.attribute.value.indexOf(option.value) > -1;
+      tbody.append($('<tr/>')
+        .append($('<td/>')
+          .append($('<input/>')
+            .attr('id', that.el + '_' + i)
             .attr('type', 'checkbox')
-            .attr('checked', this2.attribute.value[option.value])
-            .on('change', function() {
-              // this2.binder.cancel_active();
-              // this2.binder.active_control = this;
-              // this2.save(); 
-            })
-          )
-          .append($('<label/>')
-            .attr('for', this2.el + '_' + i)
-            .html(option.text)
+            .attr('checked', checked)
+            .val(option.value)
+            .css('position', 'relative')
+            .on('change', function() { that.save($(this).val(), $(this).prop('checked')); })
           )
-        );
-      });
-      $('#'+this.el+'_container').append(
-        $('<table/>').append(tbody)
+        )
+        .append($('<td/>').append($('<label/>').attr('for', that.el + '_' + i).html(option.text)))
       );
     });
-  },
-  
-  view: function() {
-    
+    $('#'+this.el+'_container').append($('<table/>').addClass('data').append(tbody));    
   },
     
   edit: function() {
     
   },
   
-  save: function() {
-    
-    this.attribute.value = $('#'+this.el).prop('checked') ? 1 : 0;
+  save: function(value, checked) {
         
-    var this2 = this;
-    this.model.save(this.attribute, function(resp) {
-      $('#'+this2.el+'_check a').removeClass('loading');
-      if (resp.error) this2.error(resp.error);
-      else
-      {
-        this2.binder.active_control = this2;
-        if (this2.binder.success)
-          this2.binder.success(this2);
-        this2.view();
-      }
-    });
+    var that = this;    
+    var i = this.attribute.value.indexOf(value);
+    if (checked && i == -1) this.attribute.value.push(value);
+    if (!checked && i > -1) this.attribute.value.splice(i, 1);        
+        
+    if (this.attribute.before_update)
+      this.attribute.before_update();    
+    if (!this.attribute.update_url)
+      this.attribute.update_url = this.model.update_url;
+
+    var data = {};
+    data[this.attribute.name] = [value,(checked ? 1 : 0)];
+    
+    $.ajax({
+      url: this.attribute.update_url,
+      type: 'put',
+      data: data,        
+			success: function(resp) {        			  
+				if (resp.success)
+				{
+				  if (resp.attributes && resp.attributes[that.attribute.name])
+				    for (var thing in resp.attributes[that.attribute.name])
+				      that.attribute[thing] = resp.attributes[that.attribute.name][thing];				  
+				  that.attribute.value_clean = that.attribute.value;
+				  
+				  that.binder.active_control = that;
+				  if (that.binder.success)
+				    that.binder.success(that);				  
+				}								
+				else if (resp.error)
+				  that.error(resp.error);    				
+				if (that.attribute.after_update)
+				  that.attribute.after_update();				
+			},
+			error: function() { 
+			  if (after) after(false);
+			}
+		});
   },
   
   cancel: function() {

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

@@ -23,7 +23,7 @@ Model.prototype = {
   save: function(attrib, after) {
     if (!attrib.update_url)
       attrib.update_url = this.update_url;
-    attrib.save(after);
+    attrib.save(after);        
   },
   
   populate_options: function(after, i) {

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

@@ -34,12 +34,45 @@ ModelBinder.tinymce_current_control = function() {
   return ModelBinder.tinymce_control(id);    
 };
 
+//==============================================================================
+
+ModelBinder.options = {};
+ModelBinder.waiting_on_options = {};
+ModelBinder.wait_for_options = function(url, after) {  
+  if (ModelBinder.options[url])
+  {
+    after(ModelBinder.options[url]);      
+  }
+  else if (ModelBinder.waiting_on_options[url])
+  {
+    ModelBinder.waiting_on_options[url].push(after);
+  }
+  else
+  {
+    ModelBinder.waiting_on_options[url] = [after];      
+    var that = this;
+    $.ajax({
+      url: url,
+      type: 'get',
+			success: function(resp) {
+			  ModelBinder.options[url] = resp;			  
+        $.each(ModelBinder.waiting_on_options[url], function(i, after2) {        
+          after2(ModelBinder.options[url]);
+        });
+			}			
+		});
+  }    
+};
+
+//==============================================================================
+
 ModelBinder.prototype = {
   model: false,
   controls: [],
   on_load: false,
   success: false,
   authenticity_token: false,
+  options: {},
   
   init: function(params) {
     this.model = new Model({        
@@ -60,7 +93,7 @@ ModelBinder.prototype = {
     //this.model.populate_options();
 
     var this2 = this;
-    $.each(this.model.attributes, function(i, attrib) {
+    $.each(this.model.attributes, function(i, attrib) {      
       var opts = {
         model: this2.model,
         attribute: attrib,
@@ -71,7 +104,7 @@ ModelBinder.prototype = {
       if (attrib.type == 'text')                   control = new BoundText(opts);
       else if (attrib.type == 'select')            control = new BoundSelect(opts);
       else if (attrib.type == 'checkbox')          control = new BoundCheckbox(opts);
-      else if (attrib.type == 'checkbox-multiple') control = new BoundCheckboxMultiple(opts);
+      else if (attrib.type == 'checkbox-multiple') control = new BoundCheckboxMultiple(opts);      
       else if (attrib.type == 'textarea')          control = new BoundTextarea(opts);
       else if (attrib.type == 'richtext')          control = new BoundRichText(opts);
       else if (attrib.type == 'image')             control = new BoundImage(opts);

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.111'
+  VERSION = '0.4.112'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.111
+  version: 0.4.112
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails