issue/1521: remove navigation from #wrapper

src/core/js/app.js

@@ -118,13 +118,26 @@ require([
             Adapt.log.error('Error during app:dataReady trigger', e);
         }
 
-        Adapt.navigation = new NavigationView();// This should be triggered after 'app:dataReady' as plugins might want to manipulate the navigation
+        addNavigationBar();
 
         Adapt.initialize();
 
         Adapt.off('adaptCollection:dataLoaded courseModel:dataLoaded');
     }
 
+    function addNavigationBar() {
+
+        var adaptConfig = Adapt.course.get("_navigation");
+
+        if (adaptConfig && adaptConfig._isDefaultNavigationDisabled) {
+            Adapt.trigger("navigation:initialize");
+            return;
+        }
+
+        Adapt.navigation = new NavigationView();// This should be triggered after 'app:dataReady' as plugins might want to manipulate the navigation
+
+    }
+
     function configureInview() {
 
         var adaptConfig = Adapt.config.get("_inview");

src/core/js/router.js

@@ -15,6 +15,8 @@ define([
             this.showLoading();
             // Store #wrapper element to cache for later
             this.$wrapper = $('#wrapper');
+            this.$html = $('html');
+
             Adapt.once('app:dataReady', function() {
                 document.title = Adapt.course.get('title');
             });
@@ -309,6 +311,17 @@ define([
                     + ' location-id-'
                     + Adapt.location._currentId :
                     'location-' + Adapt.location._currentLocation;
+
+            var previousClasses = Adapt.location._previousClasses;
+            if (previousClasses) {
+                this.$html.removeClass(previousClasses);
+            }
+            Adapt.location._previousClasses = classes;
+
+            this.$html
+                .addClass(classes)
+                .attr('data-location', Adapt.location._currentLocation);
+
             this.$wrapper
                 .removeClass()
                 .addClass(classes)

src/core/js/views/navigationView.js

@@ -29,7 +29,7 @@ define([
                     _globals: Adapt.course.get("_globals"),
                     _accessibility: Adapt.config.get("_accessibility")
                 }
-            )).appendTo('#wrapper');
+            )).insertBefore('#wrapper');
 
             _.defer(_.bind(function() {
                 Adapt.trigger('navigationView:postRender', this);