From 3c8482b651e340630e8a4a7475684c74f559a717 Mon Sep 17 00:00:00 2001
From: Jamon Holmgren <jamon@clearsightstudio.com>
Date: Thu, 26 Feb 2015 22:23:44 -0800
Subject: [PATCH 1/3] Removed travis

---
 .travis.yml | 2 +-
 Rakefile    | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0435949..65ad321 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ before_install:
     - (ruby --version)
     - sudo chown -R travis ~/Library/RubyMotion
     - mkdir -p ~/Library/RubyMotion/build
-    - sudo motion update --cache-version=3.6
+    - sudo motion update
 gemfile:
   - Gemfile
 script:
diff --git a/Rakefile b/Rakefile
index 9608aea..bb86eb4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
-RM_VERSION = "3.6" # Update .travis.yml too
-unless File.exist?("/Library/RubyMotion#{RM_VERSION}/lib")
-  abort "Couldn't find RubyMotion #{RM_VERSION}. Run `sudo motion update --cache-version=#{RM_VERSION}`."
-end
-$:.unshift("/Library/RubyMotion#{RM_VERSION}/lib")
+$:.unshift("/Library/RubyMotion/lib")
 require 'motion/project/template/ios'
 require 'bundler'
 Bundler.require(:development)

From 6064c6cebcfd2fb3540551cedb2a5df3fd7f89b0 Mon Sep 17 00:00:00 2001
From: Jamon Holmgren <jamon@clearsightstudio.com>
Date: Tue, 10 Mar 2015 08:14:04 -0700
Subject: [PATCH 2/3] Remove accessory view from original cell when searching
 -- fixes issue #586

---
 lib/ProMotion/table/cell/table_view_cell_module.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/ProMotion/table/cell/table_view_cell_module.rb b/lib/ProMotion/table/cell/table_view_cell_module.rb
index 19f5fde..c4963ee 100644
--- a/lib/ProMotion/table/cell/table_view_cell_module.rb
+++ b/lib/ProMotion/table/cell/table_view_cell_module.rb
@@ -73,6 +73,9 @@ module ProMotion
       if data_cell[:accessory][:view] == :switch
         self.accessoryView = switch_view
       else
+        if data_cell[:accessory][:view].superview && data_cell[:accessory][:view].superview.is_a?(UITableViewCell)
+          data_cell[:accessory][:view].superview.accessoryView = nil # Fix for issue #586
+        end
         self.accessoryView = data_cell[:accessory][:view]
         self.accessoryView.autoresizingMask = UIViewAutoresizingFlexibleWidth
       end

From a1f6d665ffd21b65d0c17ce582406d2cb34a690b Mon Sep 17 00:00:00 2001
From: Kevin VanGelder <kevin@clearsightstudio.com>
Date: Tue, 17 Mar 2015 19:04:06 -0700
Subject: [PATCH 3/3] fixed issue where on_init wasn't called until after
 screen_setup which caused on_load to fire early in certain cases

---
 lib/ProMotion/screen/screen_module.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ProMotion/screen/screen_module.rb b/lib/ProMotion/screen/screen_module.rb
index 98022fd..9bef7ce 100644
--- a/lib/ProMotion/screen/screen_module.rb
+++ b/lib/ProMotion/screen/screen_module.rb
@@ -14,8 +14,8 @@ module ProMotion
       apply_properties(args)
       add_nav_bar(args) if args[:nav_bar]
       tab_bar_setup
-      try :screen_setup
       try :on_init
+      try :screen_setup
       PM.logger.deprecated "In #{self.class.to_s}, #on_create has been deprecated and removed. Use #screen_init instead." if respond_to?(:on_create)
     end