fix(popup): avoid detection of wrong existing popup

When a popup was defined to get its content out of an existing DOM-Node it was in some situations wrongly reused on another, totally different popup because the popup-creation code was searching for existing nodes _before__checking for a specific domnode. That way a previously detached domnode from another popup was used by accident. This PR switched priorities to always check for a specific defined DOM node in settings.popup before looking for an existing dom node next to the popup.
fomantic · Nov 5, 2019 · 4473b66 · 4473b66
1 parent 60989a5
commit 4473b66
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/definitions/modules/popup.js b/src/definitions/modules/popup.js
@@ -286,18 +286,18 @@ $.fn.popup = function(parameters) {
             }
             settings.onCreate.call($popup, element);
           }
-          else if($target.next(selector.popup).length !== 0) {
-            module.verbose('Pre-existing popup found');
-            settings.inline = true;
-            settings.popup  = $target.next(selector.popup).data(metadata.activator, $module);
+          else if(settings.popup) {
+            $(settings.popup).data(metadata.activator, $module);
+            module.verbose('Used popup specified in settings');
             module.refresh();
             if(settings.hoverable) {
               module.bind.popup();
             }
           }
-          else if(settings.popup) {
-            $(settings.popup).data(metadata.activator, $module);
-            module.verbose('Used popup specified in settings');
+          else if($target.next(selector.popup).length !== 0) {
+            module.verbose('Pre-existing popup found');
+            settings.inline = true;
+            settings.popup  = $target.next(selector.popup).data(metadata.activator, $module);
             module.refresh();
             if(settings.hoverable) {
               module.bind.popup();