chromecast: avoid leaking Chromecast implementation in other classes

vincentbernat · Jan 25, 2015 · 87a4f9b · 87a4f9b
1 parent 3da2f21
commit 87a4f9b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/app/scripts/chromecast.js b/app/scripts/chromecast.js
@@ -18,19 +18,24 @@
         appConfig = new cast.receiver.CastReceiverManager.Config();
     appConfig.maxInactivity = inactivity;
     appConfig.statusText = 'Waiting for an URL';
-    this.castReceiverManager = cast.receiver.CastReceiverManager.getInstance();
+    var castReceiverManager = cast.receiver.CastReceiverManager.getInstance();
 
     // Setup message bus
-    this.messageBus = this.castReceiverManager
+    var messageBus = castReceiverManager
       .getCastMessageBus(urn);
-    this.messageBus.onMessage = function(event) {
+    messageBus.onMessage = function(event) {
       var message = JSON.parse(event.data),
           url = message.url;
       self.load(url);
     };
 
+    // Setup callback when a URL is loaded
+    this.onUrlLoad = function(url) {
+      castReceiverManager.setApplicationState('Receiver: ' + url);
+    };
+
     // Start
-    this.castReceiverManager.start(appConfig);
+    castReceiverManager.start(appConfig);
   };
 
 })(window.dkSupervisor, window.cast, window);
diff --git a/app/scripts/device-receiver.js b/app/scripts/device-receiver.js
@@ -41,7 +41,9 @@
       (a.hash || '') +
       '#timeout=' + this.timeout;
 
-    this.castReceiverManager.setApplicationState('Receiver: ' + this.url);
+    if (this.onUrlLoad) {
+      this.onUrlLoad(this.url);
+    }
 
     var shortened = this.url;
     if (shortened.indexOf('#')) {