Merge pull request #6 from cgkineo/eventOrderFix

Fix for landing on pip page and for cancelling navigation
cgkineo · May 22, 2015 · 1c2ef58 · 1c2ef58
2 parents f5cd264 + 88dacf1
commit 1c2ef58
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/js/adapt-pageIncompletePrompt.js b/js/adapt-pageIncompletePrompt.js
@@ -44,7 +44,7 @@ define(function(require) {
                                 _callbackEvent: "pageIncompletePrompt:" + event,
                         },{
                                 promptText: model._buttons.no,
-                                _callbackEvent: ""
+                                _callbackEvent: "pageIncompletePrompt:cancel"
                         }],
                         _showIcon: true
                 }
@@ -60,13 +60,11 @@ define(function(require) {
 		model = Adapt.course.get(PLUGIN_NAME);
 	});
 
-	Adapt.on("router:page", function(pageView) {
-		if(isEnabled()) enableRouterNav(false);
-	});
 
 	Adapt.on("pageView:ready", function (){
 		var pageModel = Adapt.findById(Adapt.location._currentId);
 		pageComponents = pageModel.findDescendants("components").where({"_isAvailable": true});
+		if(isEnabled() && !allComponentsComplete()) enableRouterNav(false);
 	});
 
 	Adapt.on("pageIncompletePrompt:leavePage", function() {
@@ -95,4 +93,7 @@ define(function(require) {
         Adapt.trigger("navigation:menuButton");
         handlingRoute = false;
     });	
+    Adapt.on("pageIncompletePrompt:cancel", function() {
+        handlingRoute = false;
+    });	
 });