Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 24784f1

Browse files
committed
1.2.0 released
1 parent 50e6370 commit 24784f1

File tree

5 files changed

+29
-22
lines changed

5 files changed

+29
-22
lines changed

‎README.md

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Support following amd/cmd loaders:
2222
* `Sea.js`
2323
* `System.js`
2424

25-
Support `controllerUrl` config in `angular-ui-router` and `angular-route`:
25+
Support `controllerUrl/denpendencies` config in `angular-ui-router` and `angular-route`:
2626

2727
* `$stateProvider.state`
2828
* `$routeProvider.when`
@@ -100,27 +100,18 @@ define(function (require) {
100100
.state('home', {
101101
url: '/home',
102102
templateUrl: 'home/home.html',
103-
// new attribute for ajax load controller js
103+
// new attribute for ajax load controller
104104
controllerUrl: 'home/homeCtrl',
105105
controller: 'homeCtrl'
106106
})
107107
.state('users', app.route({
108108
url: '/users',
109109
templateUrl: 'users/users.html',
110-
// new attribute for ajax load controller js
110+
// new attribute for ajax load controller
111111
controllerUrl: 'users/usersCtrl',
112112
controller: 'usersCtrl',
113-
114-
/*
115-
// customize to load more dependencies
116-
resolve: {
117-
dummy: app.load([
118-
'users/usersCtrl', // controller
119-
'services/usersService' // service
120-
// filters, directives, ...
121-
])
122-
}
123-
*/
113+
// load more controllers, services, filters, ...
114+
dependencies: ['services/usersService']
124115
}));
125116
}]);
126117
});
@@ -132,8 +123,8 @@ define(function (require) {
132123
define(function (require) {
133124
var app = require('../app');
134125

135-
// dynamic load services js
136-
require('../services/usersService');
126+
// dynamic load services here or add into dependencies of state config
127+
//require('../services/usersService');
137128

138129
app.controller('usersCtrl', ['$scope', function ($scope) {
139130
// shortcut to get angular injected service.

‎angular-async-loader.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
function factory(angular, undefined) {
1111

12+
var VERSION = '1.2.0';
13+
1214
// Support require.js, sea.js, system.js
1315
var amdRequire = (function() {
1416
if (typeof(require) === 'function') {
@@ -29,6 +31,7 @@
2931
/**
3032
* Load external dependencies, such as Controller, Service, etc.
3133
*
34+
* @private
3235
* @param {String|Array} dependencies
3336
* @returns {*} a promised function to ajax load dependencies
3437
*/
@@ -51,6 +54,7 @@
5154
*
5255
* Transform 'controllerUrl' and 'dependencies' attrs into resolve object.
5356
*
57+
* @private
5458
* @param {Object} config
5559
* @returns {Object} the modified config
5660
*/
@@ -90,8 +94,16 @@
9094

9195

9296
return {
93-
VERSION: '1.1.0',
94-
97+
/**
98+
* Version of npm package.
99+
*/
100+
VERSION: VERSION,
101+
102+
/**
103+
* Configure angular module instance to support async load components.
104+
*
105+
* @param {angular.Module} app
106+
*/
95107
configure: function(app) {
96108

97109
app.provider('$asyncLoader', [

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-async-loader",
3-
"version": "1.1.0",
3+
"version": "1.2.0",
44
"description": "async loader for angular 1.x",
55
"author": {
66
"name": "Guoqiang Chen",

‎sample/webapp/app-routes.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,17 @@ define(function (require) {
1313
.state('home', {
1414
url: '/home',
1515
templateUrl: 'home/home.html',
16-
controllerUrl: 'home/homeCtrl', // new attribute for ajax load controller js
16+
// new attribute for ajax load controller
17+
controllerUrl: 'home/homeCtrl',
1718
controller: 'homeCtrl'
1819
})
1920
.state('users', {
2021
url: '/users',
2122
templateUrl: 'users/users.html',
22-
controllerUrl: 'users/usersCtrl', // new attribute for ajax load controller js
23+
// new attribute for ajax load controller
24+
controllerUrl: 'users/usersCtrl',
2325
controller: 'usersCtrl',
26+
// load more controllers, services, filters, ...
2427
dependencies: ['services/usersService']
2528
});
2629
}]);

‎sample/webapp/users/usersCtrl.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
define(function (require) {
22
var app = require('../app');
33

4-
//require('../services/usersService');
4+
// dynamic load services here or add into dependencies of state config
5+
// require('../services/usersService');
56

67
app.controller('usersCtrl', ['$scope', function ($scope) {
78
$scope.userList = app.get('usersService').list();

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /