Browse Source

Avoid putting usability into its own scope.

pull/3/head
Simon Eisenmann 12 years ago
parent
commit
5fb8deff08
  1. 3
      static/js/controllers/roomchangecontroller.js
  2. 3
      static/js/directives/usability.js
  3. 4
      static/partials/usability.html

3
static/js/controllers/roomchangecontroller.js

@ -58,7 +58,8 @@ define([], function() {
ctrl.enabled = false; ctrl.enabled = false;
}); });
if (typeof $scope.roomdata !== "undefined") { var roomDataLinkInput = $element.find(".roomdata-link-input");
if (roomDataLinkInput.length) {
$scope.roomdata = {}; $scope.roomdata = {};
$timeout(function() { $timeout(function() {
if (ctrl.enabled) { if (ctrl.enabled) {

3
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) { var controller = ['$scope', "mediaStream", "safeApply", "$timeout", function($scope, mediaStream, safeApply, $timeout) {
$scope.roomdata = {};
var pending = true; var pending = true;
var complete = false; var complete = false;
@ -106,7 +104,6 @@ define(['jquery', 'underscore', 'text!partials/usability.html'], function($, _,
}]; }];
return { return {
scope: true,
restrict: 'E', restrict: 'E',
replace: true, replace: true,
template: template, template: template,

4
static/partials/usability.html

@ -14,13 +14,13 @@
<p><i>{{_("This is your room link:")}}</i></p> <p><i>{{_("This is your room link:")}}</i></p>
<p> <p>
<div class="input-group input-group-lg"> <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"> <span class="input-group-btn">
<button class="btn btn-primary" type="button" ng-disabled="!roomdata.link" ng-click="changeRoomToId(roomdata.name)">{{_("Start")}}</button> <button class="btn btn-primary" type="button" ng-disabled="!roomdata.link" ng-click="changeRoomToId(roomdata.name)">{{_("Start")}}</button>
</span> </span>
</div> </div>
</p> </p>
<p><i>{{_("Just click start")}}</i></p> <p><i>{{_("Just click start")}}</i></p>
<small> <small>
<ul class="fa-ul"> <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> <li><i class="fa-li fa fa-share-square"></i>{{_("Share this URL with the people you want to meet.")}}</li>

Loading…
Cancel
Save