aboutsummaryrefslogtreecommitdiff
path: root/src/jsifier.js
diff options
context:
space:
mode:
authorEhsan Akhgari <ehsan.akhgari@gmail.com>2012-04-12 18:08:45 -0400
committerEhsan Akhgari <ehsan.akhgari@gmail.com>2012-04-12 18:08:45 -0400
commit3f72c46133128715d7dd30f4bc89f82e78344cb4 (patch)
tree20142671a0a56be135af13818c697b25c86349f4 /src/jsifier.js
parent67570a7c4d00b8da556c6c2993ec201283388861 (diff)
parent53015391802b686bc6b18aad0e1ccada684a5317 (diff)
Merge remote-tracking branch 'upstream/incoming' into glmatrix
Conflicts: src/library_gl.js
Diffstat (limited to 'src/jsifier.js')
-rw-r--r--src/jsifier.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/jsifier.js b/src/jsifier.js
index 8e688d8d..904517e1 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -375,11 +375,15 @@ function JSify(data, functionsOnly, givenFunctions) {
processItem: function(item) {
function addFromLibrary(ident) {
if (ident in addedLibraryItems) return '';
+ addedLibraryItems[ident] = true;
+
+ // dependencies can be JS functions, which we just run
+ if (typeof ident == 'function') return ident();
+
// Don't replace implemented functions with library ones (which can happen when we add dependencies).
// Note: We don't return the dependencies here. Be careful not to end up where this matters
if (('_' + ident) in Functions.implementedFunctions) return '';
- addedLibraryItems[ident] = true;
var snippet = LibraryManager.library[ident];
var redirectedIdent = null;
var deps = LibraryManager.library[ident + '__deps'] || [];