remove notr while connecting

The message is instead displayed in screen below logo as is updated if connection fails during loading of contacts
yakyak · Oct 17, 2016 · 98aa137 · 98aa137
1 parent 1e2a4ae
commit 98aa137
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/ui/views/controller.coffee b/src/ui/views/controller.coffee
@@ -22,7 +22,12 @@ handle 'update:connection', do ->
             document.querySelector('.state_contacts').classList.remove("hide")
             el = null
         else
-            el = notr {html:conninfo.el.innerHTML, stay:0, id:'conn'}
+            document.querySelector('.state_connecting').innerHTML = connection.infoText().replace('…','')
+            if document.querySelector('.connecting.hide')?
+                el = notr {html:conninfo.el.innerHTML, stay:0, id:'conn'}
+            else
+                document.querySelector('.state_connecting').classList.remove("hide")
+                document.querySelector('.state_contacts').classList.add("hide")
 
 
 setLeftSize = (left) ->

diff --git a/src/ui/views/menu.coffee b/src/ui/views/menu.coffee
@@ -60,7 +60,7 @@ templateYakYak = (viewstate) ->
         if isDarwin
             {
                 label: 'Hide Others'
-                accelerator: getAccelerator('hideother')
+                accelerator: getAccelerator('hideothers')
                 selector: 'hideOtherApplications:' if isDarwin
             }
 
@@ -268,39 +268,39 @@ templateView = (viewstate) ->
             submenu: [
               {
                   label: 'Conversation 1'
-                  accelerator: getAccelarator('conversation1')
+                  accelerator: getAccelerator('conversation1')
                   click: -> action 'selectConvIndex', 0
               }, {
                   label: 'Conversation 2'
-                  accelerator: getAccelarator('conversation2')
+                  accelerator: getAccelerator('conversation2')
                   click: -> action 'selectConvIndex', 1
               }, {
                   label: 'Conversation 3'
-                  accelerator: getAccelarator('conversation3')
+                  accelerator: getAccelerator('conversation3')
                   click: -> action 'selectConvIndex', 2
               }, {
                   label: 'Conversation 4'
-                  accelerator: getAccelarator('conversation4')
+                  accelerator: getAccelerator('conversation4')
                   click: -> action 'selectConvIndex', 3
               }, {
                   label: 'Conversation 5'
-                  accelerator: getAccelarator('conversation5')
+                  accelerator: getAccelerator('conversation5')
                   click: -> action 'selectConvIndex', 4
               }, {
                   label: 'Conversation 6'
-                  accelerator: getAccelarator('conversation6')
+                  accelerator: getAccelerator('conversation6')
                   click: -> action 'selectConvIndex', 5
               }, {
                   label: 'Conversation 7'
-                  accelerator: getAccelarator('conversation7')
+                  accelerator: getAccelerator('conversation7')
                   click: -> action 'selectConvIndex', 6
               }, {
                   label: 'Conversation 8'
-                  accelerator: getAccelarator('conversation8')
+                  accelerator: getAccelerator('conversation8')
                   click: -> action 'selectConvIndex', 7
               }, {
                   label: 'Conversation 9'
-                  accelerator: getAccelarator('conversation9')
+                  accelerator: getAccelerator('conversation9')
                   click: -> action 'selectConvIndex', 8
               }
             ]