Merge pull request #7 from groupon/channel-url-update

update chromecast content on channel url change
groupon · Aug 22, 2014 · 4a90320 · 4a90320
2 parents 6dca287 + 1287643
commit 4a90320
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/public/js/gscreen.js b/public/js/gscreen.js
diff --git a/src/client/controllers/screen.coffee b/src/client/controllers/screen.coffee
@@ -12,13 +12,18 @@ Redistribution and use in source and binary forms, with or without modification,
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.###
 
-angular.module("GScreen").controller "Screen", ($scope, $sce, $location, Channel) ->
+angular.module("GScreen").controller "Screen", ($scope, $sce, $location, Channel, sockets) ->
   id = $location.url().match(/\/channels\/([^\/\?]+)/)[1]
 
   $scope.channel = Channel.get id
   $scope.channel.$promise.then (channel) ->
     setTimeout rotateMainContentUrl, 0
 
+  sockets.on "channel-updated", (channel) ->
+    if channel.id == $scope.channel.id
+      $scope.channel = channel
+      setTimeout rotateMainContentUrl, 0
+
   mainContentUrlCounter = 0
   lastTimeoutId = null
   rotateMainContentUrl = ->