Skip to content

Commit e253233

Browse files
committed
hotfix 1.1.1
1 parent ecc0da1 commit e253233

File tree

5 files changed

+16
-2
lines changed

5 files changed

+16
-2
lines changed

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ System configuration are stored in the <strong>locals.js</strong> file.
4242
Test using karma and jasmine, run the test with `npm test` or `karma start`. Unit and coverage test report are stored in report directory.
4343

4444
## Changelog
45+
### 1.1.1
46+
- fix mobile can not redirect
47+
- fix can not define custom router<br>
48+
18.11.2015
49+
4550
### 1.1.0
4651
- add gulp task named build-views that registers AngularJS templates in the $templateCache
4752
- add karma and size into gulpfile

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angularjs-requirejs-boilerplate",
33
"description": "An complete angularjs requirejs boilerplate for node.",
4-
"version": "1.1.0",
4+
"version": "1.1.1",
55
"authors": "Pluser <[email protected]>",
66
"main": "app.js",
77
"keywords": [

middleware/middleware-config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ var middlewareConfig = function (app) {
3939
function detectMobile(req, res, next) {
4040
if (detector.isMobile(req.get('User-Agent'))) {
4141
res.redirect("/h5");
42+
return ;
4243
}
4344
next();
4445
}

middleware/router/router-config.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,16 @@ var routerConfig = function (app) {
99
};
1010

1111
function newRouter(routersConfig) {
12+
if (_.isFunction(routersConfig)) {
13+
return routersConfig;
14+
}
15+
1216
var router = express.Router();
1317

18+
if (!_.isArray(routersConfig)) {
19+
return router;
20+
}
21+
1422
_.forEach(routersConfig, function (config) {
1523
router.get(config.path, function (req, res) {
1624
res.render(config.view, config.data);

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angularjs-requirejs-boilerplate",
33
"description": "An complete angularjs requirejs boilerplate for node.",
4-
"version": "1.1.0",
4+
"version": "1.1.1",
55
"author": "Pluser <[email protected]>",
66
"keywords": [
77
"angular",

0 commit comments

Comments
 (0)