bhf 0.10.12 → 0.10.13

data/app/assets/javascripts/bhf/mootools_ujs.js

@@ -18,17 +18,17 @@ provides:
 */
 
 window.addEvent('domready', function(){
-  
+
   rails.csrf = {
     token: rails.getCsrf('token'),
     param: rails.getCsrf('param')
   };
-  
+
   rails.applyEvents();
 });
 
 (function($){
-  
+
   window.rails = {
     /**
      * If el is passed as argument, events will only be applied to
@@ -39,7 +39,7 @@ window.addEvent('domready', function(){
       var apply = function(selector, action, callback){
         el.addEvent(action + ':relay(' + selector + ')', callback);
       };
-      
+
       apply('form[data-remote="true"]', 'submit', rails.handleRemote);
       apply('a[data-remote="true"], input[data-remote="true"]', 'click', rails.handleRemote);
       apply('a[data-method][data-remote!=true]', 'click', function(event){
@@ -52,19 +52,19 @@ window.addEvent('domready', function(){
               display: 'none'
             }
           }).inject(this, 'after');
-          
+
           var methodInput = Element('input', {
             type: 'hidden',
             name: '_method',
             value: this.get('data-method')
           });
-          
+
           var csrfInput = Element('input', {
             type: 'hidden',
             name: rails.csrf.param,
             value: rails.csrf.token
           });
-          
+
           form.adopt(methodInput, csrfInput).submit();
         }
       });
@@ -73,12 +73,12 @@ window.addEvent('domready', function(){
         return rails.confirmed(this);
       });
     },
-    
+
     getCsrf: function(name){
       var meta = document.getElement('meta[name=csrf-' + name + ']');
       return (meta ? meta.get('content') : null);
     },
-    
+
     confirmed: function(el){
       var confirmMessage = el.get('data-confirm');
       if(confirmMessage && !confirm(confirmMessage)){
@@ -86,7 +86,7 @@ window.addEvent('domready', function(){
       }
       return true;
     },
-    
+
     disable: function(el){
       var button = el.get('data-disable-with') ? el : el.getElement('[data-disable-with]');
       if (button){
@@ -103,21 +103,23 @@ window.addEvent('domready', function(){
         });
       }
     },
-    
+
     handleRemote: function(event){
       event.preventDefault();
       if(rails.confirmed(this)){
-        this.request = new Request.Rails(this);
+        if (this.get('data-type') === 'json') {
+          this.request = new Request.RailsJSON(this);
+        }
+        else {
+          this.request = new Request.Rails(this);
+        }
         rails.disable(this);
         this.request.send();
       }
     }
   };
-  
-  Request.Rails = new Class({
-  
-    Extends: Request,
-    
+
+  var _reqestClassMethods = {
     initialize: function(element, options){
       this.el = element;
       this.parent(Object.merge({
@@ -126,7 +128,7 @@ window.addEvent('domready', function(){
       }, options));
       this.addRailsEvents();
     },
-    
+
     send: function(options) {
       this.el.fireEvent('ajax:before');
       if (this.el.get('tag') === 'form'){
@@ -135,26 +137,79 @@ window.addEvent('domready', function(){
       this.parent(options);
       this.el.fireEvent('ajax:after', this.xhr);
     },
-    
+
     addRailsEvents: function(){
       this.addEvent('request', function(){
         this.el.fireEvent('ajax:loading', this.xhr);
       });
-      
+
       this.addEvent('success', function(){
         this.el.fireEvent('ajax:success', this.xhr);
       });
-      
+
       this.addEvent('complete', function(){
         this.el.fireEvent('ajax:complete', this.xhr);
         this.el.fireEvent('ajax:loaded', this.xhr);
       });
-      
+
       this.addEvent('failure', function(){
         this.el.fireEvent('ajax:failure', this.xhr);
       });
     }
-    
-  });
-  
-})(document.id);
+  };
+
+  var _reqestClassMethods = {
+    initialize: function(element, options){
+      this.el = element;
+      this.parent(Object.merge({
+        method: this.el.get('method') || this.el.get('data-method') || 'get',
+        url: this.el.get('action') || this.el.get('href')
+      }, options));
+
+      if (rails.csrf.token) {
+        Object.append(this.headers, {
+          'X-CSRF-Token': rails.csrf.token
+        });
+      }
+
+      this.addRailsEvents();
+    },
+
+    send: function(options) {
+      this.el.fireEvent('ajax:before');
+      if (this.el.get('tag') === 'form'){
+        this.options.data = this.el;
+      }
+      this.parent(options);
+      this.el.fireEvent('ajax:after', this.xhr);
+    },
+
+    addRailsEvents: function(){
+      this.addEvent('request', function(){
+        this.el.fireEvent('ajax:loading', this.xhr);
+      });
+
+      this.addEvent('success', function(){
+        this.el.fireEvent('ajax:success', this.xhr);
+      });
+
+      this.addEvent('complete', function(){
+        this.el.fireEvent('ajax:complete', this.xhr);
+        this.el.fireEvent('ajax:loaded', this.xhr);
+      });
+
+      this.addEvent('failure', function(){
+        this.el.fireEvent('ajax:failure', this.xhr);
+      });
+    }
+  };
+
+  Request.RailsJSON = new Class(Object.merge({
+    Extends: Request.JSON
+  }, _reqestClassMethods));
+
+  Request.Rails = new Class(Object.merge({
+    Extends: Request
+  }, _reqestClassMethods));
+
+})(document.id);

data/app/assets/stylesheets/bhf/application.css.sass

@@ -466,7 +466,7 @@ table.data_table
   max-height: 200px
 
 .thumbnail_image
-  &.preview_image
+  @extend .preview_image
   max-width: 32px
   max-height: 32px
 

data/app/controllers/bhf/embed_entries_controller.rb

@@ -17,7 +17,7 @@ class Bhf::EmbedEntriesController < Bhf::EntriesController
     if @object.save
       manage_many_to_many
       after_save
-      
+
       if @quick_edit
         render json: object_to_bhf_hash, status: :ok
       else
@@ -70,7 +70,7 @@ class Bhf::EmbedEntriesController < Bhf::EntriesController
       @object = @model.bhf_new_embed(params[:entry_id], @permited_params)
       after_load
     end
-    
+
     def redirect_after_save(flash)
       if params[:return_to_new]
         redirect_to new_entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id])), flash
@@ -79,4 +79,4 @@ class Bhf::EmbedEntriesController < Bhf::EntriesController
       end
     end
 
-end
+end

data/app/controllers/bhf/entries_controller.rb

@@ -5,21 +5,21 @@ class Bhf::EntriesController < Bhf::ApplicationController
 
   def new
     @form_url = entries_path(@platform.name)
-    
+
     render layout: 'bhf/quick_edit' if @quick_edit
   end
 
   def edit
     render file: 'public/404.html', layout: false and return unless @object
-    
+
     @form_url = entry_path(@platform.name, @object)
-    
+
     render layout: 'bhf/quick_edit' if @quick_edit
   end
-  
+
   def show
     render file: 'public/404.html', layout: false and return unless @object
-    
+
     respond_to do |format|
       format.html
       format.json  { render json: @object }
@@ -51,7 +51,7 @@ class Bhf::EntriesController < Bhf::ApplicationController
 
   def update
     render file: 'public/404.html', layout: false and return unless @object
-    
+
     before_save
     if @object.update_attributes(@permited_params)
       manage_many_to_many
@@ -73,7 +73,7 @@ class Bhf::EntriesController < Bhf::ApplicationController
       render :edit, r_settings
     end
   end
-  
+
   def duplicate
     new_record = @object.dup
     new_record.before_bhf_duplicate(@object) if new_record.respond_to?(:before_bhf_duplicate)
@@ -84,21 +84,23 @@ class Bhf::EntriesController < Bhf::ApplicationController
       redirect_to(page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), notice: set_message('duplicate.error', @model))
     end
   end
-  
+
   def sort
     params[:order].each do |order|
       @model.
         find(order[1].gsub("_#{@platform.name}", '')).
         update_attribute(@platform.sortable_property, order[0].to_i)
     end
-    
+
     head :ok
   end
 
   def destroy
-    @object.destroy
+    object = @object.destroy
     if @quick_edit
-      head :ok
+      respond_to do |f|
+        f.json { render status: :ok, json: object }
+      end
     else
       redirect_back_or_default(page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), notice: set_message('destory.success', @model))
     end
@@ -108,11 +110,11 @@ class Bhf::EntriesController < Bhf::ApplicationController
 
     def object_to_bhf_hash
       extra_data = {
-        to_bhf_s:  @object.to_bhf_s, 
+        to_bhf_s:  @object.to_bhf_s,
         object_id: @object.send(@object.class.bhf_primary_key).to_s
       }
       extra_data.merge!(@object.to_bhf_hash) if @object.respond_to?(:to_bhf_hash)
-      
+
       @platform.columns.each_with_object(extra_data) do |column, hash|
         column_value = @object.send(column.name)
         unless column.macro == :column && column_value.blank?
@@ -151,7 +153,7 @@ class Bhf::EntriesController < Bhf::ApplicationController
         relation_array = @object.send(relation)
         reflection.klass.unscoped.find(ids.keys).each do |relation_obj|
           has_relation = relation_array.include?(relation_obj)
-          
+
           if ids[relation_obj.send(relation_obj.class.bhf_primary_key).to_s].blank?
             if has_relation
               relation_array.delete(relation_obj)
@@ -184,7 +186,7 @@ class Bhf::EntriesController < Bhf::ApplicationController
     def set_quick_edit
       @quick_edit = request.xhr?
     end
-    
+
     def redirect_after_save(flash)
       if params[:return_to_edit]
         redirect_to edit_entry_path(@platform.name, @object), flash

data/app/controllers/bhf/pages_controller.rb

@@ -15,7 +15,7 @@ class Bhf::PagesController < Bhf::ApplicationController
 
     @platforms = platform_options.each_with_object([]) do |opts, obj|
       platform = find_platform(opts.keys[0])
-      
+
       next if platform.table_hide?
       paginate_platform_objects(platform)
       obj << platform
@@ -42,7 +42,7 @@ class Bhf::PagesController < Bhf::ApplicationController
       unless p[:page].blank?
         page = p[:page].to_i
       end
-      
+
       per_page = platform.pagination.offset_per_page
       unless p[:per_page].blank?
         per_page = p[:per_page].to_i
@@ -55,4 +55,4 @@ class Bhf::PagesController < Bhf::ApplicationController
       platform.get_objects(p, page_params)
     end
 
-end
+end

data/app/helpers/bhf/application_helper.rb

@@ -20,7 +20,7 @@ module Bhf
     def delete_t(platform)
       t("bhf.helpers.entry.models.#{platform.model_name}.delete", platform_title: platform.title_singular.titleize, default: t('bhf.helpers.entry.delete')).html_safe
     end
-    
+
     def find_smallest_size_url_for_file(file)
       if file.exists?(:thumb)
         file.url(:thumb)
@@ -34,6 +34,6 @@ module Bhf
     def type_is_image?(type)
       Bhf.configuration.paperclip_image_types.include?(type)
     end
-    
+
   end
 end

data/app/helpers/bhf/entries_helper.rb

@@ -1,22 +1,22 @@
 module Bhf
   module EntriesHelper
     include Bhf::ActionView::FormOptions
-    
+
     def node(f, field, &block)
       render partial: 'bhf/helper/node', locals: {f: f, field: field, input: with_output_buffer(&block)}
     end
-    
+
     def definition_item(object, column, &block)
       render partial: 'bhf/helper/definition_item', locals: {object: object, column: column, content: with_output_buffer(&block)}
     end
-    
+
     def reflection_node(f, field, &block)
       return if !f.object.respond_to?(field.reflection.name) || (field.form_type == :static && f.object.new_record? && f.object.send(field.reflection.name).blank?)
       render partial: 'bhf/helper/reflection_node', locals: {
         f: f, field: field, input: with_output_buffer(&block)
       }
     end
-    
+
     def reflection_title(f, field, count = 2)
       title = f.object.class.human_attribute_name(field.reflection.name)
       if field.link
@@ -24,6 +24,6 @@ module Bhf
       end
       title
     end
-    
+
   end
-end
+end

data/app/helpers/bhf/frontend_helper.rb

@@ -5,11 +5,11 @@ module Bhf
       return unless session[Bhf.configuration.session_auth_name.to_s] == true
 
       options[:platform_name] ||= object.class.to_s.pluralize.downcase
-      
+
       if object.respond_to?(:'bhf_can_edit?', true)
         return unless object.bhf_can_edit?(options)
       end
-      
+
       area = if options[:area]
         options[:area]
       elsif object.respond_to?(:bhf_area, true)
@@ -20,4 +20,4 @@ module Bhf
     end
 
   end
-end
+end

data/app/helpers/bhf/pages_helper.rb

@@ -1,11 +1,11 @@
 module Bhf
   module PagesHelper
-    
+
     def get_value(key, p)
       return unless p.is_a?(Hash)
 
       return p[key[0]][key[1]] if key.is_a?(Array) && p[key[0]].is_a?(Hash) && p[key[0]][key[1]].is_a?(String) #omg
-      
+
       p[key] if p[key] && p[key].is_a?(String)
     end
 
@@ -26,9 +26,9 @@ module Bhf
     def order_class(order_by, platform_name)
       params_platfrom = params[platform_name] ? params[platform_name] : {}
       return unless params_platfrom['order'] == order_by
-      
+
       params_platfrom['direction'] == 'desc' ? 'sorted desc' : 'sorted asc'
     end
-    
+
   end
-end
+end

data/app/views/bhf/entries/_form.html.haml

@@ -3,15 +3,15 @@
 
   - if f.object.errors.any?
     = render partial: 'bhf/entries/validation_errors', locals: {f: f}
-    
+
   - @platform.fields.each do |field|
     = render partial: "bhf/form/#{field.macro}/#{field.form_type}", locals: {f: f, field: field}
 
   - unless @quick_edit
-    
+
     - if params[:return_to]
       = hidden_field :return, :to, name: :return_to, value: params[:return_to]
-    
+
     .node
       .label
       .input
@@ -21,5 +21,5 @@
             = f.submit t('bhf.helpers.form.buttons.and_edit'), name: :return_to_edit, class: 'alt_button'
           - unless @platform.hide_create
             = f.submit t('bhf.helpers.form.buttons.and_add'), name: :return_to_new, class: 'alt_button'
-        
+
         = link_to t('bhf.helpers.entry.cancel'), params[:return_to] ? params[:return_to] : page_path(@platform.page_name), class: 'cancel', data: ( {no_turbolink: true} if params[:return_to])

data/app/views/bhf/entries/_validation_errors.html.haml

@@ -2,4 +2,4 @@
   %h5= t 'bhf.helpers.validation.header', error: pluralize(f.object.errors.count, t('bhf.helpers.validation.error')), name: f.object.class.model_name.human
   %ul
     - f.object.errors.each do |name, message|
-      %li= f.error_label name, message
+      %li= f.error_label name, message

data/app/views/bhf/entries/edit.html.haml

@@ -1,2 +1,2 @@
 %h3= edit_t @platform
-= render 'bhf/entries/form'
+= render 'bhf/entries/form'

data/app/views/bhf/entries/new.html.haml

@@ -1,2 +1,2 @@
 %h3= new_t @platform
-= render 'bhf/entries/form'
+= render 'bhf/entries/form'

data/app/views/bhf/form/belongs_to/_radio.html.haml

@@ -1,4 +1,4 @@
-- data_source ||= field.link ? field.link.get_objects : field.reflection.klass.all 
+- data_source ||= field.link ? field.link.get_objects : field.reflection.klass.all
 - fk = field.db_name
 = reflection_node f, field do
   .quick_edit_block
@@ -12,7 +12,7 @@
             = label_tag "belongs_to_#{fk}_#{obj.id}", obj.to_bhf_s
           - if field.link && ! field.link.hide_delete
             = link_to '×'.html_safe, entry_path(field.link.name, obj), method: :delete, class: 'qe_delete js_delete', remote: true, data: {confirm: t('bhf.helpers.promts.confirm', platform_title: field.link.title_singular)}
-    
+
     .quick_edit_template{type: 'text/template'}
       %li
         = f.radio_button fk, '{object_id}', id: "belongs_to_#{fk}_{object_id}", class: 'js_remove_disabled', disabled: true
@@ -22,7 +22,7 @@
           = label_tag "belongs_to_#{fk}_#{obj.id}", obj.to_bhf_s
         - if field.link && ! field.link.hide_delete
           = link_to '×'.html_safe, entry_path(field.link.name, '{object_id}'), method: :delete, class: 'qe_delete js_delete', remote: true, data: {confirm: t('bhf.helpers.promts.confirm', platform_title: field.link.title_singular)}
-        
-      
+
+
     - if field.link && ! field.link.hide_create
-      = link_to '+', new_entry_path(field.link.name), class: 'js_add_field plus_button qe_button quick_edit'
+      = link_to '+', new_entry_path(field.link.name), class: 'js_add_field plus_button qe_button quick_edit'

data/app/views/bhf/form/belongs_to/_select.html.haml

@@ -1,4 +1,4 @@
-- data_source ||= field.link ? field.link.get_objects : field.reflection.klass.all 
+- data_source ||= field.link ? field.link.get_objects : field.reflection.klass.all
 - fk = field.db_name
 .node
   .label= f.label fk, reflection_title(f, field, 1)
@@ -9,10 +9,10 @@
       - select_options ||= options_from_collection_for_select_with_html_attrs(data_source, :id, :to_bhf_s, f.object.send(fk), Proc.new {|obj| {data: {edit: edit_entry_path(field.link.name, obj), delete: entry_path(field.link.name, obj)}}})
     - else
       - select_options ||= options_from_collection_for_select(data_source, :id, :to_bhf_s, f.object.send(fk))
-    
+
     = f.select fk, select_options, {include_blank: true}, {class: ('quick_edit_inject quick_edit_select' if field.link)}
     = render partial: 'bhf/helper/field_errors', locals: {f: f, field: fk}
-    
+
     - if field.link && ! field.link.hide_edit
       = link_to edit_t(field.link), '', class: 'js_edit_field icon edit quick_edit'
     - if field.link && ! field.link.hide_delete

data/app/views/bhf/form/column/_boolean.html.haml

@@ -1,2 +1,2 @@
 = node f, field do
-  = f.check_box field.name
+  = f.check_box field.name

data/app/views/bhf/form/column/_date.html.haml

@@ -1,2 +1,2 @@
 = node f, field do
-  = f.text_field field.name, class: "picker #{field.type}", value: f.object.send(field.name) ? l(f.object.send(field.name), format: t("bhf.helpers.input.date_format.#{field.type}")) : nil
+  = f.text_field field.name, class: "picker #{field.type}", value: f.object.send(field.name) ? l(f.object.send(field.name), format: t("bhf.helpers.input.date_format.#{field.type}")) : nil

data/app/views/bhf/form/column/_hash.html.haml

@@ -1,2 +1,2 @@
 = node f, field do
-  = f.object.send(field.name).inspect
+  = f.object.send(field.name).inspect

data/app/views/bhf/form/column/_hidden.html.haml

@@ -1 +1 @@
-= f.hidden_field field.name
+= f.hidden_field field.name

data/app/views/bhf/form/column/_markdown.html.haml

@@ -1,2 +1,2 @@
 = node f, field do
-  = f.text_area field.name, class: ('wmd_editor' unless @quick_edit)
+  = f.text_area field.name, class: ('wmd_editor' unless @quick_edit)

data/app/views/bhf/form/column/_multiple_fields.html.haml

@@ -1,2 +1,2 @@
 = node f, field do
-  = f.text_field field.name, class: 'multiple_field', data: {spliter: (f.object.send("#{field.name}_spliter") if f.object.respond_to?(:"#{field.name}_spliter"))}
+  = f.text_field field.name, class: 'multiple_field', data: {spliter: (f.object.send("#{field.name}_spliter") if f.object.respond_to?(:"#{field.name}_spliter"))}

data/app/views/bhf/form/column/_number.html.haml

@@ -1,2 +1,2 @@
 = node f, field do
-  = f.text_field field.name, class: 'number'
+  = f.text_field field.name, class: 'number'

data/app/views/bhf/form/column/_paperclip.html.haml

@@ -3,17 +3,17 @@
   = node f, field do
     - file = f.object.send(field.name)
     - if file.file?
-      
+
       - if type_is_image?(file.content_type)
         = link_to image_tag(find_smallest_size_url_for_file(file), class: 'uploaded_image'), file.url
       - else
         = link_to file.original_filename, file.url, class: 'uploaded_file'
-      
+
       - if f.object.respond_to?(:"#{field.name}_destroy")
         .file_delete
           = f.check_box "#{field.name}_destroy"
           = f.label "#{field.name}_destroy", t('bhf.helpers.file.delete')
-          
+
     %a.qe_button.ninja_file_field_holder.default_form_align{data: {empty_field_text: t('bhf.helpers.form.file_field.select')}}
       %span.h_text= t('bhf.helpers.form.file_field.select')
       = f.file_field field.name, class: 'ninja_file_field'

data/app/views/bhf/form/column/_password.html.haml

@@ -1,2 +1,2 @@
 = node f, field do
-  = f.password_field field.name
+  = f.password_field field.name

data/app/views/bhf/form/column/_static.html.haml

@@ -6,4 +6,4 @@
     - elsif field.display_type == :date
       = l value, format: :long
     - else
-      = value
+      = value

data/app/views/bhf/form/column/_string.html.haml

@@ -1,2 +1,2 @@
 = node f, field do
-  = f.text_field field.name
+  = f.text_field field.name

data/app/views/bhf/form/column/_text.html.haml

@@ -1,2 +1,2 @@
 = node f, field do
-  = f.text_area field.name
+  = f.text_area field.name

data/app/views/bhf/form/column/_wysiwyg.html.haml

@@ -1,2 +1,2 @@
 = node f, field do
-  = f.text_area field.name, class: 'wysiwyg'
+  = f.text_area field.name, class: 'wysiwyg'

data/app/views/bhf/form/embeds_many/_static.html.haml

@@ -12,7 +12,7 @@
             = ref_object.to_bhf_s
           - if field.link && ! field.link.hide_delete
             = link_to '×'.html_safe, entry_embed_path(field.link.name, f.object, ref_object), method: :delete, class: 'qe_delete js_delete', remote: true, data: {confirm: t('bhf.helpers.promts.confirm', platform_title: field.link.title_singular)}
-    
+
     .quick_edit_template{type: 'text/template'}
       %li.quick_edit_entry
         - if field.link && ! field.link.hide_edit
@@ -21,6 +21,6 @@
           = '{to_bhf_s}'
         - if field.link && ! field.link.hide_delete
           = link_to '×'.html_safe, entry_embed_path(field.link.name, f.object, '{object_id}'), method: :delete, class: 'qe_delete js_delete', remote: true, data: {confirm: t('bhf.helpers.promts.confirm', platform_title: field.link.title_singular)}
-    
+
     - if ! is_one && field.link && ! field.link.hide_create
-      = link_to '+', new_entry_embed_path(field.link.name, f.object), class: 'js_add_field plus_button qe_button quick_edit default_form_align'
+      = link_to '+', new_entry_embed_path(field.link.name, f.object), class: 'js_add_field plus_button qe_button quick_edit default_form_align'