Browse Source

Merge branch 'master' into layer-51

master
Igor Zhukov 9 years ago
parent
commit
43069c9087
  1. 4
      app/js/message_composer.js
  2. 2
      app/js/services.js
  3. 4
      app/partials/desktop/im.html

4
app/js/message_composer.js

@ -1334,7 +1334,9 @@ MessageComposer.prototype.onCommandSelected = function (command, isTab) { @@ -1334,7 +1334,9 @@ MessageComposer.prototype.onCommandSelected = function (command, isTab) {
MessageComposer.prototype.onChange = function (e) {
if (this.richTextareaEl) {
delete this.keyupStarted;
this.textareaEl.val(getRichValue(this.richTextareaEl[0])).trigger('change');
var richValue = getRichValue(this.richTextareaEl[0]);
richValue = richValue.replace(/\u00A0/g, ' ');
this.textareaEl.val(richValue).trigger('change');
}
this.updateInlinePlaceholder();
}

2
app/js/services.js

@ -4277,11 +4277,9 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) @@ -4277,11 +4277,9 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
}
if (matches = url.match(/^msg_url\?url=([^&]+)(?:&text=(.*))?$/)) {
PeersSelectService.selectPeer().then(function (toPeerString) {
var url = decodeURIComponent(matches[1]);
var text = matches[2] ? decodeURIComponent(matches[2]) : '';
shareUrl(url, text);
});
return true;
}

4
app/partials/desktop/im.html

@ -90,8 +90,8 @@ @@ -90,8 +90,8 @@
<div ng-switch-default class="im_history_not_selected" my-vertical-position="0.35" padding="true" my-i18n="im_select_a_chat"></div>
</div>
<div class="im_history_selected_loading_wrap im_history_loading" my-vertical-position="0.35" padding="true">
<div my-arc-progress stroke="5" width="50"></div>
<div class="im_history_selected_loading_wrap im_history_loading" my-vertical-position="0.4" padding="true">
<div my-arc-progress stroke="4" width="32"></div>
</div>
<div class="im_history_selected_wrap">

Loading…
Cancel
Save