github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-19 07:02:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Missing Loading Route

Browse Source
This commit is contained in:
Robin Ward 2014-11-13 17:16:16 -05:00
parent bf666f8553
commit a710ff08ad
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/ember/resolver.js.es6
View File

@ -3,7 +3,7 @@
var classify = Ember.String.classify;
var get = Ember.get;
var LOADING_WHITELIST = ['badges', 'userActivity', 'userPrivateMessages', 'admin', 'adminFlags',
var LOADING_WHITELIST = ['badges', 'userActivity', 'userPrivateMessages', 'admin', 'adminFlags',
'user', 'preferences', 'adminEmail'],
_dummyRoute,
_loadingView;
@ -11,7 +11,8 @@ var LOADING_WHITELIST = ['badges', 'userActivity', 'userPrivateMessages', 'admin
function loadingResolver(cb) {
return function(parsedName) {
var fullNameWithoutType = parsedName.fullNameWithoutType;
if (fullNameWithoutType.indexOf('Loading') > 0) {
if (fullNameWithoutType.indexOf('Loading') >= 0) {
fullNameWithoutType = fullNameWithoutType.replace('Loading', '');
if (LOADING_WHITELIST.indexOf(fullNameWithoutType) !== -1) {
return cb(fullNameWithoutType);

1
app/assets/javascripts/discourse/routes/loading.js.es6 Normal file
View File

@ -0,0 +1 @@
export default Ember.Route.extend();