IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 03:33:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #692 from ZogStriP/fix-text-not-updated-when-changing-notifications

Browse Source 
FIX: Text not updated when changing notifications after reading a topic
This commit is contained in:
Neil Lalonde 2013-04-10 10:54:44 -07:00
commit 28ed4defe3
3 changed files with 38 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/discourse/models/topic.js
View File

@ -288,14 +288,13 @@ Discourse.Topic = Discourse.Model.extend({
}).then(afterTopicLoaded, errorLoadingTopic);
},
notificationReasonText: (function() {
var locale_string;
locale_string = "topic.notifications.reasons." + this.notification_level;
if (typeof this.notifications_reason_id === 'number') {
locale_string += "_" + this.notifications_reason_id;
notificationReasonText: function() {
var locale_string = "topic.notifications.reasons." + this.get('notification_level');
if (typeof this.get('notifications_reason_id') === 'number') {
locale_string += "_" + this.get('notifications_reason_id');
}
return Em.String.i18n(locale_string, { username: Discourse.currentUser.username.toLowerCase() });
}).property('notifications_reason_id'),
}.property('notification_level', 'notifications_reason_id'),
updateNotifications: function(v) {
this.set('notification_level', v);

23
app/assets/javascripts/discourse/views/dropdown_button_view.js
View File

@ -23,35 +23,32 @@ Discourse.DropdownButtonView = Discourse.View.extend({
return null;
},
textChanged: (function() {
return this.rerender();
}).observes('text', 'longDescription'),
textChanged: function() {
this.rerender();
}.observes('text', 'longDescription'),
render: function(buffer) {
var desc;
buffer.push("<h4 class='title'>" + (this.get('title')) + "</h4>");
buffer.push("<h4 class='title'>" + this.get('title') + "</h4>");
buffer.push("<button class='btn standard dropdown-toggle' data-toggle='dropdown'>");
buffer.push(this.get('text'));
buffer.push("</button>");
buffer.push("<ul class='dropdown-menu'>");
this.get('dropDownContent').each(function(row) {
var description, id, textKey, title;
id = row[0];
textKey = row[1];
title = Em.String.i18n("" + textKey + ".title");
description = Em.String.i18n("" + textKey + ".description");
var id = row[0],
textKey = row[1],
title = Em.String.i18n("" + textKey + ".title"),
description = Em.String.i18n("" + textKey + ".description");
buffer.push("<li data-id=\"" + id + "\"><a href='#'>");
buffer.push("<span class='title'>" + title + "</span>");
buffer.push("<span>" + description + "</span>");
return buffer.push("</a></li>");
buffer.push("</a></li>");
});
buffer.push("</ul>");
if (desc = this.get('longDescription')) {
buffer.push("<p>");
buffer.push(desc);
return buffer.push("</p>");
buffer.push("</p>");
}
}
});

56
app/assets/javascripts/discourse/views/topic_footer_buttons_view.js
View File

@ -100,14 +100,14 @@ Discourse.TopicFooterButtonsView = Ember.ContainerView.extend({
helpKey: 'topic.reply.help',
disabled: !this.get('controller.content.can_create_post'),
text: (function() {
text: function() {
var archetype, customTitle;
archetype = this.get('controller.content.archetype');
if (customTitle = this.get("parentView.replyButtonText" + (archetype.capitalize()))) {
return customTitle;
}
return Em.String.i18n("topic.reply.title");
}).property(),
}.property(),
renderIcon: function(buffer) {
buffer.push("<i class='icon icon-plus'></i>");
@ -123,37 +123,6 @@ Discourse.TopicFooterButtonsView = Ember.ContainerView.extend({
topic: topic,
title: Em.String.i18n('topic.notifications.title'),
longDescriptionBinding: 'topic.notificationReasonText',
text: (function() {
var icon, key;
key = (function() {
switch (this.get('topic.notification_level')) {
case Discourse.Topic.NotificationLevel.WATCHING:
return 'watching';
case Discourse.Topic.NotificationLevel.TRACKING:
return 'tracking';
case Discourse.Topic.NotificationLevel.REGULAR:
return 'regular';
case Discourse.Topic.NotificationLevel.MUTE:
return 'muted';
}
}).call(this);
icon = (function() {
switch (key) {
case 'watching':
return '<i class="icon-circle heatmap-high"></i>&nbsp;';
case 'tracking':
return '<i class="icon-circle heatmap-low"></i>&nbsp;';
case 'regular':
return '';
case 'muted':
return '<i class="icon-remove-sign"></i>&nbsp;';
}
})();
return icon + (Ember.String.i18n("topic.notifications." + key + ".title")) + "<span class='caret'></span>";
}).property('topic.notification_level'),
dropDownContent: [
[Discourse.Topic.NotificationLevel.WATCHING, 'topic.notifications.watching'],
[Discourse.Topic.NotificationLevel.TRACKING, 'topic.notifications.tracking'],
@ -161,6 +130,27 @@ Discourse.TopicFooterButtonsView = Ember.ContainerView.extend({
[Discourse.Topic.NotificationLevel.MUTE, 'topic.notifications.muted']
],
text: function() {
var key = (function() {
switch (this.get('topic.notification_level')) {
case Discourse.Topic.NotificationLevel.WATCHING: return 'watching';
case Discourse.Topic.NotificationLevel.TRACKING: return 'tracking';
case Discourse.Topic.NotificationLevel.REGULAR: return 'regular';
case Discourse.Topic.NotificationLevel.MUTE: return 'muted';
}
}).call(this);
var icon = (function() {
switch (key) {
case 'watching': return '<i class="icon-circle heatmap-high"></i>&nbsp;';
case 'tracking': return '<i class="icon-circle heatmap-low"></i>&nbsp;';
case 'regular': return '';
case 'muted': return '<i class="icon-remove-sign"></i>&nbsp;';
}
})();
return icon + (Ember.String.i18n("topic.notifications." + key + ".title")) + "<span class='caret'></span>";
}.property('topic.notification_level'),
clicked: function(id) {
return this.get('topic').updateNotifications(id);
}