reactive-router 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64e530a6af47e431072eb9b1f0885fbd1dff9485
-  data.tar.gz: a5d4b3a61c4ca4b4a75342fc1ee00cfff363a1c2
+  metadata.gz: c9e13f32bcb8346671dbb38dac2ebf5a2365bcab
+  data.tar.gz: 96a5ecc6d7c25a3b6980564aedbe86e7939a9053
 SHA512:
-  metadata.gz: bd05f416e8963820d59dbd67198298b5748741838b33e111622e34c897b30db6cae4543dbf5daf9ae05064bc94e89dac5add666076811ef426da9b6d7f746563
-  data.tar.gz: 8379a56770fd5cbb305401df4c5b8b79d4fb0b33e08f1818b46921b0db8475b16378be3ace4160931212b667b3d5e502f0713d97398a21be98f9da48cc572d05
+  metadata.gz: 7c178788272d94fc46bade0dc418ea910f824284f972463a8db2dd53e39458267eae83b9dade865c17bd436eba36ef575f16a8b2955dab283338baa6b34f9706
+  data.tar.gz: 245189488f47aeeb4d086a470dda6dcec13a45a0139b35a8f6cabe8026c4946ff0d7ce41be33fe14ce297c9f5b968bc2fd7e30aa597336d9f65ee5f29ebc5abf

data/lib/reactive-router/history.rb

@@ -35,6 +35,9 @@ class History
       if `event.state == null` # happens when popping off outer dialog
         puts "pop handler pops off last value"
         old_history = @history
+        @saved_history = @history # for safari's sake
+        @saved_path = @current_path
+        @saved_history_length = `ReactRouter.History.length`
         @current_path = ""
         @history = nil
         `ReactRouter.History.length = 0`
@@ -61,6 +64,12 @@ class History
 
     def push_path(path)
       puts "pushing path #{path}"
+      unless @history # needed because safari strangly pops off outer most history on initialization
+        @history = @saved_history
+        @current_path = @saved_path
+        `ReactRouter.History.length = #{@saved_history_length}`
+        @history.on_state_change.call(:active) if @history.on_state_change
+      end
       `window.history.pushState({ path: path, history_id: #{@history.name}, history_length: (ReactRouter.History.length += 1)}, '', path);`
       @current_path = path
       @history.notify_listeners(:push)
@@ -68,6 +77,12 @@ class History
 
     def replace_path(path)
       puts "replacing path #{path}"
+      unless @history # needed because safari strangly pops off outer most history on initialization
+        @history = @saved_history
+        @current_path = @saved_path
+        `ReactRouter.History.length = #{@saved_history_length}`
+        @history.on_state_change.call(:active) if @history.on_state_change
+      end
       `window.history.replaceState({ path: path, history_id: #{@history.name}, history_length: ReactRouter.History.length}, '', path);`
       @current_path = path
       @history.notify_listeners(:replace)
@@ -115,7 +130,11 @@ class History
     current_history = self.class.history
     self.class.history = self
     @starting_history_length = `ReactRouter.History.length` if current_history != self
-    self.class.push_path initial_path
+    if @name == "MainApp"
+      self.class.replace_path initial_path
+    else
+      self.class.push_path initial_path
+    end
     @on_state_change.call(:active) if @on_state_change and current_history != self
     self
   end
@@ -127,8 +146,11 @@ class History
   end
 
   def notify_listeners(type)
-    puts "#{self}.notify_listeners(#{type}) listeners_count: #{@listeners.count}, path: #{self.class.current_path}"
+    puts "!! #{self}.notify_listeners(#{type}) listeners_count: #{@listeners.count}, path: #{self.class.current_path}"
     @listeners.each { |listener| `listener.call(#{@location}, {path: #{self.class.current_path}, type: type})` }
+  rescue Exception => e
+    `debugger`
+    nil
   end
 
 

data/lib/reactive-router/router.rb

@@ -164,7 +164,7 @@ module React
         # override self.location to provide application specific location handlers
 
         def location
-          (@location ||= History.new("MainApp")).activate.location
+          (@location ||= History.new("MainApp")).activate.location  # must be called MainApp for now to avoid doing an extra state push (ugh)
         end
 
         after_mount do

data/lib/reactive-router/version.rb

@@ -1,3 +1,3 @@
 module ReactiveRouter
-  VERSION = "0.7.10"
+  VERSION = "0.7.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reactive-router
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - Adam George
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler