summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRyan Campbell <ryanjcampbell@google.com>2017-11-06 10:20:49 -0800
committerRyan Campbell <ryanjcampbell@google.com>2017-11-06 10:20:49 -0800
commit9180fa3fc5d6961a7238e97f66c5754f33cecb0b (patch)
tree5baefe2975bb69c3cfd8af5215287527efd103a2 /src
parenta064c91d790fc1fe08152b6ae35d94535df488e6 (diff)
downloaddashboard-9180fa3fc5d6961a7238e97f66c5754f33cecb0b.tar.gz
Update modal patterns to match v97.5 uprev.
Update all uses of modals to match the materialize version v97.5 (upreved in the gstatic version of materialize library). Test: staging Bug: 68939156 Change-Id: I8f03d11872ff73d5096682a2c86508a10556cf1f
Diffstat (limited to 'src')
-rw-r--r--src/main/webapp/WEB-INF/jsp/show_table.jsp4
-rw-r--r--src/main/webapp/js/test_acknowledgments.js13
-rw-r--r--src/main/webapp/js/test_results.js10
3 files changed, 18 insertions, 9 deletions
diff --git a/src/main/webapp/WEB-INF/jsp/show_table.jsp b/src/main/webapp/WEB-INF/jsp/show_table.jsp
index 93a4a69..ec4597c 100644
--- a/src/main/webapp/WEB-INF/jsp/show_table.jsp
+++ b/src/main/webapp/WEB-INF/jsp/show_table.jsp
@@ -99,7 +99,9 @@
var infoContainer = $('#info-modal>.modal-content>.info-container');
infoContainer.empty();
logList.appendTo(infoContainer);
- $('#info-modal').openModal();
+ var modal = $('#info-modal');
+ modal.modal();
+ modal.modal('open');
}
// refresh the page to see the selected test types (pre-/post-submit)
diff --git a/src/main/webapp/js/test_acknowledgments.js b/src/main/webapp/js/test_acknowledgments.js
index 9732297..810d9d6 100644
--- a/src/main/webapp/js/test_acknowledgments.js
+++ b/src/main/webapp/js/test_acknowledgments.js
@@ -187,9 +187,10 @@
ack.replaceWith(newAck);
}
}).always(function() {
- modal.closeModal({
+ modal.modal({
complete: function() { _isModalOpen = false; }
});
+ modal.modal('close');
});
}
@@ -210,6 +211,7 @@
_isModalOpen = true;
var wrapper = $('#modal');
wrapper.empty();
+ wrapper.modal();
var content = $('<div class="modal-content"><h4>Test Acknowledgment</h4></div>');
var row = $('<div class="row"></div>').appendTo(content);
row.append('<div class="col s12"><h5><b>Test: </b>' + test + '</h5></div>');
@@ -286,9 +288,10 @@
}
var close = $('<a class="btn-flat">Close</a></div>').appendTo(footer);
close.click(function() {
- wrapper.closeModal({
+ wrapper.modal({
complete: function() { _isModalOpen = false; }
});
+ wrapper.modal('close');
})
footer.appendTo(wrapper);
if (!_isReadOnly) {
@@ -304,12 +307,10 @@
parent: testCaseInput
});
}).always(function() {
- wrapper.openModal({
- dismissible: false
- });
+ wrapper.modal('open');
});
} else {
- wrapper.openModal();
+ wrapper.modal('open');
}
}
diff --git a/src/main/webapp/js/test_results.js b/src/main/webapp/js/test_results.js
index d1d45f0..94960eb 100644
--- a/src/main/webapp/js/test_results.js
+++ b/src/main/webapp/js/test_results.js
@@ -33,17 +33,23 @@
logCollection.html(entries);
if (container.find('#info-modal').length == 0) {
- var modal = $('<div id="info-modal" class="modal"></div>');
+ var modal = $('<div id="info-modal" class="modal modal-fixed-footer"></div>');
var content = $('<div class="modal-content"></div>');
content.append('<h4>Links</h4>');
content.append('<div class="info-container"></div>');
content.appendTo(modal);
+ var footer = $('<div class="modal-footer"></div>');
+ footer.append('<a class="btn-flat modal-close">Close</a></div>');
+ footer.appendTo(modal);
modal.appendTo(container);
}
var infoContainer = $('#info-modal>.modal-content>.info-container');
infoContainer.empty();
logCollection.appendTo(infoContainer);
- $('#info-modal').openModal();
+ $('#info-modal').modal({
+ dismissible: true
+ });
+ $('#info-modal').modal('open');
}
/**