Merge pull request pipwerks#12 from danielghost/master

pipwerks · pipwerks · commit b7f256eeee03 · 2015-03-27T08:41:11.000-07:00
Amend to look for the API in the current window first. Whilst this isn't...
diff --git a/src/JavaScript/SCORM_API_wrapper.js b/src/JavaScript/SCORM_API_wrapper.js
@@ -175,7 +175,9 @@ pipwerks.SCORM.API.get = function(){
         find = scorm.API.find,
         trace = pipwerks.UTILS.trace;
 
-    if(win.parent && win.parent != win){
+    API = find(win);
+
+    if(!API && win.parent && win.parent != win){
         API = find(win.parent);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,9 @@ pipwerks.SCORM.API.get = function(){`
`175`	`175`	`find = scorm.API.find,`
`176`	`176`	`trace = pipwerks.UTILS.trace;`
`177`	`177`
`178`		`- if(win.parent && win.parent != win){`
	`178`	`+ API = find(win);`
	`179`	`+`
	`180`	`+ if(!API && win.parent && win.parent != win){`
`179`	`181`	`API = find(win.parent);`
`180`	`182`	`}`
`181`	`183`