Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "FIX: Can't cook queued posts when markdown-it is enabled." 

This reverts commit 5ff563cddd.
This commit is contained in:
Guo Xiang Tan 2017-06-29 06:14:19 +09:00
parent fbb5600c8e
commit ad4694cdcd
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/components/queued-post.js.es6
View File

@ -1,8 +1,6 @@
import { propertyEqual } from 'discourse/lib/computed'; import { propertyEqual } from 'discourse/lib/computed';
import { default as computed } from 'ember-addons/ember-computed-decorators';
import { bufferedProperty } from 'discourse/mixins/buffered-content'; import { bufferedProperty } from 'discourse/mixins/buffered-content';
import { popupAjaxError } from 'discourse/lib/ajax-error'; import { popupAjaxError } from 'discourse/lib/ajax-error';
import { cookAsync } from 'discourse/lib/text';
function updateState(state, opts) { function updateState(state, opts) {
opts = opts || {}; opts = opts || {};
@ -23,12 +21,6 @@ export default Ember.Component.extend(bufferedProperty('post'), {
editing: propertyEqual('post', 'currentlyEditing'), editing: propertyEqual('post', 'currentlyEditing'),
_confirmDelete: updateState('rejected', {deleteUser: true}), _confirmDelete: updateState('rejected', {deleteUser: true}),
@computed('post.raw')
cooked(raw) {
cookAsync(raw).then(cooked => this.set('cooked', cooked));
return raw;
},
actions: { actions: {
approve: updateState('approved'), approve: updateState('approved'),
reject: updateState('rejected'), reject: updateState('rejected'),

2
app/assets/javascripts/discourse/templates/components/queued-post.hbs
View File

@ -34,7 +34,7 @@
{{#if editing}} {{#if editing}}
{{d-editor value=buffered.raw}} {{d-editor value=buffered.raw}}
{{else}} {{else}}
{{{cooked}}} {{{cook-text post.raw}}}
{{/if}} {{/if}}
</div> </div>