Merge pull request #962 from adaptlearning/issue/961

Resolves #961, adds check on _canNavigate to navigateToParent()
adaptlearning · Feb 18, 2016 · 52253f0 · 52253f0
2 parents 7b25656 + 5ec8d49
commit 52253f0
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/core/js/router.js b/src/core/js/router.js
@@ -213,10 +213,12 @@ define([
             }
         },
 
-        navigateToParent: function() {
-            var parentId = Adapt.contentObjects.findWhere({_id:Adapt.location._currentId}).get("_parentId");
-            var route = (parentId === Adapt.course.get("_id")) ? "#/" : "#/id/" + parentId;
-            this.navigate(route, { trigger: true });
+        navigateToParent: function(force) {
+            if (Adapt.router.get('_canNavigate') || force) {
+                var parentId = Adapt.contentObjects.findWhere({_id:Adapt.location._currentId}).get("_parentId");
+                var route = (parentId === Adapt.course.get("_id")) ? "#/" : "#/id/" + parentId;
+                this.navigate(route, { trigger: true });  
+            }
         },
 
         setContentObjectToVisited: function(model) {