Merge pull request #556 from crdlc/bug-1129517

Bug 1129517 - [Loop] Counter is not increased when user writes a space i...

Author: Cristian Rodriguez

app/elements/conversation_detail.html

@@ -14,7 +14,7 @@ <h1 data-l10n-id="conversationDetailTitle"></h1>
           <input type="text" dir="auto"></input>
           <button type="reset"></button>
         </p>
-        <p class="counter"></p>
+        <p class="charCounter"></p>
       </form>
       <section class="camera-container gaia-list">
         <header data-l10n-id="defaultCamera"></header>

app/js/screens/conversation_detail.js

@@ -28,7 +28,7 @@
     frontCamera = modal.querySelector('input[value="camera-front"]');
     cameraOptions = [rearCamera, frontCamera];
     cameraContainer = modal.querySelector('.camera-container');
-    counter = modal.querySelector('.counter');
+    counter = modal.querySelector('.charCounter');
     form = modal.querySelector('form');
   }
 
@@ -100,7 +100,7 @@
   }
 
   function calculateCounter() {
-    var subject = subjectInput.value.trim();
+    var subject = subjectInput.value;
     var countdown = counter.dataset.countdown = CONFIG.maxSubjectSize - subject.length;
     var key = countdown < 0 ? 'negativeCharactersCountdown' : 'charactersCountdown';
     counter.textContent = _(key, {

app/style/conversation_detail.css

@@ -12,7 +12,7 @@
   border-bottom: none;
 }
 
-#conversation-detail form p.counter {
+#conversation-detail form p.charCounter {
   margin-top: -.5rem;
   font-size: 1.4rem;
   height: 1.4rem;
@@ -22,11 +22,11 @@
   -moz-font-feature-settings: 'tnum';
 }
 
-#conversation-detail form p.counter[data-countdown='140'] {
+#conversation-detail form p.charCounter[data-countdown='124'] {
   visibility: hidden;
 }
 
-#conversation-detail form p.counter[data-countdown^='-'] {
+#conversation-detail form p.charCounter[data-countdown^='-'] {
   color: #b90000;
 }
 

test/unit/test_conversation_detail.js

@@ -19,7 +19,7 @@ suite('Tests ConversationDetail', function() {
     callButton = modal.querySelector('.call');
     cameraContainer = modal.querySelector('.camera-container');
     subjectInput = modal.querySelector('input');
-    counter = modal.querySelector('.counter');
+    counter = modal.querySelector('.charCounter');
     sinon.stub(Utils, 'onForeground', () => {
       return {
         then: function(resolve) {