Fixing modal popups

revert-dabc3590
Rasika Perera 8 years ago
parent b99bd42a91
commit 71784e6609

@ -33,7 +33,7 @@ function setPopupMaxHeight() {
* show popup function. * show popup function.
*/ */
function showPopup() { function showPopup() {
$(modalPopup).show(); $(modalPopup).modal('show');
setPopupMaxHeight(); setPopupMaxHeight();
$('#downloadForm').validate({ $('#downloadForm').validate({
rules: { rules: {
@ -65,7 +65,7 @@ function hidePopup() {
$('label[for=deviceName]').remove(); $('label[for=deviceName]').remove();
$('.control-group').removeClass('success').removeClass('error'); $('.control-group').removeClass('success').removeClass('error');
$(modalPopupContent).html(''); $(modalPopupContent).html('');
$(modalPopup).hide(); $(modalPopup).modal('hide');
} }
/* /*

@ -33,7 +33,7 @@ function setPopupMaxHeight() {
* show popup function. * show popup function.
*/ */
function showPopup() { function showPopup() {
$(modalPopup).show(); $(modalPopup).modal('show');
setPopupMaxHeight(); setPopupMaxHeight();
$('#downloadForm').validate({ $('#downloadForm').validate({
rules: { rules: {
@ -65,7 +65,7 @@ function hidePopup() {
$('label[for=deviceName]').remove(); $('label[for=deviceName]').remove();
$('.control-group').removeClass('success').removeClass('error'); $('.control-group').removeClass('success').removeClass('error');
$(modalPopupContent).html(''); $(modalPopupContent).html('');
$(modalPopup).hide(); $(modalPopup).modal('hide');
} }
/* /*

@ -33,7 +33,7 @@ function setPopupMaxHeight() {
* show popup function. * show popup function.
*/ */
function showPopup() { function showPopup() {
$(modalPopup).show(); $(modalPopup).modal('show');
setPopupMaxHeight(); setPopupMaxHeight();
$('#downloadForm').validate({ $('#downloadForm').validate({
rules: { rules: {
@ -65,7 +65,7 @@ function hidePopup() {
$('label[for=deviceName]').remove(); $('label[for=deviceName]').remove();
$('.control-group').removeClass('success').removeClass('error'); $('.control-group').removeClass('success').removeClass('error');
$(modalPopupContent).html(''); $(modalPopupContent).html('');
$(modalPopup).hide(); $(modalPopup).modal('hide');
} }
/* /*

@ -16,9 +16,9 @@
* under the License. * under the License.
*/ */
var modalPopup = '.modal', var modalPopup = ".wr-modalpopup";
modalPopupContainer = modalPopup + ' .modal-content', var modalPopupContainer = modalPopup + " .modalpopup-container";
modalPopupContent = modalPopup + ' .modal-content'; var modalPopupContent = modalPopup + " .modalpopup-content";
var body = "body"; var body = "body";
/* /*

@ -37,7 +37,7 @@ function setPopupMaxHeight() {
* show popup function. * show popup function.
*/ */
function showPopup() { function showPopup() {
$(modalPopup).show(); $(modalPopup).modal('show');
setPopupMaxHeight(); setPopupMaxHeight();
} }
@ -47,7 +47,7 @@ function showPopup() {
function hidePopup() { function hidePopup() {
$(modalPopupContent).html(""); $(modalPopupContent).html("");
$(modalPopupContent).removeClass("operation-data"); $(modalPopupContent).removeClass("operation-data");
$(modalPopup).hide(); $(modalPopup).modal('hide');
} }
var updateNotificationCount = function (data, textStatus, jqXHR) { var updateNotificationCount = function (data, textStatus, jqXHR) {

Loading…
Cancel
Save