IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

More Javascript Tests + Fixtures. Also a rake task to crawl them.

Browse Source
This commit is contained in:
Robin Ward
2013-07-04 16:19:59 -04:00
parent 594cb50f18
commit 4a3bc1fb43
12 changed files with 110 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/controllers/static_controller.js
View File

@@ -20,7 +20,7 @@ Discourse.StaticController = Discourse.Controller.extend({
text = text[1];
this.set('content', text);
} else {
return Discourse.ajax(path + ".json", {dataType: 'html'}).then(function (result) {
return Discourse.ajax(path).then(function (result) {
staticController.set('content', result);
});
}

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

@@ -17,7 +17,7 @@ Discourse.UserStream = Discourse.Model.extend({
}.observes('filter'),
findItems: function() {
var url = Discourse.getURL("/user_actions?offset=") + this.get('itemsLoaded') + "&username=" + (this.get('user.username_lower'));
var url = Discourse.getURL("/user_actions.json?offset=") + this.get('itemsLoaded') + "&username=" + (this.get('user.username_lower'));
if (this.get('filter')) {
url += "&filter=" + (this.get('filter'));
}