Update vendor/requirejs and fix AMD dependencies to avoid circular dependency issues.

Former-commit-id: 4af19b824f7018d7e3473ba7fe98584b5d6949c5
This commit is contained in:
John-David Dalton
2013-07-16 22:33:10 -07:00
parent fab0b91a79
commit a17c32bed0
3 changed files with 37 additions and 20 deletions

View File

@@ -1152,7 +1152,7 @@
// return the compiled function
return factory(
errorClass, errorProto, hasOwnProperty, indicatorObject, isArguments,
isArray, isString, keys, lodash, objectProto, objectTypes, nonEnumProps,
isArray, isString, data.useKeys && keys, lodash, objectProto, objectTypes, nonEnumProps,
stringClass, stringProto, toString
);
}
@@ -1315,7 +1315,8 @@
'args': 'object',
'init': '[]',
'top': 'if (!(objectTypes[typeof object])) return result',
'loop': 'result.push(index)'
'loop': 'result.push(index)',
'useKeys': false
});
/**