Skip to content

Commit 2111d29

Browse files
committed
Use commonjs requires instead of mixing imports/exports/requires
1 parent 36b014a commit 2111d29

28 files changed

+38
-57
lines changed

manager/src/frontend/js/app/access/empty.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

3-
import Mn from 'backbone.marionette';
4-
3+
const Mn = require('backbone.marionette');
54
const template = require('./empty.ejs');
65
const AccessModel = require('../../models/access');
76
const Controller = require('../controller');

manager/src/frontend/js/app/access/main.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

3-
import Mn from 'backbone.marionette';
4-
3+
const Mn = require('backbone.marionette');
54
const Api = require('../api');
65
const template = require('./main.ejs');
76
const Controller = require('../controller');

manager/src/frontend/js/app/access/row.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

3-
import Mn from 'backbone.marionette';
4-
3+
const Mn = require('backbone.marionette');
54
const template = require('./row.ejs');
65
const Controller = require('../controller');
76

manager/src/frontend/js/app/access_list/delete.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

3-
import Mn from 'backbone.marionette';
4-
3+
const Mn = require('backbone.marionette');
54
const template = require('./delete.ejs');
65
const Controller = require('../controller');
76
const Api = require('../api');

manager/src/frontend/js/app/access_list/form.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

3-
import Mn from 'backbone.marionette';
4-
3+
const Mn = require('backbone.marionette');
54
const _ = require('lodash');
65
const template = require('./form.ejs');
76
const Controller = require('../controller');

manager/src/frontend/js/app/access_list/item.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

3-
import Mn from 'backbone.marionette';
4-
3+
const Mn = require('backbone.marionette');
54
const template = require('./item.ejs');
65

76
module.exports = Mn.View.extend({

manager/src/frontend/js/app/api.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
import $ from 'jquery';
3+
const $ = require('jquery');
44

55
/**
66
* @param {String} message

manager/src/frontend/js/app/controller.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
'use strict';
22

3-
import Backbone from 'backbone';
4-
5-
const Cache = require('./cache');
3+
const Backbone = require('backbone');
4+
const Cache = require('./cache');
65

76
module.exports = {
87

@@ -21,8 +20,9 @@ module.exports = {
2120
* Dashboard
2221
*/
2322
showDashboard: function () {
23+
let controller = this;
2424
require(['./main', './dashboard/main'], (App, View) => {
25-
this.navigate('/');
25+
controller.navigate('/');
2626
App.UI.showMainLoading();
2727

2828
let view = new View();
@@ -39,8 +39,9 @@ module.exports = {
3939
* Access
4040
*/
4141
showAccess: function () {
42+
let controller = this;
4243
require(['./main', './access/main'], (App, View) => {
43-
this.navigate('/access');
44+
controller.navigate('/access');
4445
App.UI.showMainLoading();
4546

4647
let view = new View();

manager/src/frontend/js/app/dashboard/empty.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

3-
import Mn from 'backbone.marionette';
4-
3+
const Mn = require('backbone.marionette');
54
const template = require('./empty.ejs');
65
const HostModel = require('../../models/host');
76
const Controller = require('../controller');

manager/src/frontend/js/app/dashboard/main.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

3-
import Mn from 'backbone.marionette';
4-
3+
const Mn = require('backbone.marionette');
54
const Api = require('../api');
65
const template = require('./main.ejs');
76
const Controller = require('../controller');

0 commit comments

Comments
 (0)