Merge pull request #1066 from Patternslib/fix-navigation

fix incorrect navigation state after injection happens

Author: thet

src/pat/inject/inject.js

@@ -456,8 +456,14 @@ const inject = {
         const $injected = cfg.$injected || $src;
         // Now the injection actually happens.
         if (this._inject(trigger, $src, $(target), cfg)) {
+            // Update history
+            this._update_history(cfg, trigger, title);
+            // Post-injection
             this._afterInjection($el, $injected, cfg);
         }
+    },
+
+    _update_history(cfg, trigger, title) {
         // History support. if subform is submitted, append form params
         const glue = cfg.url.indexOf("?") > -1 ? "&" : "?";
         if (cfg.history === "record" && "pushState" in history) {

src/pat/navigation/navigation.js

@@ -70,7 +70,7 @@ export default Base.extend({
      * Initial run to mark the current item and its parents.
      */
     init_markings() {
-        if (this.el.querySelector(this.options.currentClass)) {
+        if (this.el.querySelector(`.${this.options.currentClass}`)) {
             log.debug("Mark navigation items based on existing current class");
             this.mark_current();
         } else {