active_scaffold 3.4.29 → 3.4.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc80a3e80925ceb736fe6db2e5446e1ddf5e53bf
-  data.tar.gz: 38a31dc92324a6e82dec8b513693459ee8ca9724
+  metadata.gz: 7e5dcb6120b7892389220769c34d3ab10bbd0683
+  data.tar.gz: 65f2ff944aea908bfcd9f436ac1e1c33def2e163
 SHA512:
-  metadata.gz: 32144972575f671e74215503ad1bd7fde30e80aa23724eb1c7a25d2e2c95860f969f3b775dd7838c785b34c871ad3a4c525365837d823fa932b84b87b57899d4
-  data.tar.gz: c2e27021d50cd84a14487cd500d8d262b0fd1b9f4aa5dd9be2962217205f086a78cedb75343010635eaed09d9540436a53ee7d90fa72e6e287df4a506f22d893
+  metadata.gz: 31fe13541a4da8ec38c3d2e682c098a4f591c9f62f9ba2b22698cf51b6f262cde69c75520e9e99b9f196bd7dbafa4fddc1e3d62c6872e37c604d409663f04d91
+  data.tar.gz: 94bc7c51e32e0b0e35e58a7d40573092c2d693010a3d072492290ae6adfbfa342d385f765ce3ab4769cddc22e36e0d4f69967107491f6aefac4d067f43e6e3bd

data/CHANGELOG

@@ -1,3 +1,7 @@
+- move jquery-ui images to app/assets for rails 4.2 compatibility
+- clean css so no need to reverse links on nested
+- fix responds_to_parent with redirect
+
 = 3.4.29
 - fix for search_ui :multi_select on non-association column and non integer options
 - ensure id for radio button is valid

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

@@ -1,33 +1,40 @@
-<% case ActiveScaffold.js_framework %>
-<% when :jquery %>
-<% require_asset "getprototypeof" %>
-<% if Jquery::Rails.const_defined? 'JQUERY_UI_VERSION' %>
-<% require_asset "jquery-ui" %>
-<% require_asset "jquery-ui-timepicker-addon" %>
-<% require_asset "jquery/date_picker_bridge" %>
-<% require_asset "jquery/draggable_lists" %>
-<% elsif Jquery.const_defined? 'Ui' %>
-<% jquery_ui_prefix = Jquery::Ui::Rails::VERSION < '5.0.0' ? 'jquery.ui.' : 'jquery-ui/' %>
-<% require_asset "#{jquery_ui_prefix}core" %>
-<% require_asset "#{jquery_ui_prefix}effect" %>
-<% require_asset "#{jquery_ui_prefix}sortable" %>
-<% require_asset "#{jquery_ui_prefix}draggable" %>
-<% require_asset "#{jquery_ui_prefix}droppable" %>
-<% require_asset "#{jquery_ui_prefix}datepicker" %>
-<% require_asset "jquery-ui-timepicker-addon" %>
-<% require_asset "jquery/date_picker_bridge" %>
-<% require_asset "jquery/draggable_lists" %>
-<% end %>
-<% require_asset "jquery/active_scaffold" %>
-<% require_asset "jquery/jquery.editinplace" %>
-<% when :prototype %>
-<% require_asset "effects" %>
-<% require_asset "controls" %>
-<% require_asset "prototype/active_scaffold" %>
-<% require_asset "prototype/dhtml_history" %>
-<% require_asset "prototype/form_enhancements" %>
-<% require_asset "prototype/rico_corner" %>
-<% end %>
+<%
+  case ActiveScaffold.js_framework
+  when :jquery
+    jquery_ui = true
+    require_asset "getprototypeof"
+    if Jquery::Rails.const_defined? 'JQUERY_UI_VERSION'
+      require_asset "jquery-ui"
+    elsif Jquery.const_defined? 'Ui'
+      jquery_ui_prefix = Jquery::Ui::Rails::VERSION < '5.0.0' ? 'jquery.ui.' : 'jquery-ui/'
+      require_asset "#{jquery_ui_prefix}core"
+      require_asset "#{jquery_ui_prefix}effect"
+      require_asset "#{jquery_ui_prefix}sortable"
+      require_asset "#{jquery_ui_prefix}draggable"
+      require_asset "#{jquery_ui_prefix}droppable"
+      require_asset "#{jquery_ui_prefix}datepicker"
+    else
+      jquery_ui = false
+    end
+    if jquery_ui
+      require_asset "jquery-ui-timepicker-addon"
+      require_asset "jquery/date_picker_bridge"
+      require_asset "jquery/draggable_lists"
+    end
+    require_asset "jquery.visible.min"
+    require_asset "jquery/active_scaffold"
+    require_asset "jquery/jquery.editinplace"
+  when :prototype
+    require_asset "effects"
+    require_asset "controls"
+    require_asset "prototype/active_scaffold"
+    require_asset "prototype/dhtml_history"
+    require_asset "prototype/form_enhancements"
+    require_asset "prototype/rico_corner"
+  end
+%>
 ActiveScaffold.config = <%= ActiveScaffold.js_config.to_json %>;
-<% ActiveScaffold.javascripts.each {|js| require_asset js} %>
-<% ActiveScaffold::Bridges.all_javascripts.each {|js| require_asset js} %>
+<%
+  ActiveScaffold.javascripts.each {|js| require_asset js}
+  ActiveScaffold::Bridges.all_javascripts.each {|js| require_asset js}
+%>

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -104,12 +104,6 @@ top: 19px;
 top: 14px;
 }
 
-.view .active-scaffold-header div.actions a,
-.view .active-scaffold-header div.actions div,
-.view .active-scaffold-header div.actions div.action_group {
-float: left;
-}
-
 .active-scaffold-header div.actions a.disabled {
 opacity: 0.5;
 }
@@ -119,7 +113,7 @@ opacity: 0.5;
 .active-scaffold-header div.actions a.show_search,
 .active-scaffold-header div.actions a.show_config_list,
 .active-scaffold-header div.actions div.action_group div {
-margin:0;  
+margin:0;
 padding: 5px 5px 5px 25px;
 background-position: 5px 50%;
 background-repeat: no-repeat;

data/app/views/active_scaffold_overrides/_list_header.html.erb

@@ -1,7 +1,7 @@
 <% action_links = active_scaffold_config.action_links.collection
   unless action_links.empty? -%>
   <div class="actions">
-    <%= display_action_links(action_links, nil, :skip_unauthorized => true, :reverse => nested?) %>
+    <%= display_action_links(action_links, nil, :skip_unauthorized => true) %>
     <%= loading_indicator_tag(:action => :table) %>
   </div>
 <% end %>

data/lib/active_scaffold/actions/update.rb

@@ -142,10 +142,10 @@ module ActiveScaffold::Actions
       column = params.delete(:column).to_sym
       params.delete(:original_html)
       params.delete(:original_value)
+      @column = active_scaffold_config.columns[column]
       @record = find_if_allowed(params[:id], :read)
       return unless @record.authorized_for?(:crud_type => :update, :column => column)
 
-      @column = active_scaffold_config.columns[column]
       value ||=
         unless @column.column.nil? || @column.column.null
           @column.column.default == true ? false : @column.column.default

data/lib/active_scaffold/responds_to_parent.rb

@@ -10,10 +10,11 @@ module ActiveScaffold
 
       # Either pull out a redirect or the request body
       script =  if response.headers['Location']
-                  "document.location.href = '#{self.class.helpers.escape_javascript location.to_s}'"
+                  "document.location.href = '#{self.class.helpers.escape_javascript response.headers.delete('Location').to_s}'"
                 else
                   response.body || ''
                 end
+      response.status = 200 if (300...400).include? response.status
 
       # Eval in parent scope and replace document location of this frame
       # so back button doesn't replay action on targeted forms

data/lib/active_scaffold/version.rb

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

data/vendor/assets/javascripts/jquery.visible.min.js

@@ -0,0 +1 @@
+(function(e){e.fn.visible=function(t,n,r){var i=e(this).eq(0),s=i.get(0),o=e(window),u=o.scrollTop(),a=u+o.height(),f=o.scrollLeft(),l=f+o.width(),c=i.offset().top,h=c+i.height(),p=i.offset().left,d=p+i.width(),v=t===true?h:c,m=t===true?c:h,g=t===true?d:p,y=t===true?p:d,b=n===true?s.offsetWidth*s.offsetHeight:true,r=r?r:"both";if(r==="both")return!!b&&m<=a&&v>=u&&y<=l&&g>=f;else if(r==="vertical")return!!b&&m<=a&&v>=u;else if(r==="horizontal")return!!b&&y<=l&&g>=f}})(jQuery)

data/vendor/assets/stylesheets/jquery-ui-theme.css.erb

@@ -1,25 +1,42 @@
+/*
+ *= depend_on_asset "jquery-ui/ui-bg_diagonals-thick_18_b81900_40x40.png"
+ *= depend_on_asset "jquery-ui/ui-bg_diagonals-thick_20_666666_40x40.png"
+ *= depend_on_asset "jquery-ui/ui-bg_flat_10_000000_40x100.png"
+ *= depend_on_asset "jquery-ui/ui-bg_glass_100_f6f6f6_1x400.png"
+ *= depend_on_asset "jquery-ui/ui-bg_glass_100_fdf5ce_1x400.png"
+ *= depend_on_asset "jquery-ui/ui-bg_glass_65_ffffff_1x400.png"
+ *= depend_on_asset "jquery-ui/ui-bg_gloss-wave_35_f6a828_500x100.png"
+ *= depend_on_asset "jquery-ui/ui-bg_highlight-soft_100_eeeeee_1x100.png"
+ *= depend_on_asset "jquery-ui/ui-bg_highlight-soft_75_ffe45c_1x100.png"
+ *= depend_on_asset "jquery-ui/ui-icons_222222_256x240.png"
+ *= depend_on_asset "jquery-ui/ui-icons_228ef1_256x240.png"
+ *= depend_on_asset "jquery-ui/ui-icons_ef8c08_256x240.png"
+ *= depend_on_asset "jquery-ui/ui-icons_ffd27a_256x240.png"
+ *= depend_on_asset "jquery-ui/ui-icons_ffffff_256x240.png"
+ */
+
 /* Component containers
 ----------------------------------*/
-.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(<%= image_path('ui-bg_highlight-soft_100_eeeeee_1x100.png') %>) 50% top repeat-x; color: #333333; }
+.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(<%= image_path('jquery-ui/ui-bg_highlight-soft_100_eeeeee_1x100.png') %>) 50% top repeat-x; color: #333333; }
 .ui-widget-content a { color: #333333; }
-.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(<%= image_path('ui-bg_gloss-wave_35_f6a828_500x100.png') %>) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
+.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(<%= image_path('jquery-ui/ui-bg_gloss-wave_35_f6a828_500x100.png') %>) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
 .ui-widget-header a { color: #ffffff; }
 
 /* Interaction states
 ----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(<%= image_path('ui-bg_glass_100_f6f6f6_1x400.png') %>) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(<%= image_path('jquery-ui/ui-bg_glass_100_f6f6f6_1x400.png') %>) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; }
 .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(<%= image_path('ui-bg_glass_100_fdf5ce_1x400.png') %>) 50% 50% repeat-x; font-weight: bold; color: #c77405; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(<%= image_path('jquery-ui/ui-bg_glass_100_fdf5ce_1x400.png') %>) 50% 50% repeat-x; font-weight: bold; color: #c77405; }
 .ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(<%= image_path('ui-bg_glass_65_ffffff_1x400.png') %>) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(<%= image_path('jquery-ui/ui-bg_glass_65_ffffff_1x400.png') %>) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
 .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; }
 .ui-widget :active { outline: none; }
 
 /* Interaction Cues
 ----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fed22f; background: #ffe45c url(<%= image_path('ui-bg_highlight-soft_75_ffe45c_1x100.png') %>) 50% top repeat-x; color: #363636; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fed22f; background: #ffe45c url(<%= image_path('jquery-ui/ui-bg_highlight-soft_75_ffe45c_1x100.png') %>) 50% top repeat-x; color: #363636; }
 .ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(<%= image_path('ui-bg_diagonals-thick_18_b81900_40x40.png') %>) 50% 50% repeat; color: #ffffff; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(<%= image_path('jquery-ui/ui-bg_diagonals-thick_18_b81900_40x40.png') %>) 50% 50% repeat; color: #ffffff; }
 .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
 .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
 .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
@@ -30,18 +47,18 @@
 ----------------------------------*/
 
 /* states and images */
-.ui-icon { background-image: url(<%= image_path('ui-icons_222222_256x240.png') %>); }
-.ui-widget-content .ui-icon {background-image: url(<%= image_path('ui-icons_222222_256x240.png') %>); }
-.ui-widget-header .ui-icon {background-image: url(<%= image_path('ui-icons_ffffff_256x240.png') %>); }
-.ui-state-default .ui-icon { background-image: url(<%= image_path('ui-icons_ef8c08_256x240.png') %>); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(<%= image_path('ui-icons_ef8c08_256x240.png') %>); }
-.ui-state-active .ui-icon {background-image: url(<%= image_path('ui-icons_ef8c08_256x240.png') %>); }
-.ui-state-highlight .ui-icon {background-image: url(<%= image_path('ui-icons_228ef1_256x240.png') %>); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(<%= image_path('ui-icons_ffd27a_256x240.png') %>); }
+.ui-icon { background-image: url(<%= image_path('jquery-ui/ui-icons_222222_256x240.png') %>); }
+.ui-widget-content .ui-icon {background-image: url(<%= image_path('jquery-ui/ui-icons_222222_256x240.png') %>); }
+.ui-widget-header .ui-icon {background-image: url(<%= image_path('jquery-ui/ui-icons_ffffff_256x240.png') %>); }
+.ui-state-default .ui-icon { background-image: url(<%= image_path('jquery-ui/ui-icons_ef8c08_256x240.png') %>); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(<%= image_path('jquery-ui/ui-icons_ef8c08_256x240.png') %>); }
+.ui-state-active .ui-icon {background-image: url(<%= image_path('jquery-ui/ui-icons_ef8c08_256x240.png') %>); }
+.ui-state-highlight .ui-icon {background-image: url(<%= image_path('jquery-ui/ui-icons_228ef1_256x240.png') %>); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(<%= image_path('jquery-ui/ui-icons_ffd27a_256x240.png') %>); }
 
 /* Misc visuals
 ----------------------------------*/
 
 /* Overlays */
-.ui-widget-overlay { background: #666666 url(<%= image_path('ui-bg_diagonals-thick_20_666666_40x40.png') %>) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); }
-.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(<%= image_path('ui-bg_flat_10_000000_40x100.png') %>) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }
+.ui-widget-overlay { background: #666666 url(<%= image_path('jquery-ui/ui-bg_diagonals-thick_20_666666_40x40.png') %>) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); }
+.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(<%= image_path('jquery-ui/ui-bg_flat_10_000000_40x100.png') %>) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.29
+  version: 3.4.30
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brakeman
@@ -111,6 +111,20 @@ files:
 - app/assets/images/active_scaffold/indicator.gif
 - app/assets/images/active_scaffold/magnifier.png
 - app/assets/images/active_scaffold/refresh.png
+- app/assets/images/jquery-ui/ui-bg_diagonals-thick_18_b81900_40x40.png
+- app/assets/images/jquery-ui/ui-bg_diagonals-thick_20_666666_40x40.png
+- app/assets/images/jquery-ui/ui-bg_flat_10_000000_40x100.png
+- app/assets/images/jquery-ui/ui-bg_glass_100_f6f6f6_1x400.png
+- app/assets/images/jquery-ui/ui-bg_glass_100_fdf5ce_1x400.png
+- app/assets/images/jquery-ui/ui-bg_glass_65_ffffff_1x400.png
+- app/assets/images/jquery-ui/ui-bg_gloss-wave_35_f6a828_500x100.png
+- app/assets/images/jquery-ui/ui-bg_highlight-soft_100_eeeeee_1x100.png
+- app/assets/images/jquery-ui/ui-bg_highlight-soft_75_ffe45c_1x100.png
+- app/assets/images/jquery-ui/ui-icons_222222_256x240.png
+- app/assets/images/jquery-ui/ui-icons_228ef1_256x240.png
+- app/assets/images/jquery-ui/ui-icons_ef8c08_256x240.png
+- app/assets/images/jquery-ui/ui-icons_ffd27a_256x240.png
+- app/assets/images/jquery-ui/ui-icons_ffffff_256x240.png
 - app/assets/javascripts/active_scaffold.js.erb
 - app/assets/javascripts/jquery/active_scaffold.js
 - app/assets/javascripts/jquery/active_scaffold_chosen.js
@@ -419,22 +433,9 @@ files:
 - test/model_stub.rb
 - test/run_all.rb
 - test/test_helper.rb
-- vendor/assets/images/ui-bg_diagonals-thick_18_b81900_40x40.png
-- vendor/assets/images/ui-bg_diagonals-thick_20_666666_40x40.png
-- vendor/assets/images/ui-bg_flat_10_000000_40x100.png
-- vendor/assets/images/ui-bg_glass_100_f6f6f6_1x400.png
-- vendor/assets/images/ui-bg_glass_100_fdf5ce_1x400.png
-- vendor/assets/images/ui-bg_glass_65_ffffff_1x400.png
-- vendor/assets/images/ui-bg_gloss-wave_35_f6a828_500x100.png
-- vendor/assets/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
-- vendor/assets/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
-- vendor/assets/images/ui-icons_222222_256x240.png
-- vendor/assets/images/ui-icons_228ef1_256x240.png
-- vendor/assets/images/ui-icons_ef8c08_256x240.png
-- vendor/assets/images/ui-icons_ffd27a_256x240.png
-- vendor/assets/images/ui-icons_ffffff_256x240.png
 - vendor/assets/javascripts/getprototypeof.js
 - vendor/assets/javascripts/jquery-ui-timepicker-addon.js
+- vendor/assets/javascripts/jquery.visible.min.js
 - vendor/assets/stylesheets/jquery-ui-theme.css.erb
 - vendor/assets/stylesheets/jquery-ui.css
 homepage: https://github.com/activescaffold/active_scaffold