javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 03:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Almost working bark park

Browse Source
This commit is contained in:
Max Lynch
2015-05-16 04:48:30 +02:00
parent b0706c1257
commit 238a9c3ea1
3 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ionic/util/util.js
View File

@ -33,7 +33,7 @@ export function merge(dst) {
function _baseExtend(dst, objs, deep) {
for (var i = 0, ii = objs.length; i < ii; ++i) {
var obj = objs[i];
if (!isObject(obj) && !isFunction(obj)) continue;
if (!obj || !isObject(obj) && !isFunction(obj)) continue;
var keys = Object.keys(obj);
for (var j = 0, jj = keys.length; j < jj; j++) {
var key = keys[j];