Skip to content

Commit df5c6c0

Browse files
committed
Updated the functionality
1 parent 737bce6 commit df5c6c0

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

client/styles/components/_editor.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,10 @@ pre.CodeMirror-line {
142142
.CodeMirror-find-controls {
143143
display: flex;
144144
}
145-
145+
.CodeMirror-search-inputs {
146+
width: 30%;
147+
margin-left: 10px;
148+
}
146149
.CodeMirror-replace-div {
147150
display: flex;
148151
justify-content: flex-start;
@@ -153,7 +156,7 @@ pre.CodeMirror-line {
153156
display: flex;
154157
flex-wrap: wrap-reverse;
155158
justify-content: flex-start;
156-
align-items: center;
159+
align-items: flex-end;
157160
}
158161
.CodeMirror-replace-controls {
159162
display: flex;

client/utils/codemirror-search.js

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -154,30 +154,30 @@ function persistentDialog(cm, text, deflt, onEnter, replaceOpened, onKeyDown) {
154154
}
155155

156156
function toggleReplace(open) {
157-
var replaceDivHeightOpened = "45px", replaceDivHeightClosed = "0px";
158157
var toggleButtonHeightOpened = "80px", toggleButtonHeightClosed = "40px";
159158

160159
if (open) {
161-
replaceDiv.style.height = replaceDivHeightOpened;
160+
replaceFieldDiv.style.display = replaceControlsDiv.style.display = '';
162161
toggleReplaceBtnDiv.style.height = toggleButtonHeightOpened;
163-
showReplaceButton.style.height = toggleButtonHeightOpened;
164-
showReplaceButton.innerHTML = triangleArrowDown;
162+
toggleReplaceBtn.style.height = toggleButtonHeightOpened;
163+
toggleReplaceBtn.innerHTML = triangleArrowDown;
165164
} else {
166-
replaceDiv.style.height = replaceDivHeightClosed;
165+
replaceFieldDiv.style.display = replaceControlsDiv.style.display = 'none';
167166
toggleReplaceBtnDiv.style.height = toggleButtonHeightClosed;
168-
showReplaceButton.style.height = toggleButtonHeightClosed;
169-
showReplaceButton.innerHTML = triangleArrowRight;
167+
toggleReplaceBtn.style.height = toggleButtonHeightClosed;
168+
toggleReplaceBtn.innerHTML = triangleArrowRight;
170169
}
171170
}
172171

173-
var showReplaceButton = dialog.getElementsByClassName("CodeMirror-replace-toggle-button")[0];
174-
var toggleReplaceBtnDiv = dialog.getElementsByClassName("Toggle-replace-btn-div")[0];
175-
var replaceDiv = dialog.getElementsByClassName("CodeMirror-replace-div")[0];
172+
var toggleReplaceBtnDiv = document.getElementById('Btn-Toggle-replace-div');
173+
var toggleReplaceBtn = document.getElementById('Btn-Toggle-replace')
174+
var replaceFieldDiv = document.getElementById('Replace-input-div');
175+
var replaceControlsDiv = document.getElementById('Replace-controls-div');
176176
if (replaceOpened) {
177177
toggleReplace(true);
178178
}
179-
CodeMirror.on(showReplaceButton, "click", function () {
180-
if (replaceDiv.style.height === "0px") {
179+
CodeMirror.on(toggleReplaceBtn, "click", function () {
180+
if (replaceFieldDiv.style.display === "none") {
181181
toggleReplace(true);
182182
} else {
183183
toggleReplace(false);
@@ -491,11 +491,11 @@ function replaceAll(cm, query, text) {
491491
var getQueryDialog = function() {
492492
return (`
493493
<div class="CodeMirror-find-popup-container">
494-
<div class="Toggle-replace-btn-div">
494+
<div id="Btn-Toggle-replace-div" class="Toggle-replace-btn-div">
495495
<button
496496
title="${i18n.t('CodemirrorFindAndReplace.Replace')}"
497497
aria-label="${i18n.t('CodemirrorFindAndReplace.Replace')}"
498-
role="button"
498+
role="button" id="Btn-Toggle-replace"
499499
class="CodeMirror-search-modifier-button CodeMirror-replace-toggle-button"
500500
>
501501
<span aria-hidden="true" class="button">
@@ -507,12 +507,13 @@ var getQueryDialog = function() {
507507
<div class="CodeMirror-find-input">
508508
<input id="Find-input-field" type="text" class="search-input CodeMirror-search-field" placeholder="${i18n.t('CodemirrorFindAndReplace.FindPlaceholder')}" />
509509
</div>
510-
<div class="CodeMirror-replace-input">
510+
<div style="display: none;" id="Replace-input-div"
511+
class="CodeMirror-replace-input">
511512
<input id="Replace-input-field" type="text" placeholder="${i18n.t('CodemirrorFindAndReplace.ReplacePlaceholder')}" class="search-input CodeMirror-search-field"/>
512513
</div>
513514
</div>
514515
<div class="CodeMirror-search-controls">
515-
<div class="CodeMirror-replace-controls">
516+
<div style="display: none;" id="Replace-controls-div" class="CodeMirror-replace-controls">
516517
<button
517518
title="${i18n.t('CodemirrorFindAndReplace.Replace')}"
518519
aria-label="${i18n.t('CodemirrorFindAndReplace.Replace')}"

0 commit comments

Comments
 (0)