Browse Source

Merge pull request #129 from theurere/add-roombar-to-layout-object

Add roombar to layout object.
pull/135/head
Simon Eisenmann 11 years ago
parent
commit
3d1c5fe81c
  1. 4
      static/js/directives/roombar.js
  2. 4
      static/partials/roombar.html

4
static/js/directives/roombar.js

@ -27,14 +27,14 @@ define(['underscore', 'text!partials/roombar.html'], function(_, template) { @@ -27,14 +27,14 @@ define(['underscore', 'text!partials/roombar.html'], function(_, template) {
//console.log("roomBar directive link", arguments);
$scope.newroomid = $rootScope.roomid;
$scope.hideRoomBar = true;
$scope.layout.roombar = false;
$scope.save = function() {
var roomid = mediaStream.changeRoom($scope.newroomid);
if (roomid !== $rootScope.roomid) {
$scope.roombarform.$setPristine();
}
$scope.hideRoomBar = true;
$scope.layout.roombar = false;
};
$scope.hitEnter = function(evt) {

4
static/partials/roombar.html

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
<div class="roombar overlaybar form-horizontal" ng-class="{notvisible: hideRoomBar}">
<a class="overlaybar-button" ng-model="hideRoomBar" btn-checkbox btn-checkbox-true="0" btn-checkbox-false="1" title="{{_('Change room')}}"><i class="fa fa-th-list"></i></a>
<div class="roombar overlaybar form-horizontal" ng-class="{notvisible: !layout.roombar}">
<a class="overlaybar-button" ng-model="layout.roombar" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false" title="{{_('Change room')}}"><i class="fa fa-th-list"></i></a>
<form name="roombarform" class="overlaybar-content form-group">
<label class="pull-left control-label hidden-xs">{{_('Room')}}</label>
<div class="pull-left">

Loading…
Cancel
Save