Updated to marionette 4

This commit is contained in:
Jamie Curnow
2018-08-13 21:11:21 +10:00
parent 065727fba2
commit 0bb65e4c3c
4 changed files with 19 additions and 40 deletions

View File

@ -73,25 +73,6 @@ const App = Mn.Application.extend({
}
},
Error: function (code, message, debug) {
let temp = Error.call(this, message);
temp.name = this.name = 'AppError';
this.stack = temp.stack;
this.message = temp.message;
this.code = code;
this.debug = debug;
},
showError: function () {
let ErrorView = Mn.View.extend({
tagName: 'section',
id: 'error',
template: _.template(i18n('main', 'unknown-error'))
});
this.getRegion().show(new ErrorView());
},
getParam: function (name) {
name = name.replace(/[\[\]]/g, '\\$&');
let url = window.location.href;

View File

@ -1,10 +1,11 @@
'use strict';
const Mn = require('../lib/marionette');
const AppRouter = require('marionette.approuter');
const Controller = require('./controller');
module.exports = Mn.AppRouter.extend({
appRoutes: {
module.exports = AppRouter.default.extend({
controller: Controller,
appRoutes: {
users: 'showUsers',
logout: 'logout',
'nginx/proxy': 'showNginxProxy',
@ -15,9 +16,5 @@ module.exports = Mn.AppRouter.extend({
'nginx/certificates': 'showNginxCertificates',
'audit-log': 'showAuditLog',
'*default': 'showDashboard'
},
initialize: function () {
this.controller = Controller;
}
});

View File

@ -1,18 +1,17 @@
'use strict';
const _ = require('underscore');
const Mn = require('backbone.marionette');
const i18n = require('../app/i18n');
const Helpers = require('./helpers');
const _ = require('underscore');
const Mn = require('backbone.marionette');
const i18n = require('../app/i18n');
const Helpers = require('./helpers');
const TemplateCache = require('marionette.templatecache');
let render = Mn.Renderer.render;
Mn.Renderer.render = function (template, data, view) {
Mn.setRenderer(function (template, data, view) {
data = _.clone(data);
data.i18n = i18n;
data.formatDbDate = Helpers.formatDbDate;
return render.call(this, template, data, view);
};
return TemplateCache.default.render.call(this, template, data, view);
});
module.exports = Mn;