hack version with special event listener for popstate (rather than ov…

…erwritten)

srcjs/_start.js

@@ -3,20 +3,6 @@
 
   var exports = window.Shiny = window.Shiny || {};
 
-/*
-  (function(history){
-    var pushState = history.pushState;
-    history.pushState = function(state) {
-        if (typeof history.onpushstate == "function") {
-            history.onpushstate({state: state});
-        }
-        // whatever else you want to do
-        // maybe call onhashchange e.handler
-        return pushState.apply(history, arguments);
-    };
-  })(window.history);
-*/
-
   $(document).on('submit', 'form:not([action])', function(e) {
     e.preventDefault();
   });

srcjs/init_shiny.js

@@ -418,22 +418,10 @@ function initShiny() {
   // Send initial URL search (query string) and update it if it changes
   initialValues['.clientdata_url_search']   = window.location.search;
 
-  // on popstate
-  window.onpopstate = history.onpushstate = function(e) {
-    inputs.setInput('.clientdata_url_search', window.location.search);
-  };
-
-/*
   $(window).bind("popstate", function() {
     inputs.setInput('.clientdata_url_search', window.location.search);
   });
 
-  $(window).bind("pushstate", function() {
-    inputs.setInput('.clientdata_url_search', window.location.search);
-  });
-*/
-
-
   // This is only the initial value of the hash. The hash can change, but
   // a reactive version of this isn't sent because w atching for changes can
   // require polling on some browsers. The JQuery hashchange plugin can be
@@ -459,24 +447,8 @@ function initShiny() {
   shinyapp.connect(initialValues);
   $(document).one("shiny:connected", function() {
     initDeferredIframes();
-
-    window.history.pushState({}, "", "#");
-    window.history.back();
-
-    (function(history){
-      var pushState = history.pushState;
-      history.pushState = function(state) {
-          if (typeof history.onpushstate == "function") {
-              history.onpushstate({state: state});
-          }
-          // whatever else you want to do
-          // maybe call onhashchange e.handler
-          return pushState.apply(history, arguments);
-      };
-    })(window.history);
   });
 
-
 } // function initShiny()
 
 

srcjs/shinyapp.js

@@ -680,6 +680,10 @@ var ShinyApp = function() {
 
   addMessageHandler('pushState', function(message) {
     window.history.pushState(message.state, message.title, message.url);
+    // just to trigger a onpopstate event...
+    window.history.pushState(message.state, message.title, message.url);
+    window.history.back();
+
   });
 
   addMessageHandler('updateQueryString', function(message) {