moparisthebest/mail
1
0
Fork 0
mirror of https://github.com/moparisthebest/mail synced 2024-11-22 08:52:15 -05:00
Code Issues Releases Wiki Activity

get requirejs bootstrapping working

Browse Source
This commit is contained in:
Tankred Hase 2014-03-02 23:05:09 +01:00
parent e8f0c3b509
commit 65bfc6c44c
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.jshintrc
View File

@ -29,6 +29,7 @@
"deepEqual", "deepEqual",
"start", "start",
"chrome", "chrome",
"requirejs",
"define", "define",
"self", "self",
"describe", "describe",

18
src/js/app.js
View File

@ -1,7 +1,7 @@
// hey Angular, we're bootstrapping manually! // hey Angular, we're bootstrapping manually!
window.name = 'NG_DEFER_BOOTSTRAP!'; window.name = 'NG_DEFER_BOOTSTRAP!';
require([ requirejs([
'angular', 'angular',
'js/controller/dialog', 'js/controller/dialog',
'js/controller/popover', 'js/controller/popover',
@ -18,7 +18,21 @@ require([
'cryptoLib/util', 'cryptoLib/util',
'angularRoute', 'angularRoute',
'angularTouch' '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'; 'use strict';
// reset window.name // reset window.name

3
src/require-config.js
View File

@ -1,7 +1,8 @@
(function() { (function() {
'use strict'; 'use strict';
require.config({ requirejs.config({
nodeRequire: (typeof module !== 'undefined' && module.exports) ? require : undefined,
baseUrl: 'lib', baseUrl: 'lib',
paths: { paths: {
js: '../js', js: '../js',