Merge pull request #365 from wireapp/staging

release 2016-10-26
wireapp · Oct 26, 2016 · ee7d816 · ee7d816
2 parents f303666 + ab8e7c2
commit ee7d816
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,7 +25,7 @@ addons:
 # http://docs.travis-ci.com/user/languages/javascript-with-nodejs/
 language: node_js
 node_js:
-  - node
+  - 6
 
 # https://blog.travis-ci.com/2013-12-05-speed-up-your-builds-cache-your-dependencies
 cache:

diff --git a/app/page/template/content/conversation/conversation-input.htm b/app/page/template/content/conversation/conversation-input.htm
@@ -47,7 +47,7 @@
             <!-- ko if: conversation_et().is_one2one() -->
               <span id="conversation-input-ephemeral"
                     class="controls-right-button conversation-input-ephemeral"
-                    data-bind="l10n_tooltip: z.string.de.tooltip_conversation_ephemeral"
+                    data-bind="l10n_tooltip: z.string.tooltip_conversation_ephemeral"
                     data-uie-name="do-set-ephemeral-timer">
                 <!-- ko if: conversation_et().ephemeral_timer() -->
                   <div class="ephemeral-timer-button">

diff --git a/app/script/conversation/ConversationRepository.coffee b/app/script/conversation/ConversationRepository.coffee
@@ -141,10 +141,10 @@ class z.conversation.ConversationRepository
       @sending_blocked = true
       @sending_interval = window.setInterval =>
         return if @conversation_service.client.request_queue_blocked_state() isnt z.service.RequestQueueBlockedState.NONE
-        @logger.log @logger.levels.ERROR, 'Sending of message from queue failed, unblocking queue', {entry_function: @sending_queue()[0].function, queue: @sending_queue()}
         @sending_blocked = false
-        @_execute_from_sending_queue()
         window.clearInterval @sending_interval
+        @logger.log @logger.levels.ERROR, 'Sending of message from queue failed, unblocking queue', @sending_queue()
+        @_execute_from_sending_queue()
       , z.config.SENDING_QUEUE_UNBLOCK_INTERVAL
 
       queue_entry.function()

diff --git a/app/script/view_model/MessageListViewModel.coffee b/app/script/view_model/MessageListViewModel.coffee
@@ -383,7 +383,7 @@ class z.ViewModel.MessageListViewModel
 
     @_track_context_menu message_et
 
-    if message_et.has_asset()
+    if message_et.has_asset() and not message_et.is_expired()
       entries.push {label: z.string.conversation_context_menu_download, action: 'download'}
 
     if message_et.is_reactable() and not @conversation().removed_from_conversation()
@@ -445,7 +445,7 @@ class z.ViewModel.MessageListViewModel
   ###
   show_detail: (asset_et, event) ->
     target_element = $(event.currentTarget)
-    return if target_element.hasClass 'image-ephemeral'
+    return if target_element.hasClass 'bg-color-ephemeral'
     return if target_element.hasClass 'image-loading'
     amplify.publish z.event.WebApp.CONVERSATION.DETAIL_VIEW.SHOW, target_element.find('img')[0].src