active_scaffold 3.4.39 → 3.4.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a46edc1511bb6fce264d9a5501dbd457988f3a2
-  data.tar.gz: 861d1f3c682de2f0f2679ef0d037d9e728a48db6
+  metadata.gz: 152411df889eae74af885f2b6ce2cb0ecd95ecfa
+  data.tar.gz: a8ecc3993f301bc58f37f0572dc7662f947785b2
 SHA512:
-  metadata.gz: 2e50e693ef1eb90f8ab74ef85906c5d0529c6c9f27b50d6e2c6cd3325532b7837a4350421357e03f29ffcec384f984634293f996bfb308981b08ac5d8279e936
-  data.tar.gz: b9cd9f61abadffadf976c12b18c95acb729746a42983844b133c25c2341619abaf213480ed67704f20be3ee09b146e5fef2fbbc02f4952cb973116501f8aff8a
+  metadata.gz: e71dd16a516c5e81a47dbd0e9266149a2e3711b34d7f5a9ef2f7517ecd60c635079653c2f046813d8b3e778852e3a032572fcf4970689ca5add2a2492f1d48bf
+  data.tar.gz: 2051ccd77aac8d5d9af23d098b1666c4049c6653b02f583315a8bb3b0e0eb20e8740b4da81d2ce211c01686103adc6ddb19dde2c5c6631a015e2114e131a7521

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 3.4.40
+- allow to exclude bitfield column
+- replace some uses of $ with jQuery
+
 = 3.4.39
 - fix removing delete link with config.delete.link = false, broken on 3.4.38
 - fix position of nested action groups

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -447,10 +447,10 @@ var ActiveScaffold = {
     jQuery('.as-js-button', element).show();
   },
   sliders: function(element) {
-    $('.as-slider', element).each(function() {
+    jQuery('.as-slider', element).each(function() {
       var opts = $(this).data('slider');
-      $(this).slider(opts); 
-      if (opts.disabled) $(this).find('.ui-slider-handle').hide();
+      jQuery(this).slider(opts); 
+      if (opts.disabled) jQuery(this).find('.ui-slider-handle').hide();
     });
   },
   load_embedded: function(element) {
@@ -977,15 +977,15 @@ var ActiveScaffold = {
          */
         var last_focus = ActiveScaffold.last_focus;
         if (last_focus) {
-          $(last_focus).blur();
+          jQuery(last_focus).blur();
           ActiveScaffold.last_focus = last_focus;
         }
         //ActiveScaffold.disable_form(as_form); // not needed: called from on('ajax:beforeSend', 'form.as_form')
 
-        if ($.rails.fire(element, 'ajax:beforeSend', [xhr, settings])) {
+        if (jQuery.rails.fire(element, 'ajax:beforeSend', [xhr, settings])) {
           element.trigger('ajax:send', xhr);
         } else {
-          $(ActiveScaffold.last_focus).focus();
+          jQuery(ActiveScaffold.last_focus).focus();
           return false;
         }
       },
@@ -1020,15 +1020,15 @@ var ActiveScaffold = {
 
   setup_warn_changes: function() {
     var need_confirm = false;
-    var unload_message = $('meta[name=unload-message]').attr('content') || ActiveScaffold.config.unload_message || "This page contains unsaved data that will be lost if you leave this page.";
-    $(document).on('change input', '.active-scaffold form:not(.search) input, .active-scaffold form:not(.search) textarea, .active-scaffold form:not(.search) select', function() {
-      $(this).closest('form').addClass('need-confirm');
+    var unload_message = jQuery('meta[name=unload-message]').attr('content') || ActiveScaffold.config.unload_message || "This page contains unsaved data that will be lost if you leave this page.";
+    jQuery(document).on('change input', '.active-scaffold form:not(.search) input, .active-scaffold form:not(.search) textarea, .active-scaffold form:not(.search) select', function() {
+      jQuery(this).closest('form').addClass('need-confirm');
     });
-    $(document).on('click', '.active-scaffold .as_cancel:not([data-remote]), .active-scaffold input[type=submit]', function() {
-      $(this).closest('form').removeClass('need-confirm');
+    jQuery(document).on('click', '.active-scaffold .as_cancel:not([data-remote]), .active-scaffold input[type=submit]', function() {
+      jQuery(this).closest('form').removeClass('need-confirm');
     });
     window.onbeforeunload = function() {
-      if ($('form.need-confirm').length) return unload_message;
+      if (jQuery('form.need-confirm').length) return unload_message;
     }
   }
 }

data/lib/active_scaffold/bridges/bitfields/bitfields_bridge.rb

@@ -20,8 +20,12 @@ module ActiveScaffold
             columns = options.keys.sort_by { |column| self.columns[column].weight }
             [:create, :update, :show, :subform].each do |action|
               if actions.include? action
-                send(action).columns.exclude column_name
-                send(action).columns.add_subgroup(column_name) { |group| group.add *columns }
+                if send(action).columns.include? column_name
+                  send(action).columns.exclude column_name
+                  send(action).columns.add_subgroup(column_name) { |group| group.add *columns }
+                else
+                  send(action).columns.exclude *columns
+                end
               end
             end
           end if model.respond_to?(:bitfields) && model.bitfields.present?

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 4
-    PATCH = 39
+    PATCH = 40
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.39
+  version: 3.4.40
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler