app/helpers/trestle/form_helper.rb in trestle-0.8.9 vs app/helpers/trestle/form_helper.rb in trestle-0.8.10

@@ -3,11 +3,11 @@
     def trestle_form_for(instance, options={}, &block)
       options[:builder] ||= Form::Builder
       options[:as] ||= admin.parameter_name
 
       options[:data] ||= {}
-      options[:data].merge!(remote: true, type: :html, behavior: "trestle-form", turbolinks: false)
+      options[:data].reverse_merge!(remote: true, type: :html, behavior: "trestle-form", turbolinks: false)
 
       form_for(instance, options) do |f|
         with_form(f) { yield f }
       end
     end
@@ -19,13 +19,9 @@
       @_trestle_form = nil
     end
 
     def form
       @_trestle_form
-    end
-
-    def toolbar(name, &block)
-      content_for(:"#{name}_toolbar", &block)
     end
 
     def sidebar(&block)
       content_for(:sidebar, &block)
     end