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

Removed bindings to `Discourse.site`

This commit is contained in:
Robin Ward 2013-05-24 11:22:17 -04:00
parent 56764f817b
commit 69bb70fbd3
26 changed files with 82 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse.js
View File

@ -73,11 +73,14 @@ Discourse = Ember.Application.createWithMixins({
user.set('unread_notifications', data.unread_notifications);
user.set('unread_private_messages', data.unread_private_messages);
}), user.notification_channel_position);
bus.subscribe("/categories", function(data){
Discourse.get('site').set('categories', data.categories.map(function(c){
return Discourse.Category.create(c);
}));
var site = Discourse.Site.instance();
data.categories.each(function(c){
site.updateCategory(c)
});
});
}
}.observes('currentUser'),

4
app/assets/javascripts/discourse/controllers/composer_controller.js
View File

@ -27,6 +27,10 @@ Discourse.ComposerController = Discourse.Controller.extend({
if (c) return c.appendText(text);
},
categories: function() {
return Discourse.Category.list();
}.property(),
save: function(force) {
var composer,
_this = this,

6
app/assets/javascripts/discourse/controllers/header_controller.js
View File

@ -14,7 +14,11 @@ Discourse.HeaderController = Discourse.Controller.extend({
var topic = this.get('topic');
if (topic) topic.toggleStar();
return false;
}
},
categories: function() {
return Discourse.Category.list();
}.property()
});

8
app/assets/javascripts/discourse/controllers/list_controller.js
View File

@ -8,21 +8,17 @@
**/
Discourse.ListController = Discourse.Controller.extend({
currentUserBinding: 'Discourse.currentUser',
categoriesBinding: 'Discourse.site.categories',
categoryBinding: 'topicList.category',
canCreateCategory: false,
canCreateTopic: false,
needs: ['composer', 'modal', 'listTopics'],
availableNavItems: function() {
var hasCategories, loggedOn, summary;
summary = this.get('filterSummary');
loggedOn = !!Discourse.get('currentUser');
hasCategories = !!this.get('categories');
var summary = this.get('filterSummary');
var loggedOn = !!Discourse.get('currentUser');
return Discourse.SiteSettings.top_menu.split("|").map(function(i) {
return Discourse.NavItem.fromText(i, {
loggedOn: loggedOn,
hasCategories: hasCategories,
countSummary: summary
});
}).filter(function(i) {

3
app/assets/javascripts/discourse/controllers/topic_controller.js
View File

@ -29,6 +29,9 @@ Discourse.TopicController = Discourse.ObjectController.extend(Discourse.Selected
return (this.get('selectedPostsCount') > 0);
}.property('selectedPostsCount'),
categories: function() {
return Discourse.Category.list();
}.property(),
canSelectAll: Em.computed.not('allPostsSelected'),

6
app/assets/javascripts/discourse/models/archetype.js
View File

@ -13,9 +13,9 @@ Discourse.Archetype = Discourse.Model.extend({
return this.get('options').length > 0;
}).property('options.@each'),
isDefault: (function() {
return this.get('id') === Discourse.get('site.default_archetype');
}).property('id')
isDefault: function() {
return this.get('id') === Discourse.Site.instance().get('default_archetype');
}.property('id')
});

5
app/assets/javascripts/discourse/models/category.js
View File

@ -70,6 +70,11 @@ Discourse.Category = Discourse.Model.extend({
});
Discourse.Category.reopenClass({
list: function() {
return Discourse.Site.instance().get('categories');
},
findBySlugOrId: function(slugOrId) {
return Discourse.ajax("/categories/" + slugOrId + ".json").then(function (result) {
return Discourse.Category.create(result.category);

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

@ -22,15 +22,18 @@ EDIT = 'edit';
REPLY_AS_NEW_TOPIC_KEY = "reply_as_new_topic";
Discourse.Composer = Discourse.Model.extend({
archetypesBinding: 'Discourse.site.archetypes',
init: function() {
this._super();
var val = Discourse.KeyValueStore.get('composer.showPreview') || 'true';
this.set('showPreview', val === 'true');
this.set('archetypeId', Discourse.get('site.default_archetype'));
this.set('archetypeId', Discourse.Site.instance().get('default_archetype'));
},
archetypes: function() {
return Discourse.Site.instance().get('archetypes');
}.property(),
creatingTopic: function() {
return this.get('action') === CREATE_TOPIC;
}.property('action'),
@ -238,7 +241,7 @@ Discourse.Composer = Discourse.Model.extend({
}
this.set('categoryName', opts.categoryName || this.get('topic.category.name'));
this.set('archetypeId', opts.archetypeId || Discourse.get('site.default_archetype'));
this.set('archetypeId', opts.archetypeId || Discourse.Site.instance().get('default_archetype'));
this.set('metaData', opts.metaData ? Em.Object.create(opts.metaData) : null);
this.set('reply', opts.reply || this.get("reply") || "");
if (opts.postId) {
@ -354,7 +357,7 @@ Discourse.Composer = Discourse.Model.extend({
user_id: currentUser.get('id'),
metaData: this.get('metaData'),
archetype: this.get('archetypeId'),
post_type: Discourse.get('site.post_types.regular'),
post_type: Discourse.Site.instance().get('post_types.regular'),
target_usernames: this.get('targetUsernames'),
actions_summary: Em.A(),
moderator: currentUser.get('moderator'),

2
app/assets/javascripts/discourse/models/nav_item.js
View File

@ -34,7 +34,7 @@ Discourse.NavItem.reopenClass({
testName = name.split("/")[0];
if (!opts.loggedOn && !validAnon.contains(testName)) return null;
if (!opts.hasCategories && testName === "categories") return null;
if (!Discourse.Category.list() && testName === "categories") return null;
if (!validNavNames.contains(testName)) return null;
opts = {

3
app/assets/javascripts/discourse/models/notification.js
View File

@ -19,8 +19,7 @@ Discourse.Notification = Discourse.Model.extend({
}.property(),
rendered: function() {
var notificationName;
notificationName = Discourse.get('site.notificationLookup')[this.notification_type];
var notificationName = Discourse.Site.instance().get('notificationLookup')[this.notification_type];
return Em.String.i18n("notifications." + notificationName, {
username: this.data.display_username,
link: "<a href='" + (this.get('url')) + "'>" + this.data.topic_title + "</a>"

16
app/assets/javascripts/discourse/models/post.js
View File

@ -124,11 +124,11 @@ Discourse.Post = Discourse.Model.extend({
flagsAvailable: function() {
var _this = this;
var flags = Discourse.get('site.flagTypes').filter(function(item) {
var flags = Discourse.Site.instance().get('flagTypes').filter(function(item) {
return _this.get("actionByName." + (item.get('name_key')) + ".can_act");
});
return flags;
}.property('Discourse.site.flagTypes', 'actions_summary.@each.can_act'),
}.property('actions_summary.@each.can_act'),
actionsHistory: function() {
if (!this.present('actions_summary')) return null;
@ -153,7 +153,7 @@ Discourse.Post = Discourse.Model.extend({
}
}).then(function(result) {
// If we received a category update, update it
if (result.category) Discourse.get('site').updateCategory(result.category);
if (result.category) Discourse.Site.instance().updateCategory(result.category);
if (complete) complete(Discourse.Post.create(result.post));
}, function(result) {
// Post failed to update
@ -220,7 +220,7 @@ Discourse.Post = Discourse.Model.extend({
obj.actions_summary.each(function(a) {
var actionSummary;
a.post = post;
a.actionType = Discourse.get("site").postActionTypeById(a.id);
a.actionType = Discourse.Site.instance().postActionTypeById(a.id);
actionSummary = Discourse.ActionSummary.create(a);
post.get('actions_summary').pushObject(actionSummary);
lookup.set(a.actionType.get('name_key'), actionSummary);
@ -278,10 +278,9 @@ Discourse.Post.reopenClass({
if (result.actions_summary) {
lookup = Em.Object.create();
result.actions_summary = result.actions_summary.map(function(a) {
var actionSummary;
a.post = result;
a.actionType = Discourse.get("site").postActionTypeById(a.id);
actionSummary = Discourse.ActionSummary.create(a);
a.actionType = Discourse.Site.instance().postActionTypeById(a.id);
var actionSummary = Discourse.ActionSummary.create(a);
lookup.set(a.actionType.get('name_key'), actionSummary);
return actionSummary;
});
@ -290,8 +289,7 @@ Discourse.Post.reopenClass({
},
create: function(obj, topic) {
var result;
result = this._super(obj);
var result = this._super(obj);
this.createActionSummary(result);
if (obj.reply_to_user) {
result.set('reply_to_user', Discourse.User.create(obj.reply_to_user));

14
app/assets/javascripts/discourse/models/site.js
View File

@ -8,21 +8,17 @@
**/
Discourse.Site = Discourse.Model.extend({
notificationLookup: (function() {
var result;
result = [];
notificationLookup: function() {
var result = [];
Object.keys(this.get('notification_types'), function(k, v) {
result[v] = k;
});
return result;
}).property('notification_types'),
}.property('notification_types'),
flagTypes: function() {
var postActionTypes;
postActionTypes = this.get('post_action_types');
if (!postActionTypes) {
return [];
}
var postActionTypes = this.get('post_action_types');
if (!postActionTypes) return [];
return postActionTypes.filterProperty('is_flag', true);
}.property('post_action_types.@each'),

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

@ -7,12 +7,11 @@
@module Discourse
**/
Discourse.Topic = Discourse.Model.extend({
categoriesBinding: 'Discourse.site.categories',
fewParticipants: (function() {
fewParticipants: function() {
if (!this.present('participants')) return null;
return this.get('participants').slice(0, 3);
}).property('participants'),
}.property('participants'),
canConvertToRegular: (function() {
var a = this.get('archetype');
@ -31,10 +30,8 @@ Discourse.Topic = Discourse.Model.extend({
},
category: function() {
if (this.get('categories')) {
return this.get('categories').findProperty('name', this.get('categoryName'));
}
}.property('categoryName', 'categories'),
return Discourse.Category.list().findProperty('name', this.get('categoryName'));
}.property('categoryName'),
shareUrl: function(){
var user = Discourse.get('currentUser');
@ -130,9 +127,9 @@ Discourse.Topic = Discourse.Model.extend({
return null;
}.property('views'),
archetypeObject: (function() {
return Discourse.get('site.archetypes').findProperty('id', this.get('archetype'));
}).property('archetype'),
archetypeObject: function() {
return Discourse.Site.instance().get('archetypes').findProperty('id', this.get('archetype'));
}.property('archetype'),
isPrivateMessage: (function() {
return this.get('archetype') === 'private_message';
@ -220,6 +217,7 @@ Discourse.Topic = Discourse.Model.extend({
// If loading the topic succeeded...
var afterTopicLoaded = function(result) {
var closestPostNumber, lastPost, postDiff;
// Update the slug if different
@ -246,6 +244,7 @@ Discourse.Topic = Discourse.Model.extend({
if (result.suggested_topics) {
topic.set('suggested_topics', Em.A());
}
topic.mergeAttributes(result, { suggested_topics: Discourse.Topic });
topic.set('posts', Em.A());
if (opts.trackVisit && result.draft && result.draft.length > 0) {
@ -261,17 +260,18 @@ Discourse.Topic = Discourse.Model.extend({
// Okay this is weird, but let's store the length of the next post when there
lastPost = null;
result.posts.each(function(p) {
var post;
p.scrollToAfterInsert = opts.nearPost;
post = Discourse.Post.create(p);
var post = Discourse.Post.create(p);
post.set('topic', topic);
topic.get('posts').pushObject(post);
lastPost = post;
});
topic.set('loaded', true);
}
var errorLoadingTopic = function(result) {
topic.set('errorLoading', true);
// If the result was 404 the post is not found

2
app/assets/javascripts/discourse/models/user.js
View File

@ -92,7 +92,7 @@ Discourse.User = Discourse.Model.extend({
@type {Integer}
**/
trustLevel: function() {
return Discourse.get('site.trust_levels').findProperty('id', this.get('trust_level'));
return Discourse.Site.instance().get('trust_levels').findProperty('id', this.get('trust_level'));
}.property('trust_level'),
/**

3
app/assets/javascripts/discourse/routes/application_route.js
View File

@ -8,8 +8,7 @@
**/
Discourse.ApplicationRoute = Discourse.Route.extend({
setupController: function(controller) {
Discourse.set('site', Discourse.Site.instance());
//Discourse.set('site', Discourse.Site.instance());
var currentUser = PreloadStore.get('currentUser');
if (currentUser) {
Discourse.set('currentUser', Discourse.User.create(currentUser));

3
app/assets/javascripts/discourse/routes/list_category_route.js
View File

@ -9,10 +9,9 @@
Discourse.ListCategoryRoute = Discourse.FilteredListRoute.extend({
model: function(params) {
var categories = Discourse.Site.instance().get('categories');
var categories = Discourse.Category.list();
var slug = Em.get(params, 'slug');
var category = categories.findProperty('slug', Em.get(params, 'slug'))
// In case the slug didn't work, try to find it by id instead.

2
app/assets/javascripts/discourse/templates/composer.js.handlebars
View File

@ -34,7 +34,7 @@
{{/if}}
{{textField value=content.title tabindex="2" id="reply-title" maxlength="255" class="span8" placeholderKey="composer.title_placeholder"}}
{{#unless content.creatingPrivateMessage}}
{{view Discourse.ComboboxViewCategory valueAttribute="name" contentBinding="Discourse.site.categories" valueBinding="content.categoryName"}}
{{view Discourse.ComboboxViewCategory valueAttribute="name" contentBinding="categories" valueBinding="content.categoryName"}}
{{#if content.archetype.hasOptions}}
<button class='btn' {{action showOptions}}>{{i18n topic.options}}</button>
{{/if}}

4
app/assets/javascripts/discourse/templates/header.js.handlebars
View File

@ -77,12 +77,12 @@
{{#titledLinkTo "list.latest" titleKey="filters.latest.help"}}{{i18n filters.latest.title}}{{/titledLinkTo}}
</li>
<li>{{#linkTo 'faq'}}{{i18n faq}}{{/linkTo}}</li>
{{#if view.categories}}
{{#if categories}}
<li class='heading' title="{{i18n filters.categories.help}}">
{{#linkTo "list.categories"}}{{i18n filters.categories.title}}{{/linkTo}}
</li>
{{#each view.categories}}
{{#each categories}}
<li class='category'>
{{categoryLink this}}
<b>{{unbound topic_count}}</b></a>

2
app/assets/javascripts/discourse/templates/topic.js.handlebars
View File

@ -10,7 +10,7 @@
{{/if}}
{{#if view.editingTopic}}
<input id='edit-title' type='text' {{bindAttr value="view.topic.title"}} autofocus>
{{view Discourse.ComboboxViewCategory valueAttribute="name" contentBinding="Discourse.site.categories" sourceBinding="view.topic.categoryName"}}
{{view Discourse.ComboboxViewCategory valueAttribute="name" contentBinding="categories" sourceBinding="view.topic.categoryName"}}
<button class='btn btn-primary btn-small' {{action finishedEdit target="view"}}><i class='icon-ok'></i></button>
<button class='btn btn-small' {{action cancelEdit target="view"}}><i class='icon-remove'></i></button>
{{else}}

2
app/assets/javascripts/discourse/views/header_view.js
View File

@ -11,9 +11,7 @@ Discourse.HeaderView = Discourse.View.extend({
classNames: ['d-header', 'clearfix'],
classNameBindings: ['editingTopic'],
templateName: 'header',
siteBinding: 'Discourse.site',
currentUserBinding: 'Discourse.currentUser',
categoriesBinding: 'site.categories',
topicBinding: 'Discourse.router.topicController.content',
showDropdown: function($target) {

5
app/assets/javascripts/discourse/views/list/list_view.js
View File

@ -9,7 +9,6 @@
Discourse.ListView = Discourse.View.extend({
templateName: 'list/list',
composeViewBinding: Ember.Binding.oneWay('Discourse.composeView'),
categoriesBinding: 'Discourse.site.categories',
// The window has been scrolled
scrolled: function(e) {
@ -18,7 +17,7 @@ Discourse.ListView = Discourse.View.extend({
return currentView ? typeof currentView.scrolled === "function" ? currentView.scrolled(e) : void 0 : void 0;
},
createTopicText: (function() {
createTopicText: function() {
if (this.get('controller.category.name')) {
return Em.String.i18n("topic.create_in", {
categoryName: this.get('controller.category.name')
@ -26,7 +25,7 @@ Discourse.ListView = Discourse.View.extend({
} else {
return Em.String.i18n("topic.create");
}
}).property('controller.category.name')
}.property('controller.category.name')
});

9
app/assets/javascripts/discourse/views/modal/edit_category_view.js
View File

@ -56,15 +56,16 @@ Discourse.EditCategoryView = Discourse.ModalBodyView.extend({
// background colors are available as a pipe-separated string
backgroundColors: function() {
return Discourse.SiteSettings.category_colors.split("|").map(function(i) { return i.toUpperCase(); }).concat(
Discourse.site.categories.map(function(c) { return c.color.toUpperCase(); }) ).uniq();
categories.map(function(c) { return c.color.toUpperCase(); }) ).uniq();
}.property('Discourse.SiteSettings.category_colors'),
usedBackgroundColors: function() {
return Discourse.site.categories.map(function(c) {
var categories = Discourse.Category.list();
return categories.map(function(c) {
// If editing a category, don't include its color:
return (this.get('category.id') && this.get('category.color').toUpperCase() === c.color.toUpperCase()) ? null : c.color.toUpperCase();
}, this).compact();
}.property('Discourse.site.categories', 'category.id', 'category.color'),
}.property('category.id', 'category.color'),
title: function() {
if (this.get('category.id')) return Em.String.i18n("category.edit_long");
@ -97,7 +98,7 @@ Discourse.EditCategoryView = Discourse.ModalBodyView.extend({
// We need the topic_count to be correct, so get the most up-to-date info about this category from the server.
Discourse.Category.findBySlugOrId( this.get('category.slug') || this.get('category.id') ).then( function(cat) {
categoryView.set('category', cat);
Discourse.get('site').updateCategory(cat);
Discourse.Site.instance().updateCategory(cat);
categoryView.set('id', categoryView.get('category.slug'));
categoryView.set('loading', false);
});

2
app/assets/javascripts/discourse/views/modal/flag_view.js
View File

@ -47,7 +47,7 @@ Discourse.FlagView = Discourse.ModalBodyView.extend({
var action = this.get('selected');
var postAction = this.get('post.actionByName.' + (action.get('name_key')));
var actionType = Discourse.get('site').postActionTypeById(this.get('postActionTypeId'));
var actionType = Discourse.Site.instance().postActionTypeById(this.get('postActionTypeId'));
if (postAction) {
postAction.act({
message: action.get('message')

6
app/assets/javascripts/discourse/views/modal/login_view.js
View File

@ -8,11 +8,15 @@
**/
Discourse.LoginView = Discourse.ModalBodyView.extend({
templateName: 'modal/login',
siteBinding: 'Discourse.site',
title: Em.String.i18n('login.title'),
authenticate: null,
loggingIn: false,
site: function() {
return Discourse.Site.instance();
}.property(),
showView: function(view) {
return this.get('controller').show(view);
},

2
app/assets/javascripts/discourse/views/post_view.js
View File

@ -29,7 +29,7 @@ Discourse.PostView = Discourse.View.extend({
}.property('parentView'),
postTypeClass: function() {
return this.get('post.post_type') === Discourse.get('site.post_types.moderator_action') ? 'moderator' : 'regular';
return this.get('post.post_type') === Discourse.Site.instance().get('post_types.moderator_action') ? 'moderator' : 'regular';
}.property('post.post_type'),
// If the cooked content changed, add the quote controls

1
app/assets/javascripts/discourse/views/topic_view.js
View File

@ -12,7 +12,6 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
topicBinding: 'controller.content',
userFiltersBinding: 'controller.userFilters',
classNameBindings: ['controller.multiSelect:multi-select', 'topic.archetype', 'topic.category.secure:secure_category'],
siteBinding: 'Discourse.site',
progressPosition: 1,
menuVisible: true,
SHORT_POST: 1200,