caboose-cms 0.7.59 → 0.7.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8330146252102d4ebee9f4792970c1a4d6a075b
-  data.tar.gz: 9f98219c9420295379b13db368a13b00de80176f
+  metadata.gz: 5ad4bf6009e7d52ac46a3190b3c4889d0e89c076
+  data.tar.gz: cf31d15f32e0ead99aff9cff064c3d29bf80bceb
 SHA512:
-  metadata.gz: 0df8ce931fc68c685cd53416d6a5ac223afec93285b2ff5237e91abb879ec3b05acd71f256ef65ba1b986b8d6b0f463c535fb43acec6eadc80c50bcc74da552e
-  data.tar.gz: 6098e6a6d7d4102a2af8d3b8810434d855ab06fc5edb26ffce65fd689ea8e1886469d28cd5451ff35f6855d069e1de382df48db0b0753dcd652925ca3415d341
+  metadata.gz: d75db978103fa75b118f2aafe0e110745efd5a98dfeea8c494d51a751b47f76c83ebe2c5ae029437df9bc5f8cb88b3e1201669c02d75ac6cd04b7409840d975c
+  data.tar.gz: 193149455efe7ea7982c3a19f25e03c3e3a8e9c94570a3cb11a6f60c5c4a341ce81209578353d5182aaaf2f2b0ef86125959b3046f59ec3d5e793c98133350d8

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

@@ -38,7 +38,7 @@ Attribute.prototype = {
   s3: false,
   
   save: function(after) {          
-    if (this.before_update) this.before_update();    
+    //if (this.before_update) this.before_update();    
     var this2 = this;
     $.ajax({
       url: this.update_url,
@@ -53,7 +53,7 @@ Attribute.prototype = {
 				  this2.value_clean = this2.value;
 				}				
 				if (after) after(resp);        				
-				if (this2.after_update) this2.after_update(this2);				
+				//if (this2.after_update) this2.after_update(this2);				
 			},
 			error: function() { 
 			  if (after) after(false);

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

@@ -74,18 +74,17 @@ BoundCheckbox = BoundControl.extend({
   },
   
   save: function() {
-    
+    var that = this;    
     this.attribute.value = $('#'+this.el).prop('checked') ? 1 : 0;
-        
-    var this2 = this;
-    this.model.save(this.attribute, function(resp) {
-      $('#'+this2.el+'_check a').removeClass('loading');
-      if (resp.error) this2.error(resp.error);
+            
+    this.binder.save(this.attribute, function(resp) {
+      $('#'+that.el+'_check a').removeClass('loading');
+      if (resp.error) that.error(resp.error);
       else
       {
-        if (this2.binder.success)
-          this2.binder.success(this2);
-        this2.view();
+        if (that.binder.success)
+          that.binder.success(that);
+        that.view();
       }
     });
   },

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

@@ -127,6 +127,7 @@ BoundCheckboxMultiple = BoundControl.extend({
     var data = {};
     data[this.attribute.name] = [value,(checked ? 1 : 0)];
     
+    
     $.ajax({
       url: this.attribute.update_url,
       type: 'put',
@@ -139,9 +140,9 @@ BoundCheckboxMultiple = BoundControl.extend({
 				      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);				  
+				  b.active_control = that;
+				  if (this2.binder.success)
+				    this2.binder.success(that);				  
 				}								
 				else if (resp.error)
 				  that.error(resp.error);    				

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

@@ -88,7 +88,8 @@ BoundCode = BoundControl.extend({
     //this.hide_controls();
     //this.show_loader();        
     //var this2 = this;
-    //this.model.save(this.attribute, function(resp) {
+    //
+    //this.binder.save(this.attribute, function(resp) {
     //  if (resp.error)
     //  {
     //    this2.hide_loader();

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

@@ -87,9 +87,9 @@ BoundColor = BoundControl.extend({
       return;
     
     //this.show_loader();        
-    var this2 = this;
+    var this2 = this;    
     
-    this.model.save(this.attribute, function(resp) {
+    this.binder.save(this.attribute, function(resp) {
       this2.save_attempts = 0;
       if (resp.error)
       {

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

@@ -1,17 +1,17 @@
 
 BoundControl = Class.extend({
     
-  el: false,        // The DOM element to which the object is bound  
-  model: false,     // The model to which the control is bound
-  attribute: false, // The attribute of the model
-  binder: false,    // The model binder
-  
-  init: function(params) {},  // Constructor  
-  view: function() {},        // Sets the control in a view state
-  edit: function() {},        // Sets the control in an edit state
-  save: function() {},        // Sends the value in the control to the model to be saved
+  el: false,         // The DOM element to which the object is bound
+  model: false,      // The model to which the control is bound
+  attribute: false,  // The attribute of the model
+  binder: false,     // The model binder
+    
+  init:   function(params) {},  // Constructor  
+  view:   function() {},        // Sets the control in a view state
+  edit:   function() {},        // Sets the control in an edit state
+  save:   function() {},        // Sends the value in the control to the model to be saved
   cancel: function() {},      // Cancels the edit
-  error: function(str) {},     // Shows an error
+  error:  function(str) {},     // Shows an error
 
   show_loader: function() {
     var w = $('#'+this.el).outerWidth();

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

@@ -77,7 +77,7 @@ BoundDate = BoundControl.extend({
     this.show_loader();        
     var this2 = this;
     
-    this.model.save(this.attribute, function(resp) {
+    this.binder.save(this.attribute, function(resp) {
       this2.save_attempts = 0;
       if (resp.error)
       {

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

@@ -73,7 +73,7 @@ BoundDateTime = BoundControl.extend({
     this.show_loader();        
     var this2 = this;
     
-    this.model.save(this.attribute, function(resp) {
+    this.binder.save(this.attribute, function(resp) {
       this2.save_attempts = 0;
       if (resp.error)
       {

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

@@ -73,8 +73,8 @@ BoundRichText = BoundControl.extend({
     if (this.attribute.value == this.attribute.value_clean)
       return;    
     
-    var this2 = this;
-    this.model.save(this.attribute, function(resp) {        
+    var this2 = this;    
+    this.binder.save(this.attribute, function(resp) {        
       if (resp.error)
       {        
         alert(resp.error);        

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

@@ -9,9 +9,11 @@ BoundSelect = BoundControl.extend({
   message: false,
   placeholder: false,
  
-  init: function(params) {    
+  init: function(params) {
+    //console.log('control.model.id = ' + this.model.id);
     for (var thing in params)
       this[thing] = params[thing];
+    //console.log('control.model.id = ' + this.model.id);
     
     this.el = this.el ? this.el : this.model.name.toLowerCase() + '_' + this.model.id + '_' + this.attribute.name;
     this.message = this.el + '_message';
@@ -92,7 +94,7 @@ BoundSelect = BoundControl.extend({
             if (typeof this2.attribute.quick_add_url == 'string')
               caboose_modal_url(this2.attribute.quick_add_url);
             else
-              caboose_modal_url(this2.attribute.quick_add_url(this2.model));
+              caboose_modal_url(this2.attribute.quick_add_url(this2.model()));
           }
           else
           {
@@ -181,7 +183,7 @@ BoundSelect = BoundControl.extend({
       this.attribute.text = '-- Empty --';
         
     var this2 = this;    
-    this.model.save(this.attribute, function(resp) {      
+    this.binder.save(this.attribute, function(resp) {      
       $(this2.attribute.options).each(function(i,opt) {
         if (opt.value == this2.attribute.value)
           this2.attribute.text = opt.text;        

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

@@ -64,10 +64,10 @@ BoundText = BoundControl.extend({
     if (this.attribute.value == this.attribute.value_clean)
       return;
     
-    this.show_loader();        
-    var this2 = this;
+    this.show_loader();    
+    var this2 = this;    
     
-    this.model.save(this.attribute, function(resp) {
+    this.binder.save(this.attribute, function(resp) {
       this2.save_attempts = 0;
       if (resp.error)
       {
@@ -111,6 +111,13 @@ BoundText = BoundControl.extend({
     $('#'+this.el+'_message').slideDown();
     var this2 = this;
     setTimeout(function() { $('#'+this2.el+'_message').slideUp(function() { $(this).empty(); }); }, 3000);
+  },
+  
+  set_value: function(v) {
+    var that = this;
+    $('#'+this.el).val(v);
+    this.attribute.value = v;
+    this.attribute.value_clean = v;
   }
   
 });

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

@@ -77,28 +77,29 @@ BoundTextarea = BoundControl.extend({
   },
   
   save: function() {
-
+    var that = this;
+        
     this.attribute.value = $('#'+this.el).val();    
     if (this.attribute.value == this.attribute.value_clean)
       return;
-
+    
     this.hide_controls();
     this.show_loader();        
-    var this2 = this;
-    this.model.save(this.attribute, function(resp) {
+        
+    this.binder.save(this.attribute, function(resp) {
       if (resp.error)
       {
-        this2.hide_loader();
-        this2.error(resp.error);
+        that.hide_loader();
+        that.error(resp.error);
       }
       else
       {
-        this2.show_check(500);
-        $('#'+this2.el).val(this2.attribute.value);
-        $('#'+this2.el).removeClass('mb_dirty');
+        that.show_check(500);
+        $('#'+that.el).val(that.attribute.value);
+        $('#'+that.el).removeClass('mb_dirty');
 
-        if (this2.binder.success)
-          this2.binder.success(this2);
+        if (that.binder.success)
+          that.binder.success(that);
       }
     });
   },

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

@@ -144,7 +144,8 @@ BoundTime = BoundControl.extend({
   save: function() {
     this.attribute.value = $('#'+this.el).val();
     var this2 = this;
-    this.model.save(this.attribute, function(resp) {      
+    
+    this.binder.save(this.attribute, function(resp) {      
       $(this2.attribute.options).each(function(i,opt) {
         if (opt.value == this2.attribute.value)
           this2.attribute.text = opt.text;        

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

@@ -20,11 +20,12 @@ Model.prototype = {
   options_url: false,
   options: false,
   
-  save: function(attrib, after) {
-    if (!attrib.update_url)
-      attrib.update_url = this.update_url;    
-    attrib.save(after);        
-  },
+  // Moved to model binder
+  //save: function(attrib, after) {
+  //  if (!attrib.update_url)
+  //    attrib.update_url = this.update_url;    
+  //  attrib.save(after);        
+  //},
   
   populate_options: function(after, i) {
     if (i == null || i == undefined)
@@ -33,5 +34,10 @@ Model.prototype = {
       after();
     var this2 = this;
     this.attributes[i].populate_options(function() { this2.populate_options(after, i+1); });
+  },
+  
+  name_and_id: function() {
+    return this.model_name.toLowerCase() + '_' + this.model_id;
   }
+  
 };

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

@@ -2,11 +2,22 @@
 var all_model_binders = [];
 var ModelBinder = function(params) { 
   this.init(params);
-  all_model_binders[all_model_binders.length] = this;
+  ModelBinder.add_to_all_model_binders(this);
 };
 
-ModelBinder.tinymce_init = function() {
-  alert('ModelBinder.tinymce_init');
+ModelBinder.add_to_all_model_binders = function(mb) {
+  var exists = false;  
+  for (var i=0; i<all_model_binders.length; i++) {
+    var m = all_model_binders[i].model;
+    if (m.name == mb.model.name && parseInt(m.id) == parseInt(mb.model.id))
+    {
+      all_model_binders[i] = mb;             
+      exists = true;
+      break;
+    }
+  }
+  if (!exists)   
+    all_model_binders[all_model_binders.length] = mb;  
 };
 
 ModelBinder.remove_from_all_model_binders = function(model_name, id) {
@@ -18,6 +29,10 @@ ModelBinder.remove_from_all_model_binders = function(model_name, id) {
   all_model_binders = arr;  
 };
 
+ModelBinder.tinymce_init = function() {
+  alert('ModelBinder.tinymce_init');
+};
+
 ModelBinder.tinymce_control = function(id) {  
   var control = false;
   $.each(all_model_binders, function(i, mb) {
@@ -34,27 +49,47 @@ ModelBinder.tinymce_current_control = function() {
   return ModelBinder.tinymce_control(id);    
 };
 
-ModelBinder.find_control = function(model_name, model_id, attribute_name) {  
-  var control = false;
-  $.each(all_model_binders, function(i, mb) {
+ModelBinder.find_control = function(model_name, model_id, attribute_name) {    
+  for (var i=0; i<all_model_binders.length; i++) {
+    var mb = all_model_binders[i];
     if (mb.model.name == model_name && mb.model.id == model_id) {
-      $.each(mb.controls, function(i, c) {        
-        if (c.attribute.name == attribute_name) { control = c; return false; }
-      });
-    }
-    if (control) return false;
-  });
-  return control;  
+      for (var j=0; j<mb.controls.length; j++) {
+        var c = mb.controls[j];                          
+        if (c.attribute.name == attribute_name) {
+          return c;
+        }
+      }
+    }    
+  }  
+  return false;
 };
 
-ModelBinder.repopulate_options_for_control = function(model_name, model_id, attribute_name) {    
-  var control = ModelBinder.find_control(model_name, model_id, attribute_name);  
-  if (control)
-  {
-    control.attribute.options = false;
-    control.init({});
-  }
-};
+//ModelBinder.print_all_model_binders = function() {
+//  console.log("-----------------------------------------------------------------");
+//  console.log("All model binders");
+//  for (var i=0; i<all_model_binders.length; i++) {
+//    var mb = all_model_binders[i];                                
+//    console.log(mb.model.name + ' | ' + mb.model.id);                                                      
+//  }
+//  console.log("-----------------------------------------------------------------");  
+//};
+
+//ModelBinder.print_all_controls = function() {
+//  
+//  count = 0;
+//  for (var i=0; i<all_model_binders.length; i++) { count += all_model_binders[i].controls.length; }
+//  
+//  console.log("-----------------------------------------------------------------");
+//  console.log("All controls (" + count + ")");
+//  for (var i=0; i<all_model_binders.length; i++) {
+//    var mb = all_model_binders[i];              
+//    for (var j=0; j<mb.controls.length; j++) {      
+//      var c = mb.controls[j];              
+//      console.log(mb.model.name + ' | ' + mb.model.id +  ' | ' + c.attribute.name); //c.model.name + ' | ' + c.model.id + ' | ' + c.attribute.name + ' | ' + c.attribute.options_url);                                                  
+//    }
+//  }
+//  console.log("-----------------------------------------------------------------");
+//};
 
 //==============================================================================
 
@@ -90,14 +125,16 @@ ModelBinder.wait_for_options = function(url, after) {
 
 ModelBinder.prototype = {
   model: false,
-  controls: [],
+  controls: false,
   on_load: false,
   success: false,
   authenticity_token: false,
-  options: {},
+  options: false,
   
   init: function(params) {
-    var that = this;    
+    var that = this;
+    that.controls = [];
+    that.options = {};
     that.model = new Model({        
       name: params['name'],
       id: params['id'],
@@ -111,17 +148,19 @@ ModelBinder.prototype = {
 
     $.each(params['attributes'], function(i, attrib) {
       that.model.attributes[that.model.attributes.length] = new Attribute(attrib);
-    });        
+    });
     $.each(that.model.attributes, function(i, attrib) {      
       var opts = {
-        model:     that.model,
         attribute: attrib,
+        model:     that.model,        
         binder:    that
       };
+      //console.log(that.model.name + ' | ' + that.model.id + ' | ' + attrib.name);      
       var control = false;
       
       if (attrib.type == 'text')                   control = new BoundText(opts);
       else if (attrib.type == 'color')             control = new BoundColor(opts);
+      else if (attrib.type == 'date')              control = new BoundDate(opts);
       else if (attrib.type == 'datetime')          control = new BoundDateTime(opts);
       else if (attrib.type == 'date-time')         control = new BoundDateTime(opts);
       else if (attrib.type == 'date_time')         control = new BoundDateTime(opts);
@@ -137,13 +176,15 @@ ModelBinder.prototype = {
       {
         control_class = "";
         $.each(attrib.type.split('-'), function(j, word) { control_class += word.charAt(0).toUpperCase() + word.toLowerCase().slice(1); });
-        control = eval("new Bound" + control_class + "(opts)"); 
-      }      
-      that.controls.push(control);    
-    });
+        control = eval("new Bound" + control_class + "(opts)");
+        //console.log("ModelBinder Error: unsupported attribute type \"" + attrib.type + "\"");
+      }
+      if (control)
+        that.controls.push(control);      
+    }); 
             
     if (that.on_load)
-      that.on_load();
+      that.on_load();    
   },
   
   reinit: function(control_id)
@@ -174,5 +215,26 @@ ModelBinder.prototype = {
     $(this.controls).each(function(i, control) { 
       control.cancel(); 
     });    
+  },
+  
+  save: function(attrib, after) {
+    if (!attrib.update_url)
+      attrib.update_url = this.model.update_url;
+    if (attrib.before_update) attrib.before_update(this);
+    attrib.save(after);      
+    if (attrib.after_update) attrib.after_update(this);
+  },
+
+  repopulate_options_for_control: function(attribute_name) 
+  { 
+    for (var i=0; i<this.controls.length; i++)
+    { 
+      var c = this.controls[i];
+      if (c.attribute.name == attribute_name)
+      {
+        c.attribute.options = false;
+        c.init({});
+      }      
+    }
   }
 };

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.59'
+  VERSION = '0.7.60'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.59
+  version: 0.7.60
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg