Browse Source

Bugfixes

master
Igor Zhukov 7 years ago
parent
commit
dd66075089
  1. 3
      app/js/directives.js
  2. 1
      app/js/locales/en-us.json
  3. 1
      app/js/message_composer.js
  4. 10
      app/less/app.less
  5. 2
      app/less/desktop.less
  6. 2
      app/less/mobile.less
  7. 12
      app/partials/desktop/send_form.html
  8. 12
      app/partials/mobile/send_form.html

3
app/js/directives.js

@ -1771,7 +1771,7 @@ angular.module('myApp.directives', ['myApp.filters']) @@ -1771,7 +1771,7 @@ angular.module('myApp.directives', ['myApp.filters'])
touch.pageY <= curBoundaries.top + curBoundaries.height
if (curHover != isHover) {
console.warn(dT(), 'change hover', isHover)
// console.warn(dT(), 'change hover', isHover)
element.toggleClass('im_send_form_hover', isHover)
curHover = isHover
}
@ -1791,7 +1791,6 @@ angular.module('myApp.directives', ['myApp.filters']) @@ -1791,7 +1791,6 @@ angular.module('myApp.directives', ['myApp.filters'])
$($window).on(voiceRecordEvents.move, updateVoiceHoveredClass)
$($window).one(voiceRecordEvents.stop, function(event) {
console.warn(111)
$($window).off(voiceRecordEvents.move, updateVoiceHoveredClass)
var isHover = updateVoiceHoveredClass(event, true)

1
app/js/locales/en-us.json

@ -531,6 +531,7 @@ @@ -531,6 +531,7 @@
"im_submit_edit_message": "Save",
"im_edit_message_title": "Edit message",
"im_voice_recording_label": "Release outside this form to cancel",
"im_voice_recording_cancel_label": "Release to cancel record",
"im_voice_processing_label": "Processing{dots}",
"login_sign_in": "Sign in",
"login_enter_number_description": "Please choose your country and enter your full phone number.",

1
app/js/message_composer.js

@ -1610,7 +1610,6 @@ MessageComposer.prototype.resetTyping = function () { @@ -1610,7 +1610,6 @@ MessageComposer.prototype.resetTyping = function () {
}
MessageComposer.prototype.setPlaceholder = function (newPlaceholder) {
console.warn(dT(), 'set placeholder', this.richTextareaEl)
;(this.richTextareaEl || this.textareaEl).attr('placeholder', newPlaceholder)
}

10
app/less/app.less

@ -3559,11 +3559,19 @@ li.inline_result_sticker.composer_autocomplete_option_active a { @@ -3559,11 +3559,19 @@ li.inline_result_sticker.composer_autocomplete_option_active a {
i {
margin-right: 5px;
}
.im_send_form_hover & {
color: #CCC;
}
}
.im_send_form_hover .im_recorder_label_hout,
.im_recorder_label_hover {
display: none;
}
.im_send_form_hover .im_recorder_label_hover {
display: inline;
}
.im_voice_recording,
.im_processing_recording {

2
app/less/desktop.less

@ -1311,7 +1311,7 @@ a.im_panel_peer_photo .peer_initials { @@ -1311,7 +1311,7 @@ a.im_panel_peer_photo .peer_initials {
}
}
.im_send_form_hover .im_voice_recording .im_record {
background: #bfd9ed;
background: #cae9ff;
}
.icon-mic {

2
app/less/mobile.less

@ -1493,7 +1493,7 @@ a.im_message_fwd_author { @@ -1493,7 +1493,7 @@ a.im_message_fwd_author {
}
}
.im_send_form_hover .im_voice_recording .im_record {
background: #bfd9ed;
background: #cae9ff;
}
.im_send_form_empty .im_submit {

12
app/partials/desktop/send_form.html

@ -24,10 +24,14 @@ @@ -24,10 +24,14 @@
<div class="im_voice_recorder_wrap">
<div class="im_recorder_indicator"><i></i></div>
<div class="im_recorder_time" ng-bind="voiceRecorder.duration | duration"></div>
<div class="im_recorder_label" ng-switch="voiceRecorder.processing" my-i18n>
<span ng-switch-when="true" my-i18n-format="im_voice_processing_label"></span>
<span ng-switch-default my-i18n-format="im_voice_recording_label"></span>
<my-i18n-param name="dots"></my-i18n-param>
<div class="im_recorder_label" ng-switch="voiceRecorder.processing">
<span ng-switch-when="true" my-i18n="im_voice_processing_label">
<my-i18n-param name="dots"></my-i18n-param>
</span>
<span ng-switch-default>
<span class="im_recorder_label_hover" my-i18n="im_voice_recording_label"></span>
<span class="im_recorder_label_hout" my-i18n="im_voice_recording_cancel_label"></span>
</span>
</div>
</div>

12
app/partials/mobile/send_form.html

@ -15,10 +15,14 @@ @@ -15,10 +15,14 @@
<div class="im_voice_recorder_wrap">
<div class="im_recorder_indicator"><i></i></div>
<div class="im_recorder_time" ng-bind="voiceRecorder.duration | duration"></div>
<div class="im_recorder_label" ng-switch="voiceRecorder.processing" my-i18n>
<span ng-switch-when="true" my-i18n-format="im_voice_processing_label"></span>
<span ng-switch-default my-i18n-format="im_voice_recording_label"></span>
<my-i18n-param name="dots"></my-i18n-param>
<div class="im_recorder_label" ng-switch="voiceRecorder.processing">
<span ng-switch-when="true" my-i18n="im_voice_processing_label">
<my-i18n-param name="dots"></my-i18n-param>
</span>
<span ng-switch-default>
<span class="im_recorder_label_hover" my-i18n="im_voice_recording_label"></span>
<span class="im_recorder_label_hout" my-i18n="im_voice_recording_cancel_label"></span>
</span>
</div>
</div>

Loading…
Cancel
Save