mirror of
https://github.com/moparisthebest/mail
synced 2024-11-22 08:52:15 -05:00
get requirejs bootstrapping working
This commit is contained in:
parent
e8f0c3b509
commit
65bfc6c44c
@ -29,6 +29,7 @@
|
||||
"deepEqual",
|
||||
"start",
|
||||
"chrome",
|
||||
"requirejs",
|
||||
"define",
|
||||
"self",
|
||||
"describe",
|
||||
|
@ -1,7 +1,7 @@
|
||||
// hey Angular, we're bootstrapping manually!
|
||||
window.name = 'NG_DEFER_BOOTSTRAP!';
|
||||
|
||||
require([
|
||||
requirejs([
|
||||
'angular',
|
||||
'js/controller/dialog',
|
||||
'js/controller/popover',
|
||||
@ -18,7 +18,21 @@ require([
|
||||
'cryptoLib/util',
|
||||
'angularRoute',
|
||||
'angularTouch'
|
||||
], function(angular, DialogCtrl, PopoverCtrl, AddAccountCtrl, AccountCtrl, LoginCtrl, LoginInitialCtrl, LoginNewDeviceCtrl, LoginExistingCtrl, MailListCtrl, ReadCtrl, WriteCtrl, NavigationCtrl, util) {
|
||||
], function(
|
||||
angular,
|
||||
DialogCtrl,
|
||||
PopoverCtrl,
|
||||
AddAccountCtrl,
|
||||
AccountCtrl,
|
||||
LoginCtrl,
|
||||
LoginInitialCtrl,
|
||||
LoginNewDeviceCtrl,
|
||||
LoginExistingCtrl,
|
||||
MailListCtrl,
|
||||
ReadCtrl,
|
||||
WriteCtrl,
|
||||
NavigationCtrl,
|
||||
util) {
|
||||
'use strict';
|
||||
|
||||
// reset window.name
|
||||
|
@ -1,7 +1,8 @@
|
||||
(function() {
|
||||
'use strict';
|
||||
|
||||
require.config({
|
||||
requirejs.config({
|
||||
nodeRequire: (typeof module !== 'undefined' && module.exports) ? require : undefined,
|
||||
baseUrl: 'lib',
|
||||
paths: {
|
||||
js: '../js',
|
||||
|
Loading…
Reference in New Issue
Block a user