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

FIX: Don't show similar topics with no results

This commit is contained in:
Robin Ward 2015-02-27 15:43:04 -05:00
parent c04b214910
commit b8ef93e0a1
2 changed files with 90 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/assets/javascripts/discourse/controllers/composer.js.es6
View File

@ -271,11 +271,8 @@ export default DiscourseController.extend({
// We don't care about similar topics unless creating a topic
if (!this.get('model.creatingTopic')) { return; }
let body = this.get('model.reply'),
message;
const title = this.get('model.title'),
self = this;
let body = this.get('model.reply');
const title = this.get('model.title');
// Ensure the fields are of the minimum length
if (body.length < Discourse.SiteSettings.min_body_similar_length) { return; }
@ -291,24 +288,24 @@ export default DiscourseController.extend({
const messageController = this.get('controllers.composer-messages'),
similarTopics = this.get('similarTopics');
let message = this.get('similarTopicsMessage');
if (!message) {
message = Discourse.ComposerMessage.create({
templateName: 'composer/similar_topics',
extraClass: 'similar-topics'
});
this.set('similarTopicsMessage', message);
}
Discourse.Topic.findSimilarTo(title, body).then(function (newTopics) {
similarTopics.clear();
similarTopics.pushObjects(newTopics);
if (similarTopics.get('length') > 0) {
message = Discourse.ComposerMessage.create({
templateName: 'composer/similar_topics',
similarTopics,
extraClass: 'similar-topics'
});
self.set('similarTopicsMessage', message);
message.set('similarTopics', similarTopics);
messageController.send("popup", message);
} else {
message = self.get('similarTopicsMessage');
if (message) {
messageController.send("hideMessage", message);
}
} else if (message) {
messageController.send("hideMessage", message);
}
});

148
app/assets/javascripts/discourse/views/composer.js.es6
View File

@ -3,7 +3,8 @@
import userSearch from 'discourse/lib/user-search';
import afterTransition from 'discourse/lib/after-transition';
var ComposerView = Discourse.View.extend(Ember.Evented, {
const ComposerView = Discourse.View.extend(Ember.Evented, {
_lastKeyTimeout: null,
templateName: 'composer',
elementId: 'reply-control',
classNameBindings: ['model.creatingPrivateMessage:private-message',
@ -48,12 +49,12 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
Ember.run.scheduleOnce('afterRender', this, 'refreshPreview');
}.observes('model.reply', 'model.hidePreview'),
focusIn: function() {
var controller = this.get('controller');
focusIn() {
const controller = this.get('controller');
if (controller) controller.updateDraftStatus();
},
movePanels: function(sizePx) {
movePanels(sizePx) {
$('#main-outlet').css('padding-bottom', sizePx);
$('.composer-popup').css('bottom', sizePx);
// signal the progress bar it should move!
@ -61,14 +62,14 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
},
resize: function() {
var self = this;
const self = this;
Em.run.scheduleOnce('afterRender', function() {
var h = $('#reply-control').height() || 0;
const h = $('#reply-control').height() || 0;
self.movePanels.apply(self, [h + "px"]);
// Figure out the size of the fields
var $fields = self.$('.composer-fields'),
pos = $fields.position();
const $fields = self.$('.composer-fields');
let pos = $fields.position();
if (pos) {
self.$('.wmd-controls').css('top', $fields.height() + pos.top + 5);
@ -83,17 +84,19 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
});
}.observes('model.composeState', 'model.action'),
keyUp: function() {
var controller = this.get('controller');
keyUp() {
const controller = this.get('controller');
controller.checkReplyLength();
var lastKeyUp = new Date();
const lastKeyUp = new Date();
this.set('lastKeyUp', lastKeyUp);
// One second from now, check to see if the last key was hit when
// we recorded it. If it was, the user paused typing.
var self = this;
Em.run.later(function() {
const self = this;
Ember.run.cancel(this._lastKeyTimeout);
this._lastKeyTimeout = Ember.run.later(function() {
if (lastKeyUp !== self.get('lastKeyUp')) return;
// Search for similar topics if the user pauses typing
@ -101,7 +104,7 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
}, 1000);
},
keyDown: function(e) {
keyDown(e) {
if (e.which === 27) {
// ESC
this.get('controller').send('hitEsc');
@ -114,12 +117,12 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
},
_enableResizing: function() {
var $replyControl = $('#reply-control'),
const $replyControl = $('#reply-control'),
self = this;
$replyControl.DivResizer({
resize: this.resize.bind(self),
onDrag: function (sizePx) { self.movePanels.apply(self, [sizePx]); }
onDrag(sizePx) { self.movePanels.apply(self, [sizePx]); }
});
afterTransition($replyControl, this.resize.bind(self));
this.ensureMaximumDimensionForImagesInPreview();
@ -130,14 +133,14 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
this.set('controller.view', null);
}.on('willDestroyElement'),
ensureMaximumDimensionForImagesInPreview: function() {
ensureMaximumDimensionForImagesInPreview() {
// This enforce maximum dimensions of images in the preview according
// to the current site settings.
// For interactivity, we immediately insert the locally cooked version
// of the post into the stream when the user hits reply. We therefore also
// need to enforce these rules on the .cooked version.
// Meanwhile, the server is busy post-processing the post and generating thumbnails.
var style = Discourse.Mobile.mobileView ?
const style = Discourse.Mobile.mobileView ?
'max-width: 100%; height: auto;' :
'max-width:' + Discourse.SiteSettings.max_image_width + 'px;' +
'max-height:' + Discourse.SiteSettings.max_image_height + 'px;';
@ -145,17 +148,17 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
$('<style>#wmd-preview img:not(.thumbnail), .cooked img:not(.thumbnail) {' + style + '}</style>').appendTo('head');
},
click: function() {
click() {
this.get('controller').send('openIfDraft');
},
// Called after the preview renders. Debounced for performance
afterRender: function() {
var $wmdPreview = $('#wmd-preview');
afterRender() {
const $wmdPreview = $('#wmd-preview');
if ($wmdPreview.length === 0) return;
var post = this.get('model.post'),
refresh = false;
const post = this.get('model.post');
let refresh = false;
// If we are editing a post, we'll refresh its contents once. This is a feature that
// allows a user to refresh its contents once.
@ -175,17 +178,17 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
this.trigger('previewRefreshed', $wmdPreview);
},
_applyEmojiAutocomplete: function() {
_applyEmojiAutocomplete() {
if (!this.siteSettings.enable_emoji) { return; }
var template = this.container.lookup('template:emoji-selector-autocomplete.raw');
const template = this.container.lookup('template:emoji-selector-autocomplete.raw');
$('#wmd-input').autocomplete({
template: template,
key: ":",
transformComplete: function(v){ return v.code + ":"; },
dataSource: function(term){
transformComplete(v) { return v.code + ":"; },
dataSource(term){
return new Ember.RSVP.Promise(function(resolve) {
var full = ":" + term;
const full = ":" + term;
term = term.toLowerCase();
if (term === "") {
@ -196,7 +199,7 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
return resolve([Discourse.Emoji.translations[full]]);
}
var options = Discourse.Emoji.search(term, {maxResults: 5});
const options = Discourse.Emoji.search(term, {maxResults: 5});
return resolve(options);
}).then(function(list) {
@ -208,10 +211,11 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
});
},
initEditor: function() {
initEditor() {
// not quite right, need a callback to pass in, meaning this gets called once,
// but if you start replying to another topic it will get the avatars wrong
var $wmdInput, editor, self = this;
let $wmdInput, editor;
const self = this;
this.wmdInput = $wmdInput = $('#wmd-input');
if ($wmdInput.length === 0 || $wmdInput.data('init') === true) return;
@ -219,11 +223,11 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
ComposerView.trigger("initWmdEditor");
this._applyEmojiAutocomplete();
var template = this.container.lookup('template:user-selector-autocomplete.raw');
const template = this.container.lookup('template:user-selector-autocomplete.raw');
$wmdInput.data('init', true);
$wmdInput.autocomplete({
template: template,
dataSource: function(term) {
dataSource(term) {
return userSearch({
term: term,
topicId: self.get('controller.controllers.topic.model.id'),
@ -231,7 +235,7 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
});
},
key: "@",
transformComplete: function(v) {
transformComplete(v) {
if (v.username) {
return v.username;
} else {
@ -241,10 +245,10 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
});
this.editor = editor = Discourse.Markdown.createEditor({
lookupAvatarByPostNumber: function(postNumber) {
var posts = self.get('controller.controllers.topic.postStream.posts');
lookupAvatarByPostNumber(postNumber) {
const posts = self.get('controller.controllers.topic.postStream.posts');
if (posts) {
var quotedPost = posts.findProperty("post_number", postNumber);
const quotedPost = posts.findProperty("post_number", postNumber);
if (quotedPost) {
return Discourse.Utilities.tinyAvatar(quotedPost.get("avatar_template"));
}
@ -273,7 +277,7 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
this.set('editor', this.editor);
this.loadingChanged();
var saveDraft = Discourse.debounce((function() {
const saveDraft = Discourse.debounce((function() {
return self.get('controller').saveDraft();
}), 2000);
@ -282,7 +286,7 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
return true;
});
var $replyTitle = $('#reply-title');
const $replyTitle = $('#reply-title');
$replyTitle.keyup(function() {
saveDraft();
@ -305,9 +309,9 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
// in case it's still bound somehow
this._unbindUploadTarget();
var $uploadTarget = $('#reply-control'),
csrf = Discourse.Session.currentProp('csrfToken'),
cancelledByTheUser;
const $uploadTarget = $('#reply-control'),
csrf = Discourse.Session.currentProp('csrfToken');
let cancelledByTheUser;
// NOTE: we need both the .json extension and the CSRF token as a query parameter for IE9
$uploadTarget.fileupload({
@ -318,7 +322,7 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
// submit - this event is triggered for each upload
$uploadTarget.on('fileuploadsubmit', function (e, data) {
var result = Discourse.Utilities.validateUploadedFiles(data.files);
const result = Discourse.Utilities.validateUploadedFiles(data.files);
// reset upload status when everything is ok
if (result) self.setProperties({ uploadProgress: 0, isUploading: true });
return result;
@ -331,7 +335,7 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
self.get('controller').send('closeModal');
// NOTE: IE9 doesn't support XHR
if (data["xhr"]) {
var jqHXR = data.xhr();
const jqHXR = data.xhr();
if (jqHXR) {
// need to wait for the link to show up in the DOM
Em.run.schedule('afterRender', function() {
@ -351,7 +355,7 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
// progress all
$uploadTarget.on('fileuploadprogressall', function (e, data) {
var progress = parseInt(data.loaded / data.total * 100, 10);
const progress = parseInt(data.loaded / data.total * 100, 10);
self.set('uploadProgress', progress);
});
@ -360,7 +364,7 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
if (!cancelledByTheUser) {
// make sure we have a url
if (data.result.url) {
var markdown = Discourse.Utilities.getUploadMarkdown(data.result);
const markdown = Discourse.Utilities.getUploadMarkdown(data.result);
// appends a space at the end of the inserted markdown
self.addMarkdown(markdown + " ");
self.set('isUploading', false);
@ -385,7 +389,7 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
// Firefox. This is pretty dangerous because it can potentially break
// Ctrl+v to paste so we should be conservative about what browsers this runs
// in.
var uaMatch = navigator.userAgent.match(/Firefox\/(\d+)\.\d/);
const uaMatch = navigator.userAgent.match(/Firefox\/(\d+)\.\d/);
if (uaMatch && parseInt(uaMatch[1]) >= 24) {
self.$().append( Ember.$("<div id='contenteditable' contenteditable='true' style='height: 0; width: 0; overflow: hidden'></div>") );
self.$("textarea").off('keydown.contenteditable');
@ -395,18 +399,18 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
// after we switch focus, probably because it is being executed too late.
if ((event.ctrlKey || event.metaKey) && (event.keyCode === 86)) {
// Save the current textarea selection.
var textarea = self.$("textarea")[0],
const textarea = self.$("textarea")[0],
selectionStart = textarea.selectionStart,
selectionEnd = textarea.selectionEnd;
// Focus the contenteditable div.
var contentEditableDiv = self.$('#contenteditable');
const contentEditableDiv = self.$('#contenteditable');
contentEditableDiv.focus();
// The paste doesn't finish immediately and we don't have any onpaste
// event, so wait for 100ms which _should_ be enough time.
setTimeout(function() {
var pastedImg = contentEditableDiv.find('img');
const pastedImg = contentEditableDiv.find('img');
if ( pastedImg.length === 1 ) {
pastedImg.remove();
@ -414,11 +418,11 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
// For restoring the selection.
textarea.focus();
var textareaContent = $(textarea).val(),
const textareaContent = $(textarea).val(),
startContent = textareaContent.substring(0, selectionStart),
endContent = textareaContent.substring(selectionEnd);
var restoreSelection = function(pastedText) {
const restoreSelection = function(pastedText) {
$(textarea).val( startContent + pastedText + endContent );
textarea.selectionStart = selectionStart + pastedText.length;
textarea.selectionEnd = textarea.selectionStart;
@ -435,20 +439,20 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
// to a Blob and upload that, but if it is a regular URL that
// operation is prevented for security purposes. When we get a regular
// URL let's just create an <img> tag for the image.
var imageSrc = pastedImg.attr('src');
const imageSrc = pastedImg.attr('src');
if (imageSrc.match(/^data:image/)) {
// Restore the cursor position, and remove any selected text.
restoreSelection("");
// Create a Blob to upload.
var image = new Image();
const image = new Image();
image.onload = function() {
// Create a new canvas.
var canvas = document.createElementNS('http://www.w3.org/1999/xhtml', 'canvas');
const canvas = document.createElementNS('http://www.w3.org/1999/xhtml', 'canvas');
canvas.height = image.height;
canvas.width = image.width;
var ctx = canvas.getContext('2d');
const ctx = canvas.getContext('2d');
ctx.drawImage(image, 0, 0);
canvas.toBlob(function(blob) {
@ -488,8 +492,8 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
}, 400);
},
addMarkdown: function(text) {
var ctrl = $('#wmd-input').get(0),
addMarkdown(text) {
const ctrl = $('#wmd-input').get(0),
caretPosition = Discourse.Utilities.caretPosition(ctrl),
current = this.get('model.reply');
this.set('model.reply', current.substring(0, caretPosition) + text + current.substring(caretPosition, current.length));
@ -500,10 +504,10 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
},
// Uses javascript to get the image sizes from the preview, if present
imageSizes: function() {
var result = {};
imageSizes() {
const result = {};
$('#wmd-preview img').each(function(i, e) {
var $img = $(e),
const $img = $(e),
src = $img.prop('src');
if (src && src.length) {
@ -513,12 +517,12 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
return result;
},
childDidInsertElement: function() {
childDidInsertElement() {
return this.initEditor();
},
childWillDestroyElement: function() {
var self = this;
childWillDestroyElement() {
const self = this;
this._unbindUploadTarget();
@ -532,9 +536,9 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
},
titleValidation: function() {
var titleLength = this.get('model.titleLength'),
missingChars = this.get('model.missingTitleCharacters'),
reason;
const titleLength = this.get('model.titleLength'),
missingChars = this.get('model.missingTitleCharacters');
let reason;
if( titleLength < 1 ){
reason = I18n.t('composer.error.title_missing');
} else if( missingChars > 0 ) {
@ -555,9 +559,9 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
}.property('model.categoryId'),
replyValidation: function() {
var replyLength = this.get('model.replyLength'),
missingChars = this.get('model.missingReplyCharacters'),
reason;
const replyLength = this.get('model.replyLength'),
missingChars = this.get('model.missingReplyCharacters');
let reason;
if( replyLength < 1 ){
reason = I18n.t('composer.error.post_missing');
} else if( missingChars > 0 ) {
@ -569,8 +573,8 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
}
}.property('model.reply', 'model.replyLength', 'model.missingReplyCharacters', 'model.minimumPostLength'),
_unbindUploadTarget: function() {
var $uploadTarget = $('#reply-control');
_unbindUploadTarget() {
const $uploadTarget = $('#reply-control');
try { $uploadTarget.fileupload('destroy'); }
catch (e) { /* wasn't initialized yet */ }
$uploadTarget.off();