active_scaffold_vho 3.1.5 → 3.1.6

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

@@ -1,11 +1,11 @@
-$('form.as_form, form.inplace_form').live('as:form_loaded', function(event) {
+$(document).on('as:form_loaded', 'form.as_form, form.inplace_form', function(event) {
     var as_form = $(this).closest("form");
     as_form.find('textarea.as_mceEditor').each(function(index, elem) {
       tinyMCE.execCommand('mceAddControl', false, $(elem).attr('id'));
     });
     return true;
   });
-$('form.as_form, form.inplace_form').live('as:form_submit', function(event) {
+$(document).on('as:form_submit', 'form.as_form, form.inplace_form', function(event) {
     var as_form = $(this).closest("form");
     if (as_form.has('textarea.as_mceEditor').length > 0) {
       tinyMCE.triggerSave();
@@ -13,7 +13,7 @@ $('form.as_form, form.inplace_form').live('as:form_submit', function(event) {
     return true;
   });
 
-$('form.as_form, form.inplace_form').live('as:form_unloaded', function(event) {
+$(document).on('as:form_unloaded', 'form.as_form, form.inplace_form', function(event) {
     var as_form = $(this).closest("form");
     as_form.find('textarea.as_mceEditor').each(function(index, elem) {
       tinyMCE.execCommand('mceRemoveControl', false, $(elem).attr('id'));

data/app/assets/stylesheets/active_scaffold_core.css.erb

@@ -562,10 +562,10 @@ padding-left: 5px;
 border-left: solid 1px #ccc;
 }
 
-.active-scaffold-footer .previous {
-margin-right: 0;
-padding-right: 5px;
-border-right: solid 1px #ccc;
+.active-scaffold-footer .prev {
+    margin-right: 3px;
+    padding-right: 3px;
+    border-right: solid 1px #ccc;
 }
 
 /* Messages
@@ -994,7 +994,6 @@ font-size: 100%;
 }
 
 .active-scaffold-found {
-  float:left;
 }
 
 .as_touch a.inline-adapter-close {
@@ -1003,7 +1002,7 @@ height: 27px;
 background: url(<%= asset_data_uri 'close_touch.png' %>) 0 0 no-repeat;
 }
 
-.as_touch .as_paginate {
+.as_touch .active-scaffold-pagination a {
 font-size: 20px;
 padding: 3px 10px;
 }

data/app/assets/stylesheets/jquery-ui-timepicker-addon.css

@@ -1,6 +1,10 @@
 .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
 .ui-timepicker-div dl { text-align: left; }
-.ui-timepicker-div dl dt { height: 25px; }
-.ui-timepicker-div dl dd { margin: -25px 10px 10px 65px; }
+.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
 .ui-timepicker-div td { font-size: 90%; }
 .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+
+.ui-timepicker-rtl{ direction: rtl; }
+.ui-timepicker-rtl dl { text-align: right; }
+.ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; }

data/frontends/default/views/_list_record_columns.html.erb

@@ -1,7 +1,6 @@
 <% columns.each do |column| %>
   <% authorized = record.authorized_for_read_column?(column.name) -%>
   <% column_value = authorized ? get_column_value(record, column) : active_scaffold_config.list.empty_field_text -%>
-
   <td class="<%= column_class(column, column_value, record) %>" >
     <%= authorized ? render_list_column(column_value, column, record) : column_value %>
   </td>

data/frontends/default/views/_row.html.erb

@@ -1,11 +1,7 @@
 <%= render :partial => 'list_record', :locals => {:record => record}%>
 <% if active_scaffold_config.list.columns.any? {|c| c.calculation?} %>
 <script type="text/javascript">
-//<![CDATA[
-  <%= update_page do |page|
-    page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations')
-  end %>
-//]]>
+ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
 </script>
 <% end %>
 

data/lib/active_scaffold/actions/list.rb

@@ -33,8 +33,7 @@ module ActiveScaffold::Actions
       end
     end
     def list_respond_to_js
-      if params[:embedded]
-        params.delete(:embedded)
+      if params.delete(:embedded)
         render(:partial => 'list_with_header')
       else
         render :action => 'list.js'
@@ -65,7 +64,7 @@ module ActiveScaffold::Actions
 
       options = { :sorting => active_scaffold_config.list.user.sorting,
         :count_includes => active_scaffold_config.list.user.count_includes }
-      paginate = (params[:format].nil?) ? (accepts? :html, :js) : ['html', 'js'].include?(params[:format])
+      paginate = (params[:format].nil?) ? (accepts? :html, :js) : ['html', 'js'].include?(params[:format].to_s)
       if paginate
         options.merge!({
             :per_page => active_scaffold_config.list.user.per_page,

data/lib/active_scaffold/actions/nested.rb

@@ -83,7 +83,7 @@ module ActiveScaffold::Actions
     
     def beginning_of_chain
       if nested? && nested.association && nested.association.collection?
-        nested.parent_scope.send(nested.association.name)
+        nested.parent_scope.send(nested.association.name).where("")
       elsif nested? && nested.scope
         nested.parent_scope.send(nested.scope)
       else

data/lib/active_scaffold/helpers/association_helpers.rb

@@ -3,11 +3,11 @@ module ActiveScaffold
     module AssociationHelpers
       # Provides a way to honor the :conditions on an association while searching the association's klass
       def association_options_find(association, conditions = nil)
-        association.klass.where(conditions).where(association.options[:conditions]).all
+        association.klass.where(conditions).where(association.options[:conditions])
       end
 
       def association_options_count(association, conditions = nil)
-        association.klass.where(conditions).where(association.options[:conditions]).count
+        association_options_find(association, conditions).count
       end
 
       # returns options for the given association as a collection of [id, label] pairs intended for the +options_for_select+ helper.

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,105 +1,81 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: active_scaffold_vho
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: 3.1.6
   prerelease: 
-  segments: 
-  - 3
-  - 1
-  - 5
-  version: 3.1.5
 platform: ruby
-authors: 
+authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-01-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &5201540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: shoulda
-  version_requirements: *id001
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *5201540
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &5165600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  name: bundler
-  version_requirements: *id002
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *5165600
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &5157800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: rcov
-  version_requirements: *id003
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *5157800
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &5155320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
-  name: rails
-  version_requirements: *id004
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *5155320
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: &5153520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: kaminari
-  version_requirements: *id005
   prerelease: false
-description: Save time and headaches, and create a more easily maintainable set of pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read, update, delete) user interface needs, leaving you more time to focus on more challenging (and interesting!) problems.
+  version_requirements: *5153520
+description: Save time and headaches, and create a more easily maintainable set of
+  pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read,
+  update, delete) user interface needs, leaving you more time to focus on more challenging
+  (and interesting!) problems.
 email: activescaffold@googlegroups.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - .autotest
 - .document
 - .gitignore
@@ -390,39 +366,34 @@ files:
 - test/test_helper.rb
 - uninstall.rb
 homepage: http://github.com/vhochstein/active_scaffold
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3291551366358840762
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Rails 3 Version of activescaffold supporting prototype and jquery
-test_files: 
+test_files:
 - test/bridges/bridge_test.rb
 - test/config/base_test.rb
 - test/config/create_test.rb