Skip to content

Merge master to dev. #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
geovanneb merged 6 commits into from
Feb 16, 2025
Merged

Merge master to dev. #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
13965f1
Update popup.html
rrademak Feb 14, 2023
46b3ad1
feat: Allow multiple markers to be applied
Aug 29, 2023
6ba40c0
Add user-select: none to disable copying
sippsolutions Aug 21, 2024
bbe3eed
Merge pull request #19 from rrademak/patch-1
geovanneb Jan 31, 2025
e557fc8
Merge pull request #25 from sippsolutions/patch-1
geovanneb Jan 31, 2025
79e9a62
Merge pull request #23 from Hobart2967/allow-multiple-markers
geovanneb Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/html/popup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</head>
<body>
<div class="container">
<h2>Enrivonment Marker Extension</h2>
<h2>Environment Marker Extension</h2>
<form class="hide-show" autocomplete="off" novalidate="">
<h3>Toggle visibility</h3>
<fieldset>
Expand Down
6 changes: 2 additions & 4 deletions app/scripts/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,12 @@ function _addEnvironmentLabel() {
if(CURRENT_LOCATION.indexOf(PLUGIN_STATE.strictList[i].address) > -1) {
CURRENT_CONFIG = PLUGIN_STATE.strictList[i];
_addMarker(CURRENT_CONFIG);
return;
}
}
for(var i = 0; i<PLUGIN_STATE.regexList.length; i++) {
if(PLUGIN_STATE.regexList[i].regex.test(CURRENT_DOMAIN)) {
CURRENT_CONFIG = PLUGIN_STATE.regexList[i];
_addMarker(CURRENT_CONFIG);
return;
}
}
});
Expand Down Expand Up @@ -103,7 +101,7 @@ function _addMarker(item) {
}
wrapperDiv = document.createElement('div');
wrapperDiv.id = 'chrome-envmarker';
wrapperDiv.setAttribute('style','text-shadow: -1px -1px 0 #555, 1px -1px 0 #555, -1px 1px 0 #555, 1px 1px 0 #555; position: fixed; '+positionStyle+' background-color: #'+item.color.replace('#','')+'; opacity: 0.9; z-index: 2147483647; height: 55px; width: 290px; overflow-x: hidden; box-shadow: 7px 0px 9px #000; color: #fff; pointer-events:none;');
wrapperDiv.setAttribute('style','text-shadow: -1px -1px 0 #555, 1px -1px 0 #555, -1px 1px 0 #555, 1px 1px 0 #555; position: fixed; '+positionStyle+' background-color: #'+item.color.replace('#','')+'; opacity: 0.9; z-index: 2147483647; height: 55px; width: 290px; overflow-x: hidden; box-shadow: 7px 0px 9px #000; color: #fff; pointer-events: none; user-select: none;');

textDiv = document.createElement('div');
textDiv.id = 'chrome-envmarker-text';
Expand Down Expand Up @@ -164,4 +162,4 @@ _addEnvironmentLabel();
// detect dinamic URL update
window.onhashchange = function() {
_addEnvironmentLabel();
}
}