express_admin 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8701e68cc4e8e5e09d5625f132370a27c4d2aedc
-  data.tar.gz: a0754bf8a6bb4cf4b3654483dc0fe14e93066a74
+  metadata.gz: b7506c6470c547440b995022d7e43a0870e104c3
+  data.tar.gz: 5af377c17f7a68e8b803a2f0abbc1b01d04f6606
 SHA512:
-  metadata.gz: f459c1f910e6cc6c005bce1931c847f05b2bf1851d27b38c1098b2a8c6bdc4e76174c62c2b2e9a830d0cc6c610a3911ea6129895e7a9a15e4ef7060741470a17
-  data.tar.gz: 6c5bdd36bdc945659a4b7417d75e1752bf00e3ae9c6b7806170c875a1d10eb2fa2474079b80fc9fd83fff7057f6f5d2b5cf6d403dd05d1441f5e6f9f2b5af728
+  metadata.gz: 0811310b3ad2e10e76b0e2d72f9d6e8d9698880fbec890a4f90018a700d4b7a49016163528c707956202274ca572f99b1611b830f4a29438581dfaf8711a3211
+  data.tar.gz: e69ee46045156ce056db8438deb34489984e9a5b52a9bb6988ebb308ab4026d9e68998f5a480a714c13470bc8d658598a7caef0e102724ac1548aafd248b5c3d

data/app/assets/javascripts/express_admin/scrollTableBody.js

@@ -2,14 +2,14 @@
     var defaults = {
         rowsToDisplay: 10
     };
-    
+
     var scrollBarWidth = 15, fixedTableWidth;
-    
+
     $.fn.scrollTableBody = function(options) {
         options = $.extend(defaults, options);
-        
+
         var table = this;
-        
+
         wrapTable(table, options);
         alignColumns(table);
 
@@ -18,52 +18,52 @@
         if (canDebounce) resizeAlignFunction = _.debounce(resizeAlignFunction, 150);
         $(window).resize(resizeAlignFunction);
     };
-    
+
     function wrapTable(table, options) {
         var existingClasses = table.attr('class');
         var existingMarginBottom = table.css('margin-bottom');
         table.css('margin-bottom', 0);
         var rowHeight = table.find('tbody tr:first').outerHeight();
         var tableHeight = rowHeight * options.rowsToDisplay;
-        
+
         var headerTable = $('<table style="table-layout:fixed;width:auto;margin-bottom:0;" class="jqstb-header-table ' + existingClasses + '"><thead><tr><td></td></tr></thead></table>'),
             footerTable = $('<table style="table-layout:fixed;width:auto;margin-bottom:' + existingMarginBottom + ';" class="jqstb-footer-table ' + existingClasses + '"><tfoot><tr><td></td></tr></tfoot></table>'),
             scrollDiv = '<div class="jqstb-scroll" style="height:' + tableHeight + 'px;overflow-y:auto"></div>';
-        
+
         // Insert the table that will hold the fixed header and footer, and insert the div that will get scrolled
         table.before(headerTable).before(scrollDiv).after(footerTable);
     }
-    
+
     function alignColumns(table) {
         table.each(function (index) {
             // To minimize "Flash of Unstyled Content" (FOUC), set the relevant variables before manipulating the DOM
             var $dataTable = $(this);
             var $headerTable = $('table.jqstb-header-table').eq(index);
             var $footerTable = $('table.jqstb-footer-table').eq(index);
-            
+
             // Place main table data inside of relevant scrollable div (using jQuery eq() and index)
             var $scrollDiv = $('div.jqstb-scroll').eq(index);
             $scrollDiv.prepend($dataTable);
             var scrollEl = $scrollDiv[0];
-            
+
             var hasHorizontalScroll = scrollEl.clientWidth < scrollEl.scrollWidth;
             $scrollDiv.outerWidth(fixedTableWidth + scrollBarWidth + 2);
-            
+
             if (hasHorizontalScroll) {
                 var dataTableWidth = $dataTable.outerWidth();
                 $headerTable.width(dataTableWidth);
                 $footerTable.width(dataTableWidth);
                 $scrollDiv.outerWidth(scrollEl.clientWidth);
                 var scrollDivWidth = $scrollDiv.outerWidth();
-                
+
                 var width = scrollDivWidth - scrollBarWidth;
-                
+
                 var $headerScrollDiv = $('<div style="overflow:hidden;width:' + width + 'px" class="jqstb-header-scroll"></div>');
                 $headerTable.wrap($headerScrollDiv);
-                
+
                 var $footerScrollDiv = $('<div style="overflow:hidden;width:' + width + 'px" class="jqstb-footer-scroll"></div>');
                 $footerTable.wrap($footerScrollDiv);
-                
+
                 $scrollDiv.on('scroll', function() {
                     $('div.jqstb-header-scroll').scrollLeft($(this).scrollLeft());
                     $('div.jqstb-footer-scroll').scrollLeft($(this).scrollLeft());
@@ -74,7 +74,7 @@
             $dataTable.find('thead tr:first th, tbody tr:first td').each(function () {
                 $(this).outerWidth($(this).outerWidth());
             });
-            
+
             // Insert header data into fixed header table
             $headerTable.find('thead').replaceWith($dataTable.children('caption, thead').clone());
 
@@ -82,15 +82,15 @@
             $dataTable.find('tfoot tr:first td').each(function () {
                 $(this).outerWidth($(this).outerWidth());
             });
-            
+
             // Insert footer data into fixed footer table
             $footerTable.find('tfoot').replaceWith($dataTable.children('tfoot').clone());
-            
+
             // Hide original caption, header, and footer
             $dataTable.children('caption, thead, tfoot').hide();
         });
     }
-    
+
     function alignOnResize(table) {
         table.each(function (index) {
             var $dataTable = $(this);
@@ -99,7 +99,7 @@
 
             // Temporarily show the inner table's header and footer since the dom calculates width based on them being visible
             $dataTable.children('thead, tfoot').show();
-            
+
             var scrollEl = $('div.jqstb-scroll')[0];
             var hasHorizontalScroll = scrollEl.clientWidth < scrollEl.scrollWidth;
             if (hasHorizontalScroll) {
@@ -107,7 +107,7 @@
                 $('div.jqstb-header-scroll').outerWidth(scrollDivWidth - scrollBarWidth);
                 $('div.jqstb-footer-scroll').outerWidth(scrollDivWidth - scrollBarWidth);
             }
-            
+
             // Force column widths to be set for each header column
             var $headerColumns = $headerTable.find('thead tr:first th');
             $dataTable.find('thead tr:first th').each(function (i) {
@@ -119,9 +119,9 @@
             $dataTable.find('tfoot tr:first td').each(function (i) {
                 $footerColumns.eq(i).outerWidth($(this).outerWidth());
             });
-            
-            // Hide the inner table's header and footer when we're done 
+
+            // Hide the inner table's header and footer when we're done
             $dataTable.children('thead, tfoot').hide();
         });
     }
-})(jQuery);
+})(jQuery);

data/app/assets/javascripts/express_admin.js

@@ -4,6 +4,7 @@
 //= require jquery.loadingdotdotdot
 //= require tinymce-jquery
 //= require select2
+//= require dropzone
 //= require ace/ace
 //= require ace/worker-html
 //= require ace/mode-ruby

data/app/components/express_admin/smart_table.rb

@@ -44,6 +44,7 @@ module ExpressAdmin
         }
       }
       tbody {
+        stored_member_assigns = assigns[collection_member_name.to_sym]
         collection.each do |item|
           assigns[collection_member_name.to_sym] = item
           tr(id: row_id(item), class: row_class(item)) {
@@ -55,7 +56,7 @@ module ExpressAdmin
             actions_column(item) if should_show_actions?
             hidden_column_cell if columns_hidden?
           }
-          assigns[collection_member_name.to_sym] = nil
+          assigns[collection_member_name.to_sym] = stored_member_assigns
         end ; nil
       }
 

data/lib/express_admin/engine.rb

@@ -5,6 +5,7 @@ require 'express_templates'
 require 'jquery-rails'
 require 'jquery-ui-rails'
 require 'select2-rails'
+require 'dropzonejs-rails'
 require 'foundation_apps_styles'
 require 'bourbon'
 require 'gravatar_image_tag'

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

data/test/dummy/test/components/icon_link_test.rb

@@ -39,7 +39,6 @@ module ExpressAdmin
     end
 
     test "icon-link target set to blank" do
-      # binding.pry
       assert_match /target="_blank"/, rendered_icon_link(target: "#{resource[:target]}")
     end
 

data/vendor/gems/express_templates/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    express_templates (0.10.0)
+    express_templates (0.10.1)
       activesupport (~> 4.2)
       arbre (~> 1.0)
       parslet (~> 1.6)
@@ -88,7 +88,7 @@ GEM
       ruby-progressbar
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    parslet (1.7.0)
+    parslet (1.7.1)
       blankslate (>= 2.0, <= 4.0)
     pry (0.10.1)
       coderay (~> 1.1.0)

data/vendor/gems/express_templates/lib/arbre/patches.rb

@@ -46,8 +46,8 @@ module Arbre
     def method_missing(name, *args, &block)
       if current_arbre_element.respond_to?(name)
         current_arbre_element.send name, *args, &block
-      elsif assigns && assigns.has_key?(name)
-        assigns[name]
+      elsif assigns && assigns.has_key?(name.to_sym)
+        assigns[name.to_sym]
       elsif helpers.respond_to?(name)
         helper_method(name, *args, &block)
       elsif route_proxy = possible_route_proxy(name)

data/vendor/gems/express_templates/lib/express_templates/compiler.rb

@@ -4,7 +4,7 @@ module ExpressTemplates
 
       template, src = _normalize(template_or_src)
 
-      %Q[Arbre::Context.new(assigns.merge(template_virtual_path: @virtual_path), self) { #{src || block.source_body} }.to_s]
+      %Q[assigns.merge!(template_virtual_path: @virtual_path) ; Arbre::Context.new(assigns, self) { #{src || block.source_body} }.to_s]
     end
 
     private

data/vendor/gems/express_templates/lib/express_templates/components/all.rb

@@ -7,7 +7,7 @@ module ExpressTemplates
       contains -> (&block) {
         prepended
         collection.each do |item|
-          assigns[member_name] = item
+          assigns[member_name.to_sym] = item
           block.call(self) if block
         end
         appended

data/vendor/gems/express_templates/lib/express_templates/components/base.rb

@@ -32,10 +32,6 @@ module ExpressTemplates
         add_class _default_classes
       end
 
-      def assigns
-        @assigns_with_indifferent_access ||= super.merge(helpers.assigns.with_indifferent_access)
-      end
-
       def self.contains(proc = nil, &block)
         define_method(:_build_body, &(proc || block))
       end

data/vendor/gems/express_templates/lib/express_templates/components/configurable.rb

@@ -86,7 +86,9 @@ module ExpressTemplates
             if !!value[:attribute]
               set_attribute key, value[:default]
             else
-              config[key] ||= value[:default]
+              if config[key].nil?
+                config[key] = value[:default]
+              end
             end
           end
         end

data/vendor/gems/express_templates/lib/express_templates/components/forms/basic_fields.rb

@@ -28,6 +28,13 @@ RUBY
       #   }
       # end
 
+      class File < FormComponent
+        contains {
+          label_tag(label_name, label_text)
+          file_field_tag field_name_attribute, field_helper_options
+        }
+      end
+
       class Textarea < FormComponent
         contains {
           label_tag(label_name, label_text)

data/vendor/gems/express_templates/lib/express_templates/components/forms/express_form.rb

@@ -10,6 +10,7 @@ module ExpressTemplates
         has_option :action, 'The form action containing the resource path or url.'
         has_option :on_success, 'Pass a form value indicating where to go on a successful submission.'
         has_option :on_failure, 'Pass a form value indicating where to go on a failed submission.'
+        has_option :enctype, 'The enctype attribute specifies how the form-data should be encoded when submitting it to the server.'
 
         prepends -> {
           div(style: 'display:none') {
@@ -24,6 +25,7 @@ module ExpressTemplates
         before_build -> {
           set_attribute(:id, form_id)
           set_attribute(:action, form_action)
+          set_attribute(:enctype, form_enctype) if form_enctype
           add_class(config[:id])
         }
 
@@ -35,6 +37,10 @@ module ExpressTemplates
           config[:action] || (resource.try(:persisted?) ? resource_path(resource) : collection_path)
         end
 
+        def form_enctype
+          config[:enctype]
+        end
+
       end
     end
   end

data/vendor/gems/express_templates/lib/express_templates/version.rb

@@ -1,3 +1,3 @@
 module ExpressTemplates
-  VERSION = "0.10.1"
+  VERSION = "0.11.0"
 end

data/vendor/gems/express_templates/test/components/forms/basic_fields_test.rb

@@ -3,7 +3,7 @@ require 'active_model'
 
 class BasicFieldsTest < ActiveSupport::TestCase
 
-  BASIC_FIELDS = %w(email phone text password color date datetime
+  BASIC_FIELDS = %w(email phone text password color file date datetime
                     datetime_local number range
                     search telephone time url week)