ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(WIP) Added spinner (#39)

Browse source
This commit is contained in:
Marcin Kurczewski 2014-09-17 22:37:49 +02:00
parent a16a2d3235
commit eb7c507359
21 changed files with 310 additions and 221 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
public_html/css/core.css
View file

@ -52,3 +52,22 @@ hr {
background: #f3f7f8;
color: #7a9 !important;
}
#wait-cover {
display: flex;
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
width: 100%;
height: 100%;
background: rgba(255, 255, 255, 0.9);
z-index: 100;
}
#wait .spinner {
margin: auto;
}
#wait .spinner .fa {
font-size: 40px;
}

9
public_html/index.html
View file

@ -42,6 +42,15 @@
</div>
</div>
<div id="wait">
<div id="wait-cover">
<div class="spinner">
<i class="fa fa-spin fa-circle-o-notch"></i>
<p>Loading</p>
</div>
</div>
</div>
<!-- build:template
<% _.each(templates, function(templateString, templateName) { %>
<script type="text/template" id="<%= templateName %>-template">

52
public_html/js/PresenterManager.js
View file

@ -1,36 +1,60 @@
var App = App || {};
App.PresenterManager = function(topNavigationPresenter) {
App.PresenterManager = function(jQuery, topNavigationPresenter) {
var lastContentPresenterName;
var lastContentPresenter;
var lastContentPresenter = null;
var $spinner;
var spinnerTimeout;
function init() {
initPresenter('topNavigationPresenter');
initPresenter(topNavigationPresenter, [], function() {});
$spinner = jQuery('body').find('#wait');
}
function initPresenter(presenterName, args) {
var presenter = App.DI.get(presenterName);
presenter.init.call(presenter, args);
function initPresenter(presenter, args, loaded) {
presenter.init.call(presenter, args, loaded);
}
function switchContentPresenter(presenterName, args) {
if (lastContentPresenterName !== presenterName) {
function switchContentPresenter(presenter, args) {
var contentPresenterLoaded = function() {
window.clearTimeout(spinnerTimeout);
$spinner.hide();
};
spinnerTimeout = window.setTimeout(function() {
$spinner.stop().fadeIn('slow');
}, 300);
if (lastContentPresenter === null || lastContentPresenter.name !== presenter.name) {
topNavigationPresenter.changeTitle(null);
var presenter = App.DI.get(presenterName);
presenter.init.call(presenter, args);
lastContentPresenterName = presenterName;
presenter.init.call(presenter, args, contentPresenterLoaded);
lastContentPresenter = presenter;
} else if (lastContentPresenter.reinit) {
lastContentPresenter.reinit.call(lastContentPresenter, args);
lastContentPresenter.reinit.call(lastContentPresenter, args, contentPresenterLoaded);
}
}
function initPresenters(options, loaded) {
var count = 0;
var subPresenterLoaded = function() {
count ++;
if (count === options.length) {
loaded();
}
};
for (var i = 0; i < options.length; i ++) {
initPresenter(options[i][0], options[i][1], subPresenterLoaded);
}
}
return {
init: init,
initPresenter: initPresenter,
initPresenters: initPresenters,
switchContentPresenter: switchContentPresenter,
};
};
App.DI.registerSingleton('presenterManager', ['topNavigationPresenter'], App.PresenterManager);
App.DI.registerSingleton('presenterManager', ['jQuery', 'topNavigationPresenter'], App.PresenterManager);

3
public_html/js/Presenters/CommentListPresenter.js
View file

@ -7,10 +7,11 @@ App.Presenters.CommentListPresenter = function(
var $el = jQuery('#content');
function init(args) {
function init(args, loaded) {
topNavigationPresenter.select('comments');
topNavigationPresenter.changeTitle('Comments');
render();
loaded();
}
function render() {

3
public_html/js/Presenters/HelpPresenter.js
View file

@ -7,10 +7,11 @@ App.Presenters.HelpPresenter = function(
var $el = jQuery('#content');
function init(args) {
function init(args, loaded) {
topNavigationPresenter.select('help');
topNavigationPresenter.changeTitle('Help');
render();
loaded();
}
function render() {

3
public_html/js/Presenters/HomePresenter.js
View file

@ -7,10 +7,11 @@ App.Presenters.HomePresenter = function(
var $el = jQuery('#content');
function init(args) {
function init(args, loaded) {
topNavigationPresenter.select('home');
topNavigationPresenter.changeTitle('Home');
render();
loaded();
}
function render() {

20
public_html/js/Presenters/LoginPresenter.js
View file

@ -16,18 +16,20 @@ App.Presenters.LoginPresenter = function(
var template;
var previousRoute;
function init(args) {
function init(args, loaded) {
topNavigationPresenter.select('login');
topNavigationPresenter.changeTitle('Login');
previousRoute = args.previousRoute;
promise.wait(util.promiseTemplate('login-form')).then(function(html) {
template = _.template(html);
if (auth.isLoggedIn()) {
finishLogin();
} else {
render();
}
});
promise.wait(util.promiseTemplate('login-form'))
.then(function(html) {
template = _.template(html);
if (auth.isLoggedIn()) {
finishLogin();
} else {
render();
}
loaded();
});
}
function render() {

19
public_html/js/Presenters/LogoutPresenter.js
View file

@ -11,16 +11,19 @@ App.Presenters.LogoutPresenter = function(
var $messages = jQuery('#content');
function init() {
function init(args, loaded) {
topNavigationPresenter.select('logout');
topNavigationPresenter.changeTitle('Logout');
promise.wait(auth.logout()).then(function() {
$messages.empty();
var $messageDiv = messagePresenter.showInfo($messages, 'Logged out. <a href="">Back to main page</a>');
$messageDiv.find('a').click(mainPageLinkClicked);
}).fail(function(response) {
messagePresenter.showError(($messages, response.json && response.json.error || response) + '<br/>Reload the page to continue.');
});
promise.wait(auth.logout())
.then(function() {
loaded();
$messages.empty();
var $messageDiv = messagePresenter.showInfo($messages, 'Logged out. <a href="">Back to main page</a>');
$messageDiv.find('a').click(mainPageLinkClicked);
}).fail(function(response) {
loaded();
messagePresenter.showError(($messages, response.json && response.json.error || response) + '<br/>Reload the page to continue.');
});
}
function mainPageLinkClicked(e) {

79
public_html/js/Presenters/PagedCollectionPresenter.js
View file

@ -24,7 +24,7 @@ App.Presenters.PagedCollectionPresenter = function(
var updateCallback;
var failCallback;
function init(args) {
function init(args, loaded) {
forceClear = !_.isEqual(args.searchParams, searchParams) || parseInt(args.page) !== pageNumber + 1;
searchParams = args.searchParams;
pageNumber = parseInt(args.page) || 1;
@ -34,23 +34,26 @@ App.Presenters.PagedCollectionPresenter = function(
updateCallback = args.updateCallback;
failCallback = args.failCallback;
promise.wait(util.promiseTemplate('pager')).then(function(html) {
template = _.template(html);
softChangePage(pageNumber);
promise.wait(util.promiseTemplate('pager'))
.then(function(html) {
template = _.template(html);
softChangePage(pageNumber)
.then(loaded)
.fail(loaded);
if (!endlessScroll) {
mousetrap.bind('a', function(e) {
if (!e.altKey && !e.ctrlKey) {
prevPage();
}
});
mousetrap.bind('d', function(e) {
if (!e.altKey && !e.ctrlKey) {
nextPage();
}
});
}
});
if (!endlessScroll) {
mousetrap.bind('a', function(e) {
if (!e.altKey && !e.ctrlKey) {
prevPage();
}
});
mousetrap.bind('d', function(e) {
if (!e.altKey && !e.ctrlKey) {
nextPage();
}
});
}
});
}
function prevPage() {
@ -82,27 +85,31 @@ App.Presenters.PagedCollectionPresenter = function(
function softChangePage(newPageNumber) {
pageNumber = newPageNumber;
promise.wait(
api.get(backendUri, _.extend({}, searchParams, {page: pageNumber})))
.then(function(response) {
var pageSize = response.json.pageSize;
var totalRecords = response.json.totalRecords;
totalPages = Math.ceil(totalRecords / pageSize);
return promise.make(function(resolve, reject) {
promise.wait(
api.get(backendUri, _.extend({}, searchParams, {page: pageNumber})))
.then(function(response) {
resolve(response);
var pageSize = response.json.pageSize;
var totalRecords = response.json.totalRecords;
totalPages = Math.ceil(totalRecords / pageSize);
var $target = updateCallback({
entities: response.json.data,
totalRecords: totalRecords},
forceClear || !endlessScroll);
forceClear = false;
var $target = updateCallback({
entities: response.json.data,
totalRecords: totalRecords},
forceClear || !endlessScroll);
forceClear = false;
render($target);
}).fail(function(response) {
if (typeof(failCallback) !== 'undefined') {
failCallback(response);
} else {
console.log(new Error(response.json && response.json.error || response));
}
});
render($target);
}).fail(function(response) {
reject(response);
if (typeof(failCallback) !== 'undefined') {
failCallback(response);
} else {
console.log(new Error(response.json && response.json.error || response));
}
});
});
}
function render($target) {

25
public_html/js/Presenters/PostListPresenter.js
View file

@ -16,30 +16,31 @@ App.Presenters.PostListPresenter = function(
var listTemplate;
var itemTemplate;
function init(args) {
function init(args, loaded) {
topNavigationPresenter.select('posts');
topNavigationPresenter.changeTitle('Posts');
promise.waitAll(
util.promiseTemplate('post-list'),
util.promiseTemplate('post-list-item')).then(function(listHtml, itemHtml) {
listTemplate = _.template(listHtml);
itemTemplate = _.template(itemHtml);
util.promiseTemplate('post-list'),
util.promiseTemplate('post-list-item'))
.then(function(listHtml, itemHtml) {
listTemplate = _.template(listHtml);
itemTemplate = _.template(itemHtml);
render();
reinit(args);
});
render();
reinit(args, loaded);
});
}
function reinit(args) {
function reinit(args, loaded) {
var searchArgs = util.parseComplexRouteArgs(args.searchArgs);
searchArgs.order = searchArgs.order;
updateActiveOrder(searchArgs.order);
initPaginator(searchArgs);
initPaginator(searchArgs, loaded);
}
function initPaginator(searchArgs) {
function initPaginator(searchArgs, onLoad) {
pagedCollectionPresenter.init({
page: searchArgs.page,
searchParams: {order: searchArgs.order},
@ -52,7 +53,7 @@ App.Presenters.PostListPresenter = function(
failCallback: function(response) {
$el.empty();
messagePresenter.showError($el, response.json && response.json.error || response);
}});
}}, onLoad);
}
function render() {

35
public_html/js/Presenters/PostUploadPresenter.js
View file

@ -20,14 +20,16 @@ App.Presenters.PostUploadPresenter = function(
var tagInput;
var interactionEnabled = true;
function init(args) {
function init(args, loaded) {
topNavigationPresenter.select('upload');
topNavigationPresenter.changeTitle('Upload');
promise.wait(util.promiseTemplate('post-upload')).then(function(html) {
template = _.template(html);
render();
});
promise.wait(util.promiseTemplate('post-upload'))
.then(function(html) {
template = _.template(html);
render();
loaded();
});
}
function render() {
@ -524,18 +526,19 @@ App.Presenters.PostUploadPresenter = function(
return;
}
promise.wait(api.post('/posts', formData)).then(function(response) {
$row.slideUp(function(response) {
$row.remove();
posts.shift();
setAllPosts(posts);
uploadNextPost();
promise.wait(api.post('/posts', formData))
.then(function(response) {
$row.slideUp(function(response) {
$row.remove();
posts.shift();
setAllPosts(posts);
uploadNextPost();
});
}).fail(function(response) {
messagePresenter.hideMessages($messages);
messagePresenter.showError($messages, response.json && response.json.error || response);
interactionEnabled = true;
});
}).fail(function(response) {
messagePresenter.hideMessages($messages);
messagePresenter.showError($messages, response.json && response.json.error || response);
interactionEnabled = true;
});
}
function submitButtonClicked(e) {

12
public_html/js/Presenters/RegistrationPresenter.js
View file

@ -14,13 +14,15 @@ App.Presenters.RegistrationPresenter = function(
var template;
var $messages;
function init() {
function init(args, loaded) {
topNavigationPresenter.select('register');
topNavigationPresenter.changeTitle('Registration');
promise.wait(util.promiseTemplate('registration-form')).then(function(html) {
template = _.template(html);
render();
});
promise.wait(util.promiseTemplate('registration-form'))
.then(function(html) {
template = _.template(html);
render();
loaded();
});
}
function render() {

3
public_html/js/Presenters/TagListPresenter.js
View file

@ -7,10 +7,11 @@ App.Presenters.TagListPresenter = function(
var $el = jQuery('#content');
function init(args) {
function init(args, loaded) {
topNavigationPresenter.select('tags');
topNavigationPresenter.changeTitle('Tags');
render();
loaded();
}
function render() {

14
public_html/js/Presenters/TopNavigationPresenter.js
View file

@ -13,12 +13,14 @@ App.Presenters.TopNavigationPresenter = function(
var template;
var baseTitle = document.title;
function init() {
promise.wait(util.promiseTemplate('top-navigation')).then(function(html) {
template = _.template(html);
render();
auth.startObservingLoginChanges('top-navigation', loginStateChanged);
});
function init(args, loaded) {
promise.wait(util.promiseTemplate('top-navigation'))
.then(function(html) {
template = _.template(html);
render();
loaded();
auth.startObservingLoginChanges('top-navigation', loginStateChanged);
});
}
function select(newSelectedElement) {

19
public_html/js/Presenters/UserAccountRemovalPresenter.js
View file

@ -16,21 +16,20 @@ App.Presenters.UserAccountRemovalPresenter = function(
var user;
var privileges = {};
function init(args) {
return promise.make(function(resolve, reject) {
user = args.user;
target = args.target;
function init(args, loaded) {
user = args.user;
target = args.target;
privileges.canDeleteAccount =
auth.hasPrivilege(auth.privileges.deleteAllAccounts) ||
(auth.hasPrivilege(auth.privileges.deleteOwnAccount) && auth.isLoggedIn(user.name));
privileges.canDeleteAccount =
auth.hasPrivilege(auth.privileges.deleteAllAccounts) ||
(auth.hasPrivilege(auth.privileges.deleteOwnAccount) && auth.isLoggedIn(user.name));
promise.wait(util.promiseTemplate('account-removal')).then(function(html) {
promise.wait(util.promiseTemplate('account-removal'))
.then(function(html) {
template = _.template(html);
render();
resolve();
loaded();
});
});
}
function render() {

45
public_html/js/Presenters/UserAccountSettingsPresenter.js
View file

@ -16,34 +16,33 @@ App.Presenters.UserAccountSettingsPresenter = function(
var privileges;
var avatarContent;
function init(args) {
return promise.make(function(resolve, reject) {
user = args.user;
target = args.target;
function init(args, loaded) {
user = args.user;
target = args.target;
privileges = {
canChangeAccessRank:
auth.hasPrivilege(auth.privileges.changeAccessRank),
canChangeAvatarStyle:
auth.hasPrivilege(auth.privileges.changeAllAvatarStyles) ||
(auth.hasPrivilege(auth.privileges.changeOwnAvatarStyle) && auth.isLoggedIn(user.name)),
canChangeName:
auth.hasPrivilege(auth.privileges.changeAllNames) ||
(auth.hasPrivilege(auth.privileges.changeOwnName) && auth.isLoggedIn(user.name)),
canChangeEmailAddress:
auth.hasPrivilege(auth.privileges.changeAllEmailAddresses) ||
(auth.hasPrivilege(auth.privileges.changeOwnEmailAddress) && auth.isLoggedIn(user.name)),
canChangePassword:
auth.hasPrivilege(auth.privileges.changeAllPasswords) ||
(auth.hasPrivilege(auth.privileges.changeOwnPassword) && auth.isLoggedIn(user.name)),
};
privileges = {
canChangeAccessRank:
auth.hasPrivilege(auth.privileges.changeAccessRank),
canChangeAvatarStyle:
auth.hasPrivilege(auth.privileges.changeAllAvatarStyles) ||
(auth.hasPrivilege(auth.privileges.changeOwnAvatarStyle) && auth.isLoggedIn(user.name)),
canChangeName:
auth.hasPrivilege(auth.privileges.changeAllNames) ||
(auth.hasPrivilege(auth.privileges.changeOwnName) && auth.isLoggedIn(user.name)),
canChangeEmailAddress:
auth.hasPrivilege(auth.privileges.changeAllEmailAddresses) ||
(auth.hasPrivilege(auth.privileges.changeOwnEmailAddress) && auth.isLoggedIn(user.name)),
canChangePassword:
auth.hasPrivilege(auth.privileges.changeAllPasswords) ||
(auth.hasPrivilege(auth.privileges.changeOwnPassword) && auth.isLoggedIn(user.name)),
};
promise.wait(util.promiseTemplate('account-settings')).then(function(html) {
promise.wait(util.promiseTemplate('account-settings'))
.then(function(html) {
template = _.template(html);
render();
resolve();
loaded();
});
});
}
function render() {

68
public_html/js/Presenters/UserActivationPresenter.js
View file

@ -18,24 +18,26 @@ App.Presenters.UserActivationPresenter = function(
var formHidden = false;
var operation;
function init(args) {
function init(args, loaded) {
topNavigationPresenter.select('login');
topNavigationPresenter.changeTitle('Account recovery');
reinit(args);
reinit(args, loaded);
}
function reinit(args) {
function reinit(args, loaded) {
operation = args.operation;
promise.wait(util.promiseTemplate('user-query-form')).then(function(html) {
template = _.template(html);
if (args.token) {
hideForm();
confirmToken(args.token);
} else {
showForm();
}
render();
});
promise.wait(util.promiseTemplate('user-query-form'))
.then(function(html) {
template = _.template(html);
if (args.token) {
hideForm();
confirmToken(args.token);
} else {
showForm();
}
render();
loaded();
});
}
function render() {
@ -68,18 +70,19 @@ App.Presenters.UserActivationPresenter = function(
'/password-reset/' + userNameOrEmail :
'/activation/' + userNameOrEmail;
api.post(url).then(function(response) {
var message = operation === 'passwordReset' ?
'Password reset request sent.' :
'Activation e-mail resent.';
message += ' Check your inbox.<br/>If e-mail doesn\'t show up, check your spam folder.';
api.post(url)
.then(function(response) {
var message = operation === 'passwordReset' ?
'Password reset request sent.' :
'Activation e-mail resent.';
message += ' Check your inbox.<br/>If e-mail doesn\'t show up, check your spam folder.';
$el.find('#user-query-form').slideUp(function() {
messagePresenter.showInfo($messages, message);
$el.find('#user-query-form').slideUp(function() {
messagePresenter.showInfo($messages, message);
});
}).fail(function(response) {
messagePresenter.showError($messages, response.json && response.json.error || response);
});
}).fail(function(response) {
messagePresenter.showError($messages, response.json && response.json.error || response);
});
}
function confirmToken(token) {
@ -89,17 +92,18 @@ App.Presenters.UserActivationPresenter = function(
'/finish-password-reset/' + token :
'/finish-activation/' + token;
api.post(url).then(function(response) {
var message = operation === 'passwordReset' ?
'Your new password is <strong>' + response.json.newPassword + '</strong>.' :
'E-mail activation successful.';
api.post(url)
.then(function(response) {
var message = operation === 'passwordReset' ?
'Your new password is <strong>' + response.json.newPassword + '</strong>.' :
'E-mail activation successful.';
$el.find('#user-query-form').slideUp(function() {
messagePresenter.showInfo($messages, message);
$el.find('#user-query-form').slideUp(function() {
messagePresenter.showInfo($messages, message);
});
}).fail(function(response) {
messagePresenter.showError($messages, response.json && response.json.error || response);
});
}).fail(function(response) {
messagePresenter.showError($messages, response.json && response.json.error || response);
});
}
return {

24
public_html/js/Presenters/UserBrowsingSettingsPresenter.js
View file

@ -15,19 +15,18 @@ App.Presenters.UserBrowsingSettingsPresenter = function(
var user;
var privileges = {};
function init(args) {
return promise.make(function(resolve, reject) {
user = args.user;
target = args.target;
function init(args, loaded) {
user = args.user;
target = args.target;
privileges.canChangeBrowsingSettings = auth.isLoggedIn(user.name) && user.name === auth.getCurrentUser().name;
privileges.canChangeBrowsingSettings = auth.isLoggedIn(user.name) && user.name === auth.getCurrentUser().name;
promise.wait(util.promiseTemplate('browsing-settings')).then(function(html) {
promise.wait(util.promiseTemplate('browsing-settings'))
.then(function(html) {
template = _.template(html);
render();
resolve();
loaded();
});
});
}
function render() {
@ -41,6 +40,7 @@ App.Presenters.UserBrowsingSettingsPresenter = function(
var $el = jQuery(target);
var $messages = $el.find('.messages');
messagePresenter.hideMessages($messages);
var newSettings = {
endlessScroll: $el.find('[name=endless-scroll]').is(':checked'),
hideDownvoted: $el.find('[name=hide-downvoted]').is(':checked'),
@ -50,9 +50,11 @@ App.Presenters.UserBrowsingSettingsPresenter = function(
unsafe: $el.find('[name=listUnsafePosts]').is(':checked'),
},
};
browsingSettings.setSettings(newSettings).then(function() {
messagePresenter.showInfo($messages, 'Browsing settings updated!');
});
browsingSettings.setSettings(newSettings)
.then(function() {
messagePresenter.showInfo($messages, 'Browsing settings updated!');
});
}
function getPrivileges() {

25
public_html/js/Presenters/UserListPresenter.js
View file

@ -16,30 +16,31 @@ App.Presenters.UserListPresenter = function(
var listTemplate;
var itemTemplate;
function init(args) {
function init(args, loaded) {
topNavigationPresenter.select('users');
topNavigationPresenter.changeTitle('Users');
promise.waitAll(
util.promiseTemplate('user-list'),
util.promiseTemplate('user-list-item')).then(function(listHtml, itemHtml) {
listTemplate = _.template(listHtml);
itemTemplate = _.template(itemHtml);
util.promiseTemplate('user-list'),
util.promiseTemplate('user-list-item'))
.then(function(listHtml, itemHtml) {
listTemplate = _.template(listHtml);
itemTemplate = _.template(itemHtml);
render();
reinit(args);
});
render();
reinit(args, loaded);
});
}
function reinit(args) {
function reinit(args, loaded) {
var searchArgs = util.parseComplexRouteArgs(args.searchArgs);
searchArgs.order = searchArgs.order || 'name';
updateActiveOrder(searchArgs.order);
initPaginator(searchArgs);
initPaginator(searchArgs, loaded);
}
function initPaginator(searchArgs) {
function initPaginator(searchArgs, onLoad) {
pagedCollectionPresenter.init({
page: searchArgs.page,
searchParams: {order: searchArgs.order},
@ -52,7 +53,7 @@ App.Presenters.UserListPresenter = function(
failCallback: function(response) {
$el.empty();
messagePresenter.showError($el, response.json && response.json.error || response);
}});
}}, onLoad);
}
function render() {

50
public_html/js/Presenters/UserPresenter.js
View file

@ -9,6 +9,7 @@ App.Presenters.UserPresenter = function(
api,
auth,
topNavigationPresenter,
presenterManager,
userBrowsingSettingsPresenter,
userAccountSettingsPresenter,
userAccountRemovalPresenter,
@ -21,35 +22,40 @@ App.Presenters.UserPresenter = function(
var userName;
var activeTab;
function init(args) {
function init(args, loaded) {
userName = args.userName;
topNavigationPresenter.select(auth.isLoggedIn(userName) ? 'my-account' : 'users');
topNavigationPresenter.changeTitle(userName);
promise.waitAll(
util.promiseTemplate('user'),
api.get('/users/' + userName))
.then(function(
userHtml,
response) {
$messages = $el.find('.messages');
template = _.template(userHtml);
util.promiseTemplate('user'),
api.get('/users/' + userName))
.then(function(
userHtml,
response) {
$messages = $el.find('.messages');
template = _.template(userHtml);
user = response.json;
var extendedContext = _.extend(args, {user: user});
user = response.json;
var extendedContext = _.extend(args, {user: user});
promise.waitAll(
userBrowsingSettingsPresenter.init(_.extend(extendedContext, {target: '#browsing-settings-target'})),
userAccountSettingsPresenter.init(_.extend(extendedContext, {target: '#account-settings-target'})),
userAccountRemovalPresenter.init(_.extend(extendedContext, {target: '#account-removal-target'})))
.then(function() {
initTabs(args);
presenterManager.initPresenters([
[userBrowsingSettingsPresenter, _.extend({}, extendedContext, {target: '#browsing-settings-target'})],
[userAccountSettingsPresenter, _.extend({}, extendedContext, {target: '#account-settings-target'})],
[userAccountRemovalPresenter, _.extend({}, extendedContext, {target: '#account-removal-target'})]],
function() {
reinit(args, loaded);
});
}).fail(function(response) {
$el.empty();
messagePresenter.showError($messages, response.json && response.json.error || response);
});
}
}).fail(function(response) {
$el.empty();
messagePresenter.showError($messages, response.json && response.json.error || response);
});
function reinit(args, loaded) {
initTabs(args);
loaded();
}
function initTabs(args) {
@ -82,10 +88,10 @@ App.Presenters.UserPresenter = function(
return {
init: init,
reinit: initTabs,
reinit: reinit,
render: render
};
};
App.DI.register('userPresenter', ['_', 'jQuery', 'util', 'promise', 'api', 'auth', 'topNavigationPresenter', 'userBrowsingSettingsPresenter', 'userAccountSettingsPresenter', 'userAccountRemovalPresenter', 'messagePresenter'], App.Presenters.UserPresenter);
App.DI.register('userPresenter', ['_', 'jQuery', 'util', 'promise', 'api', 'auth', 'topNavigationPresenter', 'presenterManager', 'userBrowsingSettingsPresenter', 'userAccountSettingsPresenter', 'userAccountRemovalPresenter', 'messagePresenter'], App.Presenters.UserPresenter);

4
public_html/js/Router.js
View file

@ -57,7 +57,9 @@ App.Router = function(pathJs, _, jQuery, util, appState, presenterManager) {
additionalParams,
{previousRoute: pathJs.routes.previous});
presenterManager.switchContentPresenter( presenterName, finalParams);
var presenter = App.DI.get(presenterName);
presenter.name = presenterName;
presenterManager.switchContentPresenter(presenter, finalParams);
}).enter(function(e) {
if (util.isExitConfirmationEnabled()) {
if (window.location.href !== previousLocation) {