Skip to content

Commit eb17974

Browse files
authored
Merge pull request grokability#17722 from grokability/grokability#17704-retain-linebreaks
Fixed grokability#17704 - retain linebreaks on custom field clipboard copy
2 parents 7a36bbb + 22852c2 commit eb17974

File tree

8 files changed

+52
-7
lines changed

8 files changed

+52
-7
lines changed

public/css/build/app.css

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/build/app.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/build/overrides.css

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/build/overrides.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/dist/all.css

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/mix-manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"/js/dist/all.js": "/js/dist/all.js?id=76d88f0f91b852f7eecbce357ab5858b",
33
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=42f97cd5b9ee7521b04a448e7fc16ac9",
44
"/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=d81a7ed323f68a7c5e3e9115f7fb5404",
5-
"/css/build/overrides.css": "/css/build/overrides.css?id=81e3e83b8d669c69d443a21241184f2e",
6-
"/css/build/app.css": "/css/build/app.css?id=b34e2d41a3a0d0c949d813eabdc0204b",
5+
"/css/build/overrides.css": "/css/build/overrides.css?id=257e65d85ce9cf5a413065df1b131c03",
6+
"/css/build/app.css": "/css/build/app.css?id=a1136819126f6c7c3cd37861d69abb84",
77
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=ee0ed88465dd878588ed044eefb67723",
88
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=3d8a3d2035ea28aaad4a703c2646f515",
99
"/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=3979929a3423ff35b96b1fc84299fdf3",
@@ -19,7 +19,7 @@
1919
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=b2cd9f59d7e8587939ce27b2d3363d82",
2020
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=7277edd636cf46aa7786a4449ce0ead7",
2121
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=cbd06cc1d58197ccc81d4376bbaf0d28",
22-
"/css/dist/all.css": "/css/dist/all.css?id=ddd108d2798f64c3a47dc2e61760af12",
22+
"/css/dist/all.css": "/css/dist/all.css?id=4130f13eb82937aa7147bd89f93aaca5",
2323
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
2424
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
2525
"/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",

resources/assets/less/overrides.less

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,3 +1243,12 @@ caption.tableCaption {
12431243
color: #000;
12441244
}
12451245

1246+
.visually-hidden {
1247+
width: 1px;
1248+
height: 1px;
1249+
margin: -1px;
1250+
overflow: hidden;
1251+
clip: rect(0,0,0,0);
1252+
white-space: preserve;
1253+
display: inline-block;
1254+
}

resources/views/hardware/view.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ class="form-inline"
732732
@if (!empty($asset->{$field->db_column_name()}))
733733
{{-- Hidden span used as copy target --}}
734734
{{-- It's tempting to break out the HTML into separate lines for this, but it results in extra spaces being added onto the end of the coipied value --}}
735-
<span class="js-copy-{{ $field->id }} hidden-print" style="font-size: 0px;">{{ ($field->isFieldDecryptable($asset->{$field->db_column_name()}) ? Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) : $asset->{$field->db_column_name()}) }}</span>
735+
<span class="js-copy-{{ $field->id }} visually-hidden hidden-print" style="font-size: 0px;">{{ ($field->isFieldDecryptable($asset->{$field->db_column_name()}) ? Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) : $asset->{$field->db_column_name()}) }}</span>
736736

737737
{{-- Clipboard icon --}}
738738
<i class="fa-regular fa-clipboard js-copy-link hidden-print"
@@ -755,7 +755,7 @@ class="form-inline"
755755
$fieldSize = strlen(Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}))
756756
@endphp
757757
@if ($fieldSize > 0)
758-
<span id="text-{{ $field->id }}-to-hide">{{ str_repeat('*', $fieldSize) }}</span>
758+
<span id="text-{{ $field->id }}-to-hide">***********</span>
759759
@if (($field->format=='URL') && ($asset->{$field->db_column_name()}!=''))
760760
<span class="js-copy-{{ $field->id }} hidden-print"
761761
id="text-{{ $field->id }}-to-show"

0 commit comments

Comments
 (0)