Commit d6638b50 authored by hy's avatar hy

no message

parent 3d93cad0
...@@ -33,12 +33,18 @@ ...@@ -33,12 +33,18 @@
"grunt-contrib-copy": "^0.8.0" "grunt-contrib-copy": "^0.8.0"
}, },
"devDependencies": { "devDependencies": {
"cz-conventional-changelog": "^1.1.5",
"grunt": "~0.4.1", "grunt": "~0.4.1",
"grunt-module-dependence": "~0.2.0", "grunt-contrib-clean": "~0.5.0",
"grunt-contrib-concat": "~0.5.0", "grunt-contrib-concat": "~0.5.0",
"grunt-contrib-uglify": "~0.4.0",
"grunt-contrib-copy": "~0.5.0", "grunt-contrib-copy": "~0.5.0",
"grunt-replace": "~0.8.0", "grunt-contrib-uglify": "~0.4.0",
"grunt-contrib-clean": "~0.5.0" "grunt-module-dependence": "~0.2.0",
"grunt-replace": "~0.8.0"
},
"config": {
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
}
} }
} }
\ No newline at end of file
...@@ -30,7 +30,7 @@ define(function(require, exports, module) { ...@@ -30,7 +30,7 @@ define(function(require, exports, module) {
} }
}); });
Minder.version = '1.4.25'; Minder.version = '1.4.26';
Minder.registerInitHook = function(hook) { Minder.registerInitHook = function(hook) {
_initHooks.push(hook); _initHooks.push(hook);
......
...@@ -262,6 +262,15 @@ define(function(require, exports, module) { ...@@ -262,6 +262,15 @@ define(function(require, exports, module) {
x = 0; x = 0;
for (i = 0; i < resource.length; i++) { for (i = 0; i < resource.length; i++) {
/* 修复 resource 数组中出现 null 的 bug
* @Author zhangbobell
* @date 2016-01-15
*/
if (!resource[i]) {
continue;
}
x += spaceRight; x += spaceRight;
overlay = overlays[i]; overlay = overlays[i];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment