From c04b6e64f61be6c3a830a921d53106225b3f80ae Mon Sep 17 00:00:00 2001
From: David Cormier <david.cormier@savoirfairelinux.com>
Date: Tue, 25 Feb 2014 09:12:52 -0500
Subject: [PATCH 1/2] 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.
---
 directives/input.html | 2 +-
 index.html            | 2 +-
 js/glowingbear.js     | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/directives/input.html b/directives/input.html
index b432fca..4b58053 100644
--- a/directives/input.html
+++ b/directives/input.html
@@ -1,6 +1,6 @@
 <form class="form form-horizontal" ng-submit="sendMessage()">
   <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">
       <button class="btn btn-default btn-primary">Send</button>
     </span>
diff --git a/index.html b/index.html
index c4a42a9..1b10c3c 100644
--- a/index.html
+++ b/index.html
@@ -349,7 +349,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
     </div>
     <div id="footer" ng-show="connected">
       <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>
   </body>
 </html>
diff --git a/js/glowingbear.js b/js/glowingbear.js
index a8bdf6e..7a3b2da 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -1007,6 +1007,9 @@ weechat.directive('inputBar', function() {
     return {
 
         templateUrl: 'directives/input.html',
+        scope: {
+            inputId: '@inputId',
+        },
         controller: function($rootScope,
                              $scope,
                              $element,
@@ -1067,7 +1070,7 @@ weechat.directive('inputBar', function() {
             };
 
             // Handle key presses in the input bar
-            $scope.handleKeyPress = function($event) {
+            $rootScope.handleKeyPress = function($event) {
                 // don't do anything if not connected
                 if (!$rootScope.connected) {
                     return true;

From 4451bff60d9d9971c5fa230de3743abb46d87ec1 Mon Sep 17 00:00:00 2001
From: David Cormier <david.cormier@savoirfairelinux.com>
Date: Tue, 25 Feb 2014 09:14:08 -0500
Subject: [PATCH 2/2] Move activeBufferChanged listener to WeechatCtrl

I don't believe that the inputBar directive should know about the
mobile cutoff we have set for GB. We should aim to make it as
reusable as possible
---
 js/glowingbear.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/js/glowingbear.js b/js/glowingbear.js
index 7a3b2da..9ef90b0 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -497,6 +497,13 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
 
     $scope.mobile_cutoff = 968;
 
+    // Focuses itself when active buffer is changed
+    $rootScope.$on('activeBufferChanged', function() {
+        if (document.body.clientWidth >= $scope.mobile_cutoff) {
+            $('#sendMessage').focus();
+        }
+    });
+
     $rootScope.countWatchers = function () {
         var root = $(document.getElementsByTagName('body'));
         var watchers = [];
@@ -1007,23 +1014,17 @@ weechat.directive('inputBar', function() {
     return {
 
         templateUrl: 'directives/input.html',
+        
         scope: {
             inputId: '@inputId',
         },
+
         controller: function($rootScope,
                              $scope,
                              $element,
                              connection,
                              models) {
 
-            // Focuses itself when active buffer is changed
-            $rootScope.$on('activeBufferChanged', function() {
-                if (document.body.clientWidth >= $scope.mobile_cutoff) {
-                    angular.element('#sendMessage').focus();
-                }
-            });
-
-
             /*
              * Returns the input element
              */