Merge remote-tracking branch 'yihui/feature/events'

Conflicts:
	inst/www/shared/shiny.js
	inst/www/shared/shiny.js.map
	inst/www/shared/shiny.min.js
	inst/www/shared/shiny.min.js.map

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: shiny
 Type: Package
 Title: Web Application Framework for R
-Version: 0.12.1.9000
+Version: 0.12.1.9001
 Date: 2015-05-20
 Authors@R: c(
     person("Winston", "Chang", role = c("aut", "cre"), email = "winston@rstudio.com"),

inst/examples/01_hello/rsconnect/localhost/admin/01_hello.dcf

@@ -0,0 +1,6 @@
+name: 01_hello
+account: admin
+server: localhost
+bundleId: 1
+url: http://localhost:3939/admin/01_hello/
+when: 1436550957.65385

inst/www/shared/shiny.js

@@ -643,6 +643,10 @@ var ShinyApp = function() {
 
     var socket = createSocketFunc();
     socket.onopen = function() {
+      $(document).trigger({
+        type: 'shiny:connected',
+        socket: socket
+      });
       socket.send(JSON.stringify({
         method: 'init',
         data: self.$initialInput
@@ -657,6 +661,10 @@ var ShinyApp = function() {
       self.dispatchMessage(e.data);
     };
     socket.onclose = function() {
+      $(document).trigger({
+        type: 'shiny:disconnected',
+        socket: socket
+      });
       $(document.body).addClass('disconnected');
       self.$notifyDisconnected();
     };