lib/sugarcube/modal.rb in sugarcube-0.20.6 vs lib/sugarcube/modal.rb in sugarcube-0.20.7

@@ -1,10 +1,10 @@
 module SugarCube
   module Modal
     module_function
     def present_modal(view_ctlr, options={}, &block)
-      target = options.fetch(:target, UIApplication.sharedApplication.keyWindow.rootViewController)
+      target = options[:target] || UIApplication.sharedApplication.keyWindow.rootViewController
       animated = options.fetch(:animated, true)
       target.presentViewController(view_ctlr, animated:animated, completion:block)
     end
 
     def present_modal_in_nav(view_ctlr, options={}, &block)
@@ -25,19 +25,19 @@
 
 class UIViewController
 
   def present_modal(view_ctlr, options={}, &block)
     options = options.merge(target: self)
-    super(view_ctlr, options, &block)
+    SugarCube::Modal.present_modal(view_ctlr, options, &block)
   end
 
   def present_modal_in_nav(view_ctlr, options={}, &block)
     options = options.merge(target: self)
-    super(view_ctlr, options, &block)
+    SugarCube::Modal.present_modal_in_nav(view_ctlr, options, &block)
   end
 
   def dismiss_modal(view_ctlr, options={}, &block)
     options = options.merge(target: self)
-    super(view_ctlr, options, &block)
+    SugarCube::Modal.dismiss_modal(view_ctlr, options, &block)
   end
 
 end