github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 08:09:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Improvement in composer HTML pasting

Browse Source
This commit is contained in:
Vinoth Kannan 2017-12-07 21:13:09 +05:30
commit 5cceb95f92
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/discourse/components/d-editor.js.es6
View File

@ -623,7 +623,7 @@ export default Ember.Component.extend({
text = text.substring(0, text.length - 1);
}
let rows = text.split("\r").join("").split("\n");
let rows = text.split("\n");
if (rows.length > 1) {
const columns = rows.map(r => r.split("\t").length);
@ -645,20 +645,21 @@ export default Ember.Component.extend({
}
const { clipboard, types } = clipboardData(e);
const placeholder = `${ I18n.t('pasting') }`;
let plainText = clipboard.getData("text/plain");
const html = clipboard.getData("text/html");
let handled = false;
if (plainText) {
plainText = plainText.trim();
plainText = plainText.trim().replace(/\r/g,"");
const table = this._extractTable(plainText);
if (table) {
this._addText(this._getSelected(), table);
this.appEvents.trigger('composer:insert-text', table);
handled = true;
}
}
const placeholder = `${ plainText || I18n.t('pasting') }`;
if (html && !handled) {
const self = this;
@ -671,9 +672,8 @@ export default Ember.Component.extend({
}).then(response => {
self.appEvents.trigger('composer:replace-text', placeholder, response.markdown);
}).catch(error => {
if (plainText) {
self.appEvents.trigger('composer:replace-text', placeholder, plainText);
} else {
if (!plainText) {
self.appEvents.trigger('composer:replace-text', placeholder, "");
popupAjaxError(error);
}
});