mirror of
https://github.com/gorhill/uMatrix.git
synced 2024-06-27 02:20:50 +12:00
another check for #1
This commit is contained in:
parent
1743f198e5
commit
0c6d0b3a98
|
@ -41,16 +41,16 @@ function changeUserSettings(name, value) {
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
function onChangeValueHandler(elem, setting, min, max) {
|
function onChangeValueHandler(uelem, setting, min, max) {
|
||||||
var oldVal = cachedUserSettings[setting];
|
var oldVal = cachedUserSettings[setting];
|
||||||
var newVal = Math.round(parseFloat(elem.val()));
|
var newVal = Math.round(parseFloat(uelem.val()));
|
||||||
if ( typeof newVal !== 'number' ) {
|
if ( typeof newVal !== 'number' ) {
|
||||||
newVal = oldVal;
|
newVal = oldVal;
|
||||||
} else {
|
} else {
|
||||||
newVal = Math.max(newVal, min);
|
newVal = Math.max(newVal, min);
|
||||||
newVal = Math.min(newVal, max);
|
newVal = Math.min(newVal, max);
|
||||||
}
|
}
|
||||||
elem.val(newVal);
|
uelem.val(newVal);
|
||||||
if ( newVal !== oldVal ) {
|
if ( newVal !== oldVal ) {
|
||||||
changeUserSettings(setting, newVal);
|
changeUserSettings(setting, newVal);
|
||||||
}
|
}
|
||||||
|
@ -59,70 +59,70 @@ function onChangeValueHandler(elem, setting, min, max) {
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
function prepareToDie() {
|
function prepareToDie() {
|
||||||
onChangeValueHandler($('#delete-unused-session-cookies-after'), 'deleteUnusedSessionCookiesAfter', 15, 1440);
|
onChangeValueHandler(uDom('#delete-unused-session-cookies-after'), 'deleteUnusedSessionCookiesAfter', 15, 1440);
|
||||||
onChangeValueHandler($('#clear-browser-cache-after'), 'clearBrowserCacheAfter', 15, 1440);
|
onChangeValueHandler(uDom('#clear-browser-cache-after'), 'clearBrowserCacheAfter', 15, 1440);
|
||||||
onChangeValueHandler($('#spoof-user-agent-every'), 'spoofUserAgentEvery', 2, 999);
|
onChangeValueHandler(uDom('#spoof-user-agent-every'), 'spoofUserAgentEvery', 2, 999);
|
||||||
}
|
}
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
var installEventHandlers = function() {
|
var installEventHandlers = function() {
|
||||||
$('#delete-unused-session-cookies').on('change', function(){
|
uDom('#delete-unused-session-cookies').on('change', function(){
|
||||||
changeUserSettings('deleteUnusedSessionCookies', $(this).is(':checked'));
|
changeUserSettings('deleteUnusedSessionCookies', this.checked);
|
||||||
});
|
});
|
||||||
$('#delete-unused-session-cookies-after').on('change', function(){
|
uDom('#delete-unused-session-cookies-after').on('change', function(){
|
||||||
onChangeValueHandler($(this), 'deleteUnusedSessionCookiesAfter', 15, 1440);
|
onChangeValueHandler(uDom(this), 'deleteUnusedSessionCookiesAfter', 15, 1440);
|
||||||
});
|
});
|
||||||
$('#delete-blacklisted-cookies').on('change', function(){
|
uDom('#delete-blacklisted-cookies').on('change', function(){
|
||||||
changeUserSettings('deleteCookies', $(this).is(':checked'));
|
changeUserSettings('deleteCookies', this.checked);
|
||||||
});
|
});
|
||||||
$('#delete-blacklisted-localstorage').on('change', function(){
|
uDom('#delete-blacklisted-localstorage').on('change', function(){
|
||||||
changeUserSettings('deleteLocalStorage', $(this).is(':checked'));
|
changeUserSettings('deleteLocalStorage', this.checked);
|
||||||
});
|
});
|
||||||
$('#clear-browser-cache').on('change', function(){
|
uDom('#clear-browser-cache').on('change', function(){
|
||||||
changeUserSettings('clearBrowserCache', $(this).is(':checked'));
|
changeUserSettings('clearBrowserCache', this.checked);
|
||||||
});
|
});
|
||||||
$('#clear-browser-cache-after').on('change', function(){
|
uDom('#clear-browser-cache-after').on('change', function(){
|
||||||
onChangeValueHandler($(this), 'clearBrowserCacheAfter', 15, 1440);
|
onChangeValueHandler(uDom(this), 'clearBrowserCacheAfter', 15, 1440);
|
||||||
});
|
});
|
||||||
$('#process-referer').on('change', function(){
|
uDom('#process-referer').on('change', function(){
|
||||||
changeUserSettings('processReferer', $(this).is(':checked'));
|
changeUserSettings('processReferer', this.checked);
|
||||||
});
|
});
|
||||||
$('#process-hyperlink-auditing').on('change', function(){
|
uDom('#process-hyperlink-auditing').on('change', function(){
|
||||||
changeUserSettings('processHyperlinkAuditing', $(this).is(':checked'));
|
changeUserSettings('processHyperlinkAuditing', this.checked);
|
||||||
});
|
});
|
||||||
$('#spoof-user-agent').on('change', function(){
|
uDom('#spoof-user-agent').on('change', function(){
|
||||||
changeUserSettings('spoofUserAgent', $(this).is(':checked'));
|
changeUserSettings('spoofUserAgent', this.checked);
|
||||||
});
|
});
|
||||||
$('#spoof-user-agent-every').on('change', function(){
|
uDom('#spoof-user-agent-every').on('change', function(){
|
||||||
onChangeValueHandler($(this), 'spoofUserAgentEvery', 2, 999);
|
onChangeValueHandler(uDom(this), 'spoofUserAgentEvery', 2, 999);
|
||||||
});
|
});
|
||||||
$('#spoof-user-agent-with').on('change', function(){
|
uDom('#spoof-user-agent-with').on('change', function(){
|
||||||
changeUserSettings('spoofUserAgentWith', $(this).val());
|
changeUserSettings('spoofUserAgentWith', uDom(this).val());
|
||||||
});
|
});
|
||||||
|
|
||||||
// https://github.com/gorhill/httpswitchboard/issues/197
|
// https://github.com/gorhill/httpswitchboard/issues/197
|
||||||
$(window).one('beforeunload', prepareToDie);
|
uDom(window).on('beforeunload', prepareToDie);
|
||||||
};
|
};
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
$(function() {
|
uDom.onLoad(function() {
|
||||||
var onUserSettingsReceived = function(userSettings) {
|
var onUserSettingsReceived = function(userSettings) {
|
||||||
// Cache copy
|
// Cache copy
|
||||||
cachedUserSettings = userSettings;
|
cachedUserSettings = userSettings;
|
||||||
|
|
||||||
$('#delete-unused-session-cookies').attr('checked', userSettings.deleteUnusedSessionCookies === true);
|
uDom('#delete-unused-session-cookies').prop('checked', userSettings.deleteUnusedSessionCookies === true);
|
||||||
$('#delete-unused-session-cookies-after').val(userSettings.deleteUnusedSessionCookiesAfter);
|
uDom('#delete-unused-session-cookies-after').val(userSettings.deleteUnusedSessionCookiesAfter);
|
||||||
$('#delete-blacklisted-cookies').attr('checked', userSettings.deleteCookies === true);
|
uDom('#delete-blacklisted-cookies').prop('checked', userSettings.deleteCookies === true);
|
||||||
$('#delete-blacklisted-localstorage').attr('checked', userSettings.deleteLocalStorage);
|
uDom('#delete-blacklisted-localstorage').prop('checked', userSettings.deleteLocalStorage);
|
||||||
$('#clear-browser-cache').attr('checked', userSettings.clearBrowserCache === true);
|
uDom('#clear-browser-cache').prop('checked', userSettings.clearBrowserCache === true);
|
||||||
$('#clear-browser-cache-after').val(userSettings.clearBrowserCacheAfter);
|
uDom('#clear-browser-cache-after').val(userSettings.clearBrowserCacheAfter);
|
||||||
$('#process-referer').attr('checked', userSettings.processReferer);
|
uDom('#process-referer').prop('checked', userSettings.processReferer);
|
||||||
$('#process-hyperlink-auditing').attr('checked', userSettings.processHyperlinkAuditing);
|
uDom('#process-hyperlink-auditing').prop('checked', userSettings.processHyperlinkAuditing);
|
||||||
$('#spoof-user-agent').attr('checked', userSettings.spoofUserAgent);
|
uDom('#spoof-user-agent').prop('checked', userSettings.spoofUserAgent);
|
||||||
$('#spoof-user-agent-every').val(userSettings.spoofUserAgentEvery);
|
uDom('#spoof-user-agent-every').val(userSettings.spoofUserAgentEvery);
|
||||||
$('#spoof-user-agent-with').val(userSettings.spoofUserAgentWith);
|
uDom('#spoof-user-agent-with').val(userSettings.spoofUserAgentWith);
|
||||||
|
|
||||||
installEventHandlers();
|
installEventHandlers();
|
||||||
};
|
};
|
||||||
|
|
|
@ -94,7 +94,6 @@ ul > li {
|
||||||
<p class="para" data-i18n="privacyProcessBehindTheSceneHelp"></p>
|
<p class="para" data-i18n="privacyProcessBehindTheSceneHelp"></p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="lib/jquery-2.min.js"></script>
|
|
||||||
<script src="js/udom.js"></script>
|
<script src="js/udom.js"></script>
|
||||||
<script src="js/i18n.js"></script>
|
<script src="js/i18n.js"></script>
|
||||||
<script src="js/dashboard-common.js"></script>
|
<script src="js/dashboard-common.js"></script>
|
||||||
|
|
Loading…
Reference in a new issue