controller_methods.rb in apotomo-1.2.0

- old
+ new

@@ -46,11 +46,11 @@
       
       def apotomo_request_processor
         return @apotomo_request_processor if @apotomo_request_processor
         
         # happens once per request:
-        options = { :js_framework   => Apotomo.js_framework || :prototype } # FIXME: remove :prototype
+        options = {:js_framework   => Apotomo.js_framework}
         
         @apotomo_request_processor = Apotomo::RequestProcessor.new(self, options, self.class.has_widgets_blocks)
       end
       
       def apotomo_root
@@ -82,16 +82,9 @@
         
         apotomo_event_path(apotomo_request_processor.address_for(options))
       end
       
     protected
-      
-      # TODO: remove me! only needed in widget_shortcuts.
-      def parent_controller
-        self
-      end
-      
-      
       # Renders the page updates through an iframe. Copied from responds_to_parent,
       # see http://github.com/markcatley/responds_to_parent .
       def render_iframe_updates(page_updates)
         escaped_script = Apotomo::JavascriptGenerator.escape(page_updates.join("\n"))
         