r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into layer-51

Browse Source
This commit is contained in:
Igor Zhukov 2016-04-07 20:01:33 +03:00
commit 43069c9087
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/js/message_composer.js
View File

@ -1334,7 +1334,9 @@ MessageComposer.prototype.onCommandSelected = function (command, isTab) {
MessageComposer.prototype.onChange = function (e) { MessageComposer.prototype.onChange = function (e) {
if (this.richTextareaEl) { if (this.richTextareaEl) {
delete this.keyupStarted; 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(); this.updateInlinePlaceholder();
} }

8
app/js/services.js
View File

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

4
app/partials/desktop/im.html
View File

@ -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 ng-switch-default class="im_history_not_selected" my-vertical-position="0.35" padding="true" my-i18n="im_select_a_chat"></div>
</div> </div>
<div class="im_history_selected_loading_wrap im_history_loading" my-vertical-position="0.35" padding="true"> <div class="im_history_selected_loading_wrap im_history_loading" my-vertical-position="0.4" padding="true">
<div my-arc-progress stroke="5" width="50"></div> <div my-arc-progress stroke="4" width="32"></div>
</div> </div>
<div class="im_history_selected_wrap"> <div class="im_history_selected_wrap">