github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Convert Discourse.Site and Discourse.ScreenTrack to use Discourse.Singleton

Browse Source
This commit is contained in:
Robin Ward
2013-08-08 12:49:58 -04:00
parent 51f5cf77fb
commit 86246a64eb
22 changed files with 42 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/javascripts/models/nav_item_test.js
View File

@ -1,7 +1,7 @@
module("Discourse.NavItem", {
setup: function() {
this.site = Discourse.Site.instance();
this.originalCategories = Discourse.Site.instance().get('categories') || [];
this.site = Discourse.Site.current();
this.originalCategories = Discourse.Site.currentProp('categories') || [];
this.site.set('categories', this.originalCategories.concat( [Discourse.Category.create({name: '确实是这样', id: 343434})] ));
},

2
test/javascripts/models/site_test.js
View File

@ -2,7 +2,7 @@ module("Discourse.Site");
test('instance', function(){
var site = Discourse.Site.instance();
var site = Discourse.Site.current();
present(site, "We have a current site singleton");
present(site.get('categories'), "The instance has a list of categories");