Fix #2033: Rstudio Viewer window not closed on shiny::stopApp()

rstudio · May 3, 2018 · c49a289 · c49a289
1 parent 9c3a0c8
commit c49a289
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 49 deletions.
diff --git a/inst/www/shared/shiny.js b/inst/www/shared/shiny.js
diff --git a/inst/www/shared/shiny.js.map b/inst/www/shared/shiny.js.map
diff --git a/inst/www/shared/shiny.min.js b/inst/www/shared/shiny.min.js
diff --git a/inst/www/shared/shiny.min.js.map b/inst/www/shared/shiny.min.js.map
diff --git a/srcjs/shinyapp.js b/srcjs/shinyapp.js
@@ -141,30 +141,8 @@ var ShinyApp = function() {
   };
 
   this.$notifyDisconnected = function() {
-
-    // function to normalize hostnames
-    var normalize = function(hostname) {
-      if (hostname === "127.0.0.1")
-        return "localhost";
-      else
-        return hostname;
-    };
-
-    // Send a 'disconnected' message to parent if we are on the same domin
-    var parentUrl = (parent !== window) ? document.referrer : null;
-    if (parentUrl) {
-      // parse the parent href
-      var a = document.createElement('a');
-      a.href = parentUrl;
-
-      // post the disconnected message if the hostnames are the same
-      if (normalize(a.hostname) === normalize(window.location.hostname)) {
-        var protocol = a.protocol.replace(':',''); // browser compatability
-        var origin = protocol + '://' + a.hostname;
-        if (a.port)
-          origin = origin + ':' + a.port;
-        parent.postMessage('disconnected', origin);
-      }
+    if (window.parent) {
+      window.parent.postMessage("disconnected", "*");
     }
   };