Skip to content

Commit a0c8cd8

Browse files
committed
Only puremvc and employee admin demo are loaded as modules
1 parent 8410fa0 commit a0c8cd8

File tree

2 files changed

+14
-32
lines changed

2 files changed

+14
-32
lines changed

index.html

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,19 @@
66
<meta charset="utf-8" />
77
<title> PureMVC TypeScript standard framework demo : Employee Admin </title>
88

9+
<!-- CSS used by jQuery UI, jQgrid and the Employee Admin demo -->
910
<link rel="stylesheet" type="text/css" media="screen" href="css/ui-lightness/jquery-ui-1.8.16.custom.css">
1011
<link rel="stylesheet" type="text/css" media="screen" href="lib/jqgrid/css/ui.jqgrid.css" />
1112
<link rel="stylesheet" href="css/employee-admin.css"/>
1213

13-
<script data-main="main.js" src="lib/require/require-jquery.js" type="text/javascript"></script>
14+
<!-- jQuery and what depends on it need too much compromises to be loaded as AMD modules -->
15+
<script src="lib/jquery/jquery-1.8.2.min.js" type="text/javascript"></script>
16+
<script src="lib/jquery-ui/jquery-ui-1.8.16.custom.min.js" type="text/javascript"></script>
17+
<script src="lib/jqgrid/js/jquery.jqGrid.src.js" type="text/javascript"></script>
18+
<script src="lib/jqgrid/js/i18n/grid.locale-en.js" type="text/javascript"></script>
19+
20+
<!-- Using require validates PureMVC and applications based on it load as AMD modules -->
21+
<script data-main="main.js" src="lib/require/require.js" type="text/javascript"></script>
1422

1523
</head>
1624

main.js

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,19 @@
11
require.config
22
(
33
{
4-
baseUrl: 'lib/',
4+
baseUrl: '.',
55

66
paths:
77
{
8-
jQueryUi: 'jquery-ui/jquery-ui-1.8.16.custom.min',
9-
jqGrid: 'jqgrid/js/jquery.jqGrid.min',
10-
jqGridLocale: 'jqgrid/i18n/grid.locale-en',
11-
12-
puremvc: 'puremvc/puremvc-typescript-standard-1.0',
13-
EmployeeAdmin: '../bin/puremvc-typescript-employeeadmin-1.0'
8+
puremvc: 'lib/puremvc/puremvc-typescript-standard-1.0',
9+
EmployeeAdmin: 'bin/puremvc-typescript-employeeadmin-1.0'
1410
},
1511

1612
shims:
1713
{
18-
19-
"jqGrid":
20-
{
21-
deps: ["jquery","jqGridLocale"]
22-
},
23-
24-
"jqGridLocale":
25-
{
26-
deps: ["jquery"]
27-
},
28-
29-
"jQueryUi":
30-
{
31-
deps: ["jquery"]
32-
},
33-
3414
"EmployeeAdmin":
3515
{
36-
deps: ["puremvc","jquery","jqGrid","jQueryUi"]
16+
deps: ["puremvc"]
3717
}
3818

3919
}
@@ -45,22 +25,16 @@ require
4525

4626
[
4727
'puremvc',
48-
'jqGridLocale',
49-
'jqGrid',
50-
'jQueryUi',
5128
'EmployeeAdmin'
5229
],
5330

5431
function
5532
(
5633
puremvc,
57-
jqGridLocale,
58-
jqGrid,
59-
jQueryUi,
6034
EmployeeAdmin
6135
)
6236
{
63-
//Wait for dom ready before setting up the application.
37+
//Wait for dom to be ready before setting up the application.
6438
jQuery( function ()
6539
{
6640
var applicationFacade/*ApplicationFacade*/ = EmployeeAdmin.ApplicationFacade.getInstance();

0 commit comments

Comments
 (0)