From 5fb8deff08ee5d0a7de1650c71eca696c3ab6823 Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@struktur.de>
Date: Mon, 3 Mar 2014 12:29:31 +0100
Subject: [PATCH] Avoid putting usability into its own scope.

---
 static/js/controllers/roomchangecontroller.js | 3 ++-
 static/js/directives/usability.js             | 3 ---
 static/partials/usability.html                | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/static/js/controllers/roomchangecontroller.js b/static/js/controllers/roomchangecontroller.js
index b4d00d07..cb0d5e58 100644
--- a/static/js/controllers/roomchangecontroller.js
+++ b/static/js/controllers/roomchangecontroller.js
@@ -58,7 +58,8 @@ define([], function() {
             ctrl.enabled = false;
         });
 
-        if (typeof $scope.roomdata !== "undefined") {
+        var roomDataLinkInput = $element.find(".roomdata-link-input");
+        if (roomDataLinkInput.length) {
             $scope.roomdata = {};
             $timeout(function() {
                 if (ctrl.enabled) {
diff --git a/static/js/directives/usability.js b/static/js/directives/usability.js
index 5375f185..9d3a97bd 100644
--- a/static/js/directives/usability.js
+++ b/static/js/directives/usability.js
@@ -26,8 +26,6 @@ define(['jquery', 'underscore', 'text!partials/usability.html'], function($, _,
 
     var controller = ['$scope', "mediaStream", "safeApply", "$timeout", function($scope, mediaStream, safeApply, $timeout) {
 
-      $scope.roomdata = {};
-
       var pending = true;
       var complete = false;
 
@@ -106,7 +104,6 @@ define(['jquery', 'underscore', 'text!partials/usability.html'], function($, _,
     }];
 
     return {
-      scope: true,
       restrict: 'E',
       replace: true,
       template: template,
diff --git a/static/partials/usability.html b/static/partials/usability.html
index ac56f566..4a4a5692 100644
--- a/static/partials/usability.html
+++ b/static/partials/usability.html
@@ -14,13 +14,13 @@
             <p><i>{{_("This is your room link:")}}</i></p>
             <p>
               <div class="input-group input-group-lg">
-                <input type="text" class="form-control" ng-model="roomdata.link" placeholder="{{_('Creating room link ...')}}" disabled>
+                <input type="text" class="form-control roomdata-link-input" ng-model="roomdata.link" placeholder="{{_('Creating room link ...')}}" disabled>
                 <span class="input-group-btn">
                   <button class="btn btn-primary" type="button" ng-disabled="!roomdata.link" ng-click="changeRoomToId(roomdata.name)">{{_("Start")}}</button>
                 </span>
               </div>
             </p>
-            <p><i>{{_("Just click start")}}</i></p>            
+            <p><i>{{_("Just click start")}}</i></p>
             <small>
               <ul class="fa-ul">
                 <li><i class="fa-li fa fa-share-square"></i>{{_("Share this URL with the people you want to meet.")}}</li>