Fixing bug related to popover not showing in Modal

virtualcommons · Oct 29, 2014 · 6221e8f · 6221e8f
1 parent 8f90fd5
commit 6221e8f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/vcweb/core/templates/experimenter/edit-configuration.html b/vcweb/core/templates/experimenter/edit-configuration.html
@@ -218,9 +218,9 @@ <h4 class="modal-title">Edit Details and Click Save</h4>
                 var model = ko.mapping.fromJS(data, mapping);
 
                 var updateModal = function(action, template, data) {
-                    model.activateModal(action);
                     model.template(template);
                     model.modalData(data);
+                    model.activateModal(action);
                 }
 
                 model.template = ko.observable();

diff --git a/vcweb/core/templates/experimenter/show-configuration.html b/vcweb/core/templates/experimenter/show-configuration.html
@@ -126,7 +126,7 @@ <h4 class="panel-title">
                    ' [x '+ self.repeat() +']': self.name() + ' ' + self.sequence_number();
             };
             self.toggleVisibility = function() {
-                self.isExpanded(!model.isExpanded());
+                self.isExpanded(!self.isExpanded());
             };
         }
 

diff --git a/vcweb/static/js/ko/knockout.helper.js b/vcweb/static/js/ko/knockout.helper.js
@@ -44,7 +44,7 @@ ko.bindingHandlers.showModal = {
             $(element).modal('show');
             // this is to focus input field inside dialog
             $("input", element).focus();
-            $('.has-popover').popover({'trigger':'hover'});
+            $('.has-popover', element).popover({'trigger':'hover'});
         }
         else {
             $(element).modal('hide');