deps update

Gemfile.lock

@@ -6,7 +6,7 @@ GIT
 
 GIT
   remote: https://github.com/jejacks0n/navigasmic.git
-  revision: 28b18a66ad0aedcf0582df317612d6021e78858b
+  revision: 1ffe437f279657c6fb87bb4b0215eb723df4ea7a
   specs:
     navigasmic (0.5.6)
 
@@ -29,7 +29,7 @@ GEM
     active-model-email-validator (1.0.2)
       activemodel
       mail
-    active_scaffold (3.2.4)
+    active_scaffold (3.2.11)
       rails (>= 3.1.3)
     activemodel (3.2.2)
       activesupport (= 3.2.2)
@@ -47,10 +47,10 @@ GEM
       multi_json (~> 1.0)
     acts_as_nested_interval (0.0.5)
       rails (~> 3.2.1)
-    addressable (2.2.7)
+    addressable (2.2.8)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
-    bootstrap-sass (2.0.2)
+    bootstrap-sass (2.0.3.1)
     builder (3.0.0)
     cancan (1.6.7)
     capistrano (2.9.0)
@@ -77,7 +77,7 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.1)
+    coffee-script-source (1.3.3)
     compass (0.12.1)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
@@ -96,7 +96,7 @@ GEM
     diff-lcs (1.1.3)
     ejs (1.0.0)
     erubis (2.7.0)
-    execjs (1.3.0)
+    execjs (1.4.0)
       multi_json (~> 1.0)
     factory_girl (2.5.2)
       activesupport (>= 2.3.9)
@@ -110,22 +110,22 @@ GEM
       tins (~> 0.3)
     fssm (0.2.9)
     gem_plugin (0.2.3)
-    guard (1.0.1)
+    guard (1.0.3)
       ffi (>= 0.5.0)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6)
     guard-rspec (0.6.0)
       guard (>= 0.10.0)
     guard-spork (0.5.2)
       guard (>= 0.10.0)
       spork (>= 0.8.4)
-    highline (1.6.11)
+    highline (1.6.12)
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.3)
     jquery-rails (2.0.2)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    json (1.6.6)
+    json (1.7.3)
     libnotify (0.7.2)
     libv8 (3.3.10.4)
     libwebsocket (0.1.3)
@@ -139,13 +139,13 @@ GEM
     mongrel (1.2.0.pre2)
       daemons (~> 1.0.10)
       gem_plugin (~> 0.2.3)
-    multi_json (1.3.2)
+    multi_json (1.3.5)
     mysql2 (0.3.11)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.3.0)
+    net-ssh (2.5.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     nilify_blanks (1.0.0)
@@ -153,7 +153,7 @@ GEM
       activesupport (>= 3.0.0)
     nokogiri (1.5.2)
     orm_adapter (0.0.7)
-    pjax_rails (0.2.0)
+    pjax_rails (0.2.1)
       jquery-rails
     polyamorous (0.5.0)
       activerecord (~> 3.0)
@@ -209,8 +209,8 @@ GEM
       sexp_processor (~> 3.0)
     ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    rubyzip (0.9.7)
-    sass (3.1.16)
+    rubyzip (0.9.8)
+    sass (3.1.19)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -223,11 +223,11 @@ GEM
       rubyzip
     sentient_user (0.3.2)
     sexp_processor (3.2.0)
-    simple_form (2.0.1)
+    simple_form (2.0.2)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
-    simplecov (0.6.2)
-      multi_json (~> 1.3)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     sourcify (0.6.0.rc1)
@@ -235,8 +235,8 @@ GEM
       ruby2ruby (>= 1.2.5)
       ruby_parser (>= 2.0.5)
       sexp_processor (>= 3.0.5)
-    spork (1.0.0rc2)
-    sprockets (2.1.2)
+    spork (1.0.0rc3)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -249,7 +249,7 @@ GEM
       libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
-    tins (0.3.13)
+    tins (0.4.2)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)

app/views/active_scaffold_overrides/_list_inline_adapter.html.erb

@@ -1,20 +0,0 @@
-<%
-  # hotfix for https://github.com/activescaffold/active_scaffold/issues/148
-  # remove when fixed
-  
-  column_count = if nested? && params[:action] == 'index'
-    active_scaffold_config_for(nested.parent_model).list.columns.count + 1
-  else
-    active_scaffold_config.list.columns.count + 1
-  end
-%>
-<%# nested_id, allows us to remove a nested scaffold programmatically %>
-<tr class="inline-adapter" id="<%= element_row_id :action => :nested %>">
-  <td colspan="<%= column_count %>" class="inline-adapter-cell">
-    <div class="<%= "#{params[:action]}-view" if params[:action] %> <%= "#{nested? ? nested.name : id_from_controller(params[:controller])}-view" %> view">
-      <%= link_to(as_(:close), '', :class => 'inline-adapter-close as_cancel', :remote => true, :title => as_(:close), 'data-refresh' => (action_name == 'index' ? true : false)) -%>
-      <%= payload -%>
-    </div>
-  </td>
-</tr>
-<%= javascript_tag("var action_link = ActiveScaffold.ActionLink.get('#{element_row_id(:action => :nested)}'); if (action_link) action_link.update_flash_messages('#{escape_javascript(render(:partial => 'messages').strip)}');") %>