diff --git a/Frontend/assets/scripts/tools/mock/datatransfer.js b/Frontend/assets/scripts/tools/mock/datatransfer.js index 3f265d1..7269faf 100644 --- a/Frontend/assets/scripts/tools/mock/datatransfer.js +++ b/Frontend/assets/scripts/tools/mock/datatransfer.js @@ -140,7 +140,7 @@ function loadFetchedMessage(){ json.messageBody, json.httpStatus); fillHeaderTable(json.httpHeaders); - initializeHistory(); + getHistoryData(); refreshHeaderTable(document.innerHTML); } diff --git a/Frontend/assets/scripts/tools/mock/modal.js b/Frontend/assets/scripts/tools/mock/modal.js index 3061752..c20804b 100644 --- a/Frontend/assets/scripts/tools/mock/modal.js +++ b/Frontend/assets/scripts/tools/mock/modal.js @@ -7,7 +7,6 @@ var methodToCall = { const overlay = $('#overlay'); const savedModal = $('#modal-confirm'); const dataLossModal = $('#modal-query'); -const uuidChangeModal = $('#modal-uuidChanged') const dataLossModalYes = dataLossModal.children().eq(2).children().eq(0); const dataLossModalNo = dataLossModal.children().eq(2).children().eq(1); const allModals = $('.modal'); @@ -24,36 +23,10 @@ const dataLossModalDisplay = function(){ showModal(dataLossModal); } -const uuidChangeModalDisplay = function(addidionalMessage){ - - switch(addidionalMessage){ - case "success":{ - - $(".uuid-modal-body").removeClass("active"); - $("#changeUUIDSuccess").addClass("active"); - break; - } - case "new":{ - - $(".uuid-modal-body").removeClass("active"); - $("#newUUID").addClass("active"); - break; - } - case "restore":{ - - $(".uuid-modal-body").removeClass("active"); - $("#restoredUUID").addClass("active"); - break; - } - case "noChg":{ - - $(".uuid-modal-body").removeClass("active"); - $("#noChgUUID").addClass("active"); - break; - } - } - showModal(uuidChangeModal); -} +btnModalClose.click(closeModals); +overlay.click(closeModals); +dataLossModalNo.click(closeModals); +dataLossModalYes.click(dropChangesAndClose); function setMethodToCall(name, id){ methodToCall.name = name; @@ -74,16 +47,7 @@ function showModal(jmodal){ function hideModal(jmodal){ if(!modalDisplayed) return; - if ($(uuidChangeModal).hasClass('active')) window.location.reload(); overlay.removeClass('active'); jmodal.removeClass('active'); modalDisplayed = false; } - -btnModalClose.click(closeModals); - -overlay.click(closeModals); - -dataLossModalNo.click(closeModals); -dataLossModalYes.click(dropChangesAndClose); - diff --git a/Frontend/assets/scripts/tools/mock/uianimation.js b/Frontend/assets/scripts/tools/mock/uianimation.js index 28644ef..1871bdf 100644 --- a/Frontend/assets/scripts/tools/mock/uianimation.js +++ b/Frontend/assets/scripts/tools/mock/uianimation.js @@ -1,40 +1,31 @@ var advancedVisibility = false; -var selectMenu = $("#selectMenuContent"); -var advancedTab = $("#advanced"); -var basicID = $("#basicItemData") -var advancedID = $("#advancedItemData"); -var advancedUUIDOptions = $("#uuid-validation-strategy"); var focusedField = false; +/* +Listeners +*/ +$("#optional").click(changeAdvancedVisibility); + +$('#historyTab').click(showHistory); + +$('.tooltipped').on("mouseenter" , (event) => {showTip(event.currentTarget.id+'Tip')}) + .on( "mouseleave", (event) => {hideTip(event.currentTarget.id+'Tip')}); + +/* +Functions +*/ + function changeAdvancedVisibility(){ if(advancedVisibility){ - selectMenu.removeClass('active'); - advancedTab.removeClass('active'); - advancedID.removeClass('active'); - advancedUUIDOptions.removeClass('active'); - basicID.addClass('active'); + $("#advanced").removeClass('active'); advancedVisibility = false; } else { - selectMenu.addClass('active'); - advancedTab.addClass('active'); - advancedID.addClass('active'); - advancedUUIDOptions.addClass('active'); - basicID.removeClass('active'); + $('#advanced').addClass('active'); advancedVisibility = true; } setCookie(); } -const historyFilter = $('#history-filter'); -const historyFilterSwitch = function(){ - historyFilter.toggleClass('active'); -} - -$("#optional").click(changeAdvancedVisibility); -$('#historyTab').click(showHistory); -$('#btn-history-filter').click(historyFilterSwitch); - - const tabitem = $('.tabitem'); function showHistory(){ $('#headersTab').click(showHeaders); @@ -43,11 +34,6 @@ function showHistory(){ $('#history').addClass('active'); $('#historyTab').addClass('active'); $('#historyTab').off('click'); - initializeHistory(); -} - -function initializeHistory(){ - historyFilter.removeClass('active'); getHistoryData(); } @@ -165,69 +151,15 @@ function showRequestBody(element){ showPopup(); } -function focusInTip(element){ - showTip(element); - focusedField = true; -} - -function focusOutTip(element){ - focusedField = false; - hidTip(element); -} - function refreshHistoryRecords(){ getHistoryData(); } -function hidTip(element){ - if(focusedField) return; +function hideTip(element){ $('#'+element).removeClass('active'); } function showTip(element){ - if(focusedField) return; $('.tip').removeClass('active'); $('#'+element).addClass('active'); } - -$('#messageLink').mouseover(function(){showTip('messageLinkTip')}); -$('#messageLink').mouseleave(function(){hidTip('messageLinkTip')}); - -$('#httpStatus').mouseover(function(){showTip('httpStatusTip')}); -$('#httpStatus').focusin(function(){focusInTip('httpStatusTip')}); -$('#httpStatus').mouseleave(function(){hidTip('httpStatusTip')}); -$('#httpStatus').focusout(function(){focusOutTip('httpStatusTip')}); - -$('#typeSelector').mouseover(function(){showTip('typeSelectorTip')}); -$('#typeSelector').focusin(function(){focusInTip('typeSelectorTip')}); -$('#typeSelector').mouseleave(function(){hidTip('typeSelectorTip')}); -$('#typeSelector').focusout(function(){focusOutTip('typeSelectorTip')}); - -$('#bodyEditor').mouseover(function(){showTip('bodyEditorTip')}); -$('#bodyEditor').focusin(function(){focusInTip('bodyEditorTip')}); -$('#bodyEditor').mouseleave(function(){hidTip('bodyEditorTip')}); -$('#bodyEditor').focusout(function(){focusOutTip('bodyEditorTip')}); - -$('#headersTab').mouseover(function(){showTip('headersTabTip')}); -$('#headersTab').mouseleave(function(){hidTip('headersTabTip')}); - -$('#historyTab').mouseover(function(){showTip('historyTabTip')}); -$('#historyTab').mouseleave(function(){hidTip('historyTabTip')}); - -$('#headerKeyInput').mouseover(function(){showTip('newHeaderTip')}); -$('#headerKeyInput').focusin(function(){focusInTip('newHeaderTip')}); -$('#headerKeyInput').mouseleave(function(){hidTip('newHeaderTip')}); -$('#headerKeyInput').focusout(function(){focusOutTip('newHeaderTip')}); - -$('#headerValueInput').mouseover(function(){showTip('newHeaderTip')}); -$('#headerValueInput').focusin(function(){focusInTip('newHeaderTip')}); -$('#headerValueInput').mouseleave(function(){hidTip('newHeaderTip')}); -$('#headerValueInput').focusout(function(){focusOutTip('newHeaderTip')}); - -$('#btnSave').mouseover(function(){showTip('btnSaveTip');}); -$('#btnSave').focusin(function(){focusInTip('btnSaveTip')}); -$('#btnSave').mouseleave(function(){hidTip('btnSaveTip')}); -$('#btnSave').focusout(function(){focusOutTip('btnSaveTip')}); - -$('#listItems').mouseover(function(){showTip('messagesTip');}); -$('#listItems').mouseleave(function(){hidTip('messagesTip')}); \ No newline at end of file diff --git a/Frontend/tools/mock.html b/Frontend/tools/mock.html index 1ef5af1..e41c7cc 100644 --- a/Frontend/tools/mock.html +++ b/Frontend/tools/mock.html @@ -50,7 +50,7 @@
- +
@@ -59,7 +59,7 @@
- +
-
+
- +
@@ -95,8 +95,8 @@
- - + +
@@ -118,8 +118,8 @@ - - + + @@ -170,10 +170,6 @@
-
-

Message

-

This is saved messages, with unique id.

-