caboose-cms 0.7.57 → 0.7.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58a87dfdd169104d0678ba85f750809c5ab12e86
-  data.tar.gz: 09d6a88d924f0ee3ce3e953dc3e86187b770f7c1
+  metadata.gz: 48c0687d2fc45445501533250e2534d1c7d7cd68
+  data.tar.gz: e7a704b7df30b88850791b5923522598a26c6d8f
 SHA512:
-  metadata.gz: 245adebb5a83caf5a7671a3a3cae2d7c10b0651447b493679a8459c32568e2fe1e9bca51b6ce01d9ea8bc82a6ae12568e5ebbb5d5d43f783bd8dc02f722e55f3
-  data.tar.gz: 50d81237125c19672c000e71850ca3b3f8f725e54722440304c03c9b06e1fbbf720742ca7ce567556d30d93221c12ffad3489408717d16635339b33256b0a30b
+  metadata.gz: 812da735cddcdeaff96d6f4a9e8bc253612c386ad7ff3f27643809fddf041b5ac26f6dea963d4c079be516a111558e98db56315f1cca55110e74077be62f284f
+  data.tar.gz: 3702ebd31ab65e0ca6ce6a21970a3fbfdef79cab71ca117e8b6bc0ec53b70cc3eba80fb398f5fce32b3a6fb8a8630b68d4e37e5d4532cb4dae799f9b567f971f

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

@@ -275,16 +275,10 @@ MediaController.prototype = {
         }                                  
         if (that.selected_media.indexOf(m.id) > -1)
           li.addClass('selected ui-selected');
-        if (that.allow_edit && m.image_urls) {
-          li.append($("<a/>")
-            .html("Edit Image")
-            .click(function() { that.edit_image($(this).parent().data('media_id')); })
-          );
-        }
-        if ( m.image_urls )
-          li.append($("<a/>").addClass("dl i").html("Download").click(function() { that.download_image($(this).parent().data('media_id')); }));
-        else
-          li.append($("<a/>").addClass("dl").html("Download").click(function() { that.download_image($(this).parent().data('media_id')); }));
+        if (that.allow_edit && m.image_urls) li.append($("<a/>").html("Edit Image").click(function() { that.edit_image($(this).parent().data('media_id')); }));
+        else                                 li.append($("<a/>").attr('href', m.file_url).html("Direct URL"));
+        if ( m.image_urls )                  li.append($("<a/>").addClass("dl i").html("Download").click(function() { that.download_image($(this).parent().data('media_id')); }));
+        else                                 li.append($("<a/>").addClass("dl").html("Download").click(function() { that.download_image($(this).parent().data('media_id')); }));
         ul.append(li);
       });
     }
@@ -504,16 +498,22 @@ MediaController.prototype = {
     return m;
   },
 
-  download_image: function(media_id) {
+  download_image: function(media_id) {    
+    var that = this;
+    url = that.download_url(media_id);        
+    window.open(url);     
+  },
+  
+  download_url: function(media_id) {
     var that = this;
     var m = that.media_with_id(media_id);
     var url = '';
     if ( m.image_urls )
       url = m.image_urls.original_url;
     else
-      url = m.file_url
-    window.open(url);
-  }, 
+      url = m.file_url;
+    return url;     
+  },
   
   //============================================================================
   // Aviary

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

@@ -7,7 +7,7 @@ var Attribute = function(params) {
   this.value_clean = this.value;  
 };
 
-Attribute.prototype = {
+Attribute.prototype = {  
   name: false,
   nice_name: false,
   type: false,
@@ -53,7 +53,7 @@ Attribute.prototype = {
 				  this2.value_clean = this2.value;
 				}				
 				if (after) after(resp);        				
-				if (this2.after_update) this2.after_update();				
+				if (this2.after_update) this2.after_update(this2);				
 			},
 			error: function() { 
 			  if (after) after(false);

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

@@ -34,6 +34,28 @@ 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) {
+    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;  
+};
+
+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.options = {};
@@ -75,29 +97,26 @@ ModelBinder.prototype = {
   options: {},
   
   init: function(params) {
-    this.model = new Model({        
+    var that = this;    
+    that.model = new Model({        
       name: params['name'],
       id: params['id'],
       attributes: [],
       attributes_clean: []
     });
-    if (params['update_url'])         this.model.update_url = params['update_url'];
-    if (params['success'])            this.success = params['success'];
-    if (params['authenticity_token']) this.authenticity_token = params['authenticity_token'];
-    if (params['on_load'])            this.on_load = params['on_load'];
-      
-    var m = this.model;
-    $.each(params['attributes'], function(i, attrib) {
-      m.attributes[m.attributes.length] = new Attribute(attrib);
-    });
-    //this.model.populate_options();
+    if (params['update_url'])         that.model.update_url = params['update_url'];
+    if (params['success'])            that.success = params['success'];
+    if (params['authenticity_token']) that.authenticity_token = params['authenticity_token'];
+    if (params['on_load'])            that.on_load = params['on_load'];
 
-    var this2 = this;
-    $.each(this.model.attributes, function(i, attrib) {      
+    $.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: this2.model,
+        model:     that.model,
         attribute: attrib,
-        binder: this2
+        binder:    that
       };
       var control = false;
       
@@ -119,21 +138,29 @@ 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)"); 
-      }
-      
-      this2.controls.push(control);    
+      }      
+      that.controls.push(control);    
     });
             
-    if (this.on_load)
-      this.on_load();
+    if (that.on_load)
+      that.on_load();
   },
   
+  reinit: function(control_id)
+  {
+    console.log('Reinitializing ' + control_id + '...');
+    var that = this;
+    var c = that.control_with_id(control_id);
+    console.log(c);
+    if (c) c.init({});
+  },
+    
   control_with_id: function(id)
   {
     var control = false
-    var this2 = this;
+    var that = this;
     $.each(this.controls, function(i, c) {
-      if (id == (this2.model.name + "_" + this2.model.id + "_" + c.attribute.name).toLowerCase())
+      if (id == (that.model.name + "_" + that.model.id + "_" + c.attribute.name).toLowerCase())
       {        
         control = c; 
         return false;

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.57'
+  VERSION = '0.7.58'
 end

metadata

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