Let user specify the id of the input bar

Input bar id is not globally set, but passed to the directive
through the input-id attribute.
This commit is contained in:
David Cormier 2014-02-25 09:12:52 -05:00
parent f3f5330aed
commit c04b6e64f6
3 changed files with 6 additions and 3 deletions

View file

@ -1,6 +1,6 @@
<form class="form form-horizontal" ng-submit="sendMessage()"> <form class="form form-horizontal" ng-submit="sendMessage()">
<div class="input-group"> <div class="input-group">
<input type="text" class="form-control monospace" autocomplete="off" > <input id="{{inputId}}" type="text" class="form-control monospace" autocomplete="off" >
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn btn-default btn-primary">Send</button> <button class="btn btn-default btn-primary">Send</button>
</span> </span>

View file

@ -349,7 +349,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
</div> </div>
<div id="footer" ng-show="connected"> <div id="footer" ng-show="connected">
<div class="navbar navbar-inverse navbar-fixed-bottom" ng-class="{'withnicklist': showNicklist, 'withsidebar': showSidebar}"> <div class="navbar navbar-inverse navbar-fixed-bottom" ng-class="{'withnicklist': showNicklist, 'withsidebar': showSidebar}">
<div input-bar></div> <div input-bar input-id="sendMessage"></div>
</div> </div>
</body> </body>
</html> </html>

View file

@ -1007,6 +1007,9 @@ weechat.directive('inputBar', function() {
return { return {
templateUrl: 'directives/input.html', templateUrl: 'directives/input.html',
scope: {
inputId: '@inputId',
},
controller: function($rootScope, controller: function($rootScope,
$scope, $scope,
$element, $element,
@ -1067,7 +1070,7 @@ weechat.directive('inputBar', function() {
}; };
// Handle key presses in the input bar // Handle key presses in the input bar
$scope.handleKeyPress = function($event) { $rootScope.handleKeyPress = function($event) {
// don't do anything if not connected // don't do anything if not connected
if (!$rootScope.connected) { if (!$rootScope.connected) {
return true; return true;