bhf 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dae4152f9ff30476941024292a0b3c14084e75f0
-  data.tar.gz: 7a0608945e50916118d4fa32648c55b311fa0226
+  metadata.gz: 5e11f1b3a941a6246b9913a969711d7e8cb35af0
+  data.tar.gz: c1ee24fe0023ab269a5aca72136a99f887477da5
 SHA512:
-  metadata.gz: 7018abe3d2bd151236bd0bbbfc78e4f4fd8aedd717340f36498d1088b4015f5644a5fb7193a4c6509b92499427d6434f063e2924e402efa2473d18b8880b923d
-  data.tar.gz: 225e770798d889438e68a884a590c8f75eec8a021c5dfb7dbfc62ea6dc0386b9a04fee7653ec4fbca36a79a8143230abaf0e94c261053d8b51c5af7aba1eff1e
+  metadata.gz: 6c4108e0e03a28f8de09660a3140d3bced156331c35090165e5e4bf450b5fa73d7a7e1ae685f5d6898069f2df0ae77c927c990091b651385d18e8f387dc86311
+  data.tar.gz: e71e10d4b7e53fd92e5324ac6629092b0fc6e0dd2722ff69d31f3f20d88ad81e18bd91e4ae3a8b0f9b51d49aca278ba88aa2fd830cd5bd437474d20562afdf85

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

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

@@ -31,10 +31,10 @@ Turbolinks.pagesCached(0);
 				var linkElem = this.linkElem;
 				var rowElem = this.linkElem.getParent('tr');
 				if (rowElem) {
-  				rowElem.addClass('animate');
-  				setTimeout(function(){
-  					rowElem.removeClass('animate');
-  				}, 600);
+					rowElem.addClass('animate');
+					setTimeout(function(){
+						rowElem.removeClass('animate');
+					}, 600);
 				}
 				setTimeout(function(){
 					linkElem.removeClass('live_edit');
@@ -331,15 +331,14 @@ Turbolinks.pagesCached(0);
 		});
 		
 		mainScope.getElements('.ninja_file_field').addEvent('change', function(){
-      var text = (this.value || '').split('\\');
-      var parent = this.getParent();
-      var newText = parent.get('data-empty-field-text');
-      if (this.value) {
-        newText = text.getLast() || this.value;
-      }
-      parent.getElement('.h_text').set('text', newText);
-    });
-    
+			var text = (this.value || '').split('\\');
+			var parent = this.getParent();
+			var newText = parent.get('data-empty-field-text');
+			if (this.value) {
+				newText = text.getLast() || this.value;
+			}
+			parent.getElement('.h_text').set('text', newText);
+		});
 		
 		ajaxNote.success();
 	});

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

@@ -17,25 +17,25 @@ provides:
 ...
 */
 
-(function($){
-  var domReadyCallback = function(){
-    rails.csrf = {
-      token: rails.getCsrf('token'),
-      param: rails.getCsrf('param')
-    };
+window.addEvent('domready', function(){
   
-    rails.applyEvents();
+  rails.csrf = {
+    token: rails.getCsrf('token'),
+    param: rails.getCsrf('param')
   };
-  window.addEvent('domready', domReadyCallback);
-  document.addEventListener('page:load', domReadyCallback);
+  
+  rails.applyEvents();
+});
 
+(function($){
+  
   window.rails = {
     /**
      * If el is passed as argument, events will only be applied to
      * elements within el. Otherwise applied to document body.
      */
     applyEvents: function(el){
-      el = $(el || document.body);
+      el = $(el || document);
       var apply = function(selector, action, callback){
         el.addEvent(action + ':relay(' + selector + ')', callback);
       };

data/app/views/bhf/entries/show.haml

@@ -5,9 +5,9 @@
       - column_value = @object.send(column.name)
       - if ! column_value.blank?
         = definition_item @object, column do
-          = render(partial: "bhf/table/#{column.macro}/#{column.show_type}", locals: {column_value: column_value, object: @object})
+          = render(partial: "bhf/table/#{column.macro}/#{column.show_type}", locals: {column_value: column_value, object: @object, link: false, add_quick_link: false})
 
 - if @platform.show_extra_fields and @platform.show_extra_fields.any?
   .content_box
     - @platform.show_extra_fields.each do |name|
-      = render(partial: "bhf/table/column/#{name}", locals: {name: name, object: @object})
+      = render(partial: "bhf/table/column/#{name}", locals: {name: name, object: @object, link: false, add_quick_link: false})

data/app/views/bhf/pages/_platform.haml

@@ -1,4 +1,3 @@
-- cached_partials = {}
 - platform.pagination.template = self
 - referral_id = nil
 - if flash[:referral_entry] && referral_entry = flash[:referral_entry].clone.symbolize_keys
@@ -7,6 +6,8 @@
 - if platform.custom_partial
   = render partial: "bhf/platform/#{platform.custom_partial}", locals: {platform: platform, referral_id: referral_id}
 - else
+  - cached_partials = {}
+  - local_names = [:column_value, :object, :link, :add_quick_link]
   %table.data_table{id: "#{platform.name}_platform", class: (platform.custom_columns? ? :custom_columns : :default_columns)}
     %caption
       %h4= platform.title
@@ -34,7 +35,7 @@
       - if platform.objects.any?
         - platform.objects.each do |object|
           - edit_link = platform.hide_edit ? "##{object.id}_#{platform.name}" : edit_entry_path(platform.name, object)
-          - custom_link = send(platform.custom_link, platform.name, object) if platform.custom_link
+          - custom_link = send(platform.custom_link, platform: platform.name, id: object) if platform.custom_link
           %tr.quick_edit_entry{id: "#{object.id}_#{platform.name}", class: ('animate live_edit initial_referral' if referral_id == object.id)}
             - if platform.sortable
               %td.drag
@@ -45,17 +46,14 @@
               - if column.display_type == :primary_key && column_value.to_s.length > 6
                 - css_classes << :key_long
               %td{class: css_classes}
-                - value = if column.display_type != :boolean && column_value.blank?
-                  - '&nbsp;'.html_safe
+                - partial_name = if column.display_type != :boolean && column_value.blank?
+                  - 'column/empty'
                 - else
-                  - if column.display_type == :string
-                    - column_value
-                  - else
-                    - partial_name = "#{column.macro}/#{column.display_type}"
-                    - cached_partials[partial_name] ||= lookup_context.find_template(partial_name, ['bhf/table'], true, [:column_value, :object])
-                    - cached_partials[partial_name].render(self, {column_value: column_value, object: object})
-                    -# render(partial: "bhf/table/#{column.macro}/#{column.display_type}", locals: {column_value: column_value, object: object})
-                = link_to value, (platform.custom_link ? custom_link : edit_link), class: ('quick_edit' if !platform.custom_link && platform.table_quick_edit)
+                  - "#{column.macro}/#{column.display_type}"
+                - cached_partials[partial_name] ||= lookup_context.find_template(partial_name, ['bhf/table'], true, local_names)
+                - locals = {column_value: column_value, object: object, link: (platform.custom_link ? custom_link : edit_link), add_quick_link: (!platform.custom_link && platform.table_quick_edit)}
+                = cached_partials[partial_name].render(self, locals)
+                -# render(partial: "bhf/table/#{column.macro}/#{column.display_type}", locals: {column_value: column_value, object: object})
 
             %td.action{class: ('wider' if platform.show_duplicate && !platform.hide_edit && !platform.hide_delete)}
               - if platform.show_duplicate
@@ -79,9 +77,9 @@
               %span.handle.icon &nbsp;
           - platform.columns.each do |column|
             - css_classes = [column.macro, column.display_type]
-            - custom_link = send(platform.custom_link, platform.name, '{object_id}') if platform.custom_link
+            - custom_link = send(platform.custom_link, platform: platform.name, id: '{object_id}') if platform.custom_link
             %td{class: css_classes}
-              = link_to "{#{column.name}}", (platform.custom_link ? custom_link : edit_link), class: ('quick_edit' unless platform.custom_link)
+              = render(partial: "bhf/table/#{column.macro}/#{column.display_type}", locals: {column_value: "{#{column.name}}", object: platform.model.new, link: (platform.custom_link ? custom_link : edit_link), add_quick_link: (!platform.custom_link && platform.table_quick_edit)})
 
           %td.action{class: ('wider' if platform.show_duplicate && !platform.hide_edit && !platform.hide_delete)}
             - if platform.show_duplicate

data/app/views/bhf/table/belongs_to/_default.haml

@@ -1,2 +1 @@
-- ref_object = column_value
-= ref_object.blank? ? t('bhf.helpers.entry.empty', count: 1) : ref_object.to_bhf_s
+= render partial: 'bhf/table/has_one/default', locals: {column_value: column_value, object: object, link: link, add_quick_link: add_quick_link}

data/app/views/bhf/table/column/_array.haml

@@ -1 +1,2 @@
-= column_value[0..5].join(', ')
+= content_tag link ? :a : :span, class: ('quick_edit' if add_quick_link), href: (link if link) do
+  = column_value[0..5].join(', ')

data/app/views/bhf/table/column/_boolean.haml

@@ -1 +1,2 @@
-= t("bhf.helpers.boolean.#{!!column_value}")
+= content_tag link ? :a : :span, class: ('quick_edit' if add_quick_link), href: (link if link) do
+  = t("bhf.helpers.boolean.#{!!column_value}")

data/app/views/bhf/table/column/_date.haml

@@ -1 +1,5 @@
-= l(column_value, format: :short) if column_value
+= content_tag link ? :a : :span, class: ('quick_edit' if add_quick_link), href: (link if link) do
+  - if column_value.is_a?(String)
+    = column_value
+  - else
+    = l(column_value, format: :short) 

data/app/views/bhf/table/column/_empty.haml

@@ -0,0 +1,2 @@
+= content_tag link ? :a : :span, class: ('quick_edit' if add_quick_link), href: (link if link) do
+  = ' '.html_safe

data/app/views/bhf/table/column/_file.haml

@@ -1 +1 @@
-= link_to_if column_value, column_value, column_value
+= link_to column_value, column_value

data/app/views/bhf/table/column/_hash.haml

@@ -1 +1,2 @@
-= column_value.inspect
+= content_tag link ? :a : :span, class: ('quick_edit' if add_quick_link), href: (link if link) do
+  = column_value.inspect

data/app/views/bhf/table/column/_image.haml

@@ -1 +1,2 @@
-= image_tag column_value, alt: column_value, class: 'preview_image'
+= content_tag link ? :a : :span, class: ('quick_edit' if add_quick_link), href: (link if link) do
+  = image_tag column_value, alt: column_value, class: 'preview_image'

data/app/views/bhf/table/column/_number.haml

@@ -1 +1,2 @@
-= column_value
+= content_tag link ? :a : :span, class: ('quick_edit' if add_quick_link), href: (link if link) do
+  = column_value

data/app/views/bhf/table/column/_paperclip.haml

@@ -1,5 +1,6 @@
-- file = column_value
-- if type_is_image?(file.content_type)
-  = image_tag find_smallest_size_url_for_file(file), alt: column_value, class: 'preview_image'
-- else
-  = file.original_filename
+= content_tag link ? :a : :span, class: ('quick_edit' if add_quick_link), href: (link if link) do
+  - file = column_value
+  - if type_is_image?(file.content_type)
+    = image_tag find_smallest_size_url_for_file(file), alt: column_value, class: 'preview_image'
+  - else
+    = file.original_filename

data/app/views/bhf/table/column/_primary_key.haml

@@ -1 +1,2 @@
-%strong= column_value
+= content_tag link ? :a : :span, class: ('quick_edit' if add_quick_link), href: (link if link) do
+  %strong= column_value

data/app/views/bhf/table/column/_string.haml

@@ -1 +1,2 @@
-= column_value
+= content_tag link ? :a : :span, class: ('quick_edit' if add_quick_link), href: (link if link) do
+  = column_value

data/app/views/bhf/table/column/_text.haml

@@ -1 +1,2 @@
-= sanitize(column_value.to_s, tags: %w(strong em))
+= content_tag link ? :a : :span, class: ('quick_edit' if add_quick_link), href: (link if link) do
+  = sanitize(column_value.to_s, tags: %w(strong em))

data/app/views/bhf/table/embeds_many/_default.haml

@@ -1 +1 @@
-= render partial: 'bhf/table/has_many/default', locals: {ref_objects: column_value}
+= render partial: 'bhf/table/has_many/default', locals: {column_value: column_value, object: object, link: link, add_quick_link: add_quick_link}

data/app/views/bhf/table/embeds_one/_default.haml

@@ -1 +1 @@
-= render partial: 'bhf/table/has_one/default', locals: {ref_object: column_value}
+= render partial: 'bhf/table/has_one/default', locals: {column_value: column_value, object: object, link: link, add_quick_link: add_quick_link}

data/app/views/bhf/table/has_and_belongs_to_many/_default.haml

@@ -1 +1 @@
-= render partial: 'bhf/table/has_many/default', locals: {ref_objects: column_value}
+= render partial: 'bhf/table/has_many/default', locals: {column_value: column_value, object: object, link: link, add_quick_link: add_quick_link}

data/app/views/bhf/table/has_many/_default.haml

@@ -1,2 +1,5 @@
-- ref_objects ||= column_value
-= ref_objects.blank? ? t('bhf.helpers.entry.empty', count: 2) : ref_objects.collect(&:to_bhf_s).join(', ')
+= content_tag link ? :a : :span, class: ('quick_edit' if add_quick_link), href: (link if link) do
+  - if column_value.is_a?(String)
+    = column_value
+  - else
+    = column_value.collect(&:to_bhf_s).join(', ')

data/app/views/bhf/table/has_one/_default.haml

@@ -1,2 +1,5 @@
-- ref_object ||= column_value
-= ref_object.blank? ? t('bhf.helpers.entry.empty', count: 1) : ref_object.to_bhf_s
+= content_tag link ? :a : :span, class: ('quick_edit' if add_quick_link), href: (link if link) do
+  - if column_value.is_a?(String)
+    = column_value
+  - else
+    = column_value.to_bhf_s

data/bhf.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: bhf 0.9.1 ruby lib
+# stub: bhf 0.9.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bhf"
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -113,6 +113,7 @@ Gem::Specification.new do |s|
     "app/views/bhf/table/column/_array.haml",
     "app/views/bhf/table/column/_boolean.haml",
     "app/views/bhf/table/column/_date.haml",
+    "app/views/bhf/table/column/_empty.haml",
     "app/views/bhf/table/column/_extern_link.haml",
     "app/views/bhf/table/column/_file.haml",
     "app/views/bhf/table/column/_hash.haml",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Anton Pawlik
@@ -252,6 +252,7 @@ files:
 - app/views/bhf/table/column/_array.haml
 - app/views/bhf/table/column/_boolean.haml
 - app/views/bhf/table/column/_date.haml
+- app/views/bhf/table/column/_empty.haml
 - app/views/bhf/table/column/_extern_link.haml
 - app/views/bhf/table/column/_file.haml
 - app/views/bhf/table/column/_hash.haml