Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 2 additions & 7 deletions src/options/options.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="res/options.css" type="text/css">
<link rel="stylesheet" href="../thirdparty/pratikabu-simple-slider.css" type="text/css">
<link rel="stylesheet" href="../pratikabu-stt.css" type="text/css">
<script type="text/javascript" src="../thirdparty/jquery-3.7.1.min.js"></script>
<script type="text/javascript" src="../thirdparty/pratikabu-simple-slider.js"></script>
<script type="text/javascript" src="res/options.js"></script>
</head>
<body>
Expand Down Expand Up @@ -69,9 +67,7 @@
<div class="settinggroup">
<div class="settinglabel">Scrolling Speed :</div>
<div class="settingoptions">
<input type="text" id="scrollSpeedSliderId"
data-slider="true" data-slider-range="100,2600" data-slider-step="100"
data-slider-highlight="true" data-slider-snap="true" />
<input type="range" id="scrollSpeedSliderId" class="slider" min="100" max="2600" step="100" />
<span id="currentSpeed" style="font-size: 11px; margin-left: 10px; vertical-align: middle;"></span>
</div>
</div>
Expand Down Expand Up @@ -115,8 +111,7 @@
<div class="advancedProp settinggroup">
<div class="settinglabel">Transparency :</div>
<div class="settingoptions">
<input type="text" id="transparencySliderId"
data-slider="true" data-slider-range="0.1,0.9" data-slider-highlight="true" />
<input type="range" id="transparencySliderId" class="slider" min="0.1" max="0.9" step="0.01" />
<img class="blackAndWhiteCSS" style="vertical-align: middle; margin-left: 20px;" id="transparencyImgId" src="../icons/pratikabu-stt-32-1.png" />
</div>
</div>
Expand Down
20 changes: 9 additions & 11 deletions src/options/res/options.css
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,6 @@ a.mylink {
display: none;
} */

[class^=slider] {
display: inline-block;
vertical-align: middle;
}

body {
background-color: rgba(155, 155, 155, 0.2);
margin: 79.5px 0 0 0; /* This margin is the height of the header section */
Expand Down Expand Up @@ -213,6 +208,13 @@ hr {
text-decoration: none;
}

.slider {
width: 300px;
display: inline-block;
vertical-align: middle;
}


@media screen and (max-width: 750px) {
.mainContentWidth {
width: 600px;
Expand All @@ -222,7 +224,7 @@ hr {
width: 30%;
}

#scrollSpeedSliderId-slider {
.slider {
width: 280px;
}

Expand Down Expand Up @@ -257,18 +259,14 @@ hr {
margin-top: 10px;
}

#scrollSpeedSliderId-slider {
.slider {
width: 140px;
}

#currentSpeed {
margin-left: 0px !important;
}

#transparencySliderId-slider {
width: 190px;
}

#transparencyImgId {
margin-left: 0px !important;
}
Expand Down
24 changes: 13 additions & 11 deletions src/options/res/options.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ function loadValueInSpeedSlider(initialValue) {
}
initialValue = MAX_SPEED - initialValue;
populateSliderSpeedOnText(initialValue);
$("#scrollSpeedSliderId").simpleSlider("setValue", initialValue);
$("#scrollSpeedSliderId").val(initialValue);
}


Expand All @@ -186,7 +186,7 @@ function updateTransparency(transparency) {

function loadValueInTransparencySlider(transparency) {
updateTransparency(transparency);
$("#transparencySliderId").simpleSlider("setValue", transparency);
$("#transparencySliderId").val(transparency);
}

function selectableRadioContent(id, name, value) {
Expand Down Expand Up @@ -513,23 +513,25 @@ function psInitJavascriptFunctions() {
// common settings starts
$('input:radio[name=imgVerticalLocation]').change(function() { isRightChangedEvent("imgVerticalLocation", $(this).val()); });
$('input:radio[name=imgHorizontalLocation]').change(function() { isRightChangedEvent("imgHorizontalLocation", $(this).val()); });
$("#scrollSpeedSliderId").bind("slider:changed", function(event, data) {
populateSliderSpeedOnText(data.value);
var speedVal = MAX_SPEED - data.value;
if(MIN_SPEED === speedVal) {
$("#scrollSpeedSliderId").on("input change", function() {
var value = parseInt($(this).val(), 10);
populateSliderSpeedOnText(value);
var speedVal = MAX_SPEED - value;
if (MIN_SPEED === speedVal) {
speedVal = 0;
}
globalScrollSpeed = speedVal;
});
$("#scrollSpeedSliderId").bind("slider:postChangeComplete", function(event) {
$("#scrollSpeedSliderId").on("change", function() {
save_options();
});
$('input:radio[name=visbilityBehavior]').change(function() { isRightChangedEvent("visbilityBehavior", $(this).val()); });
$("#transparencySliderId").bind("slider:changed", function(event, data) {
updateTransparency(data.value);
globalTransparency = data.value;
$("#transparencySliderId").on("input change", function() {
var value = parseFloat($(this).val());
updateTransparency(value);
globalTransparency = value;
});
$("#transparencySliderId").bind("slider:postChangeComplete", function(event) {
$("#transparencySliderId").on("change", function() {
save_options();
});
$("#transparencyImgId").hover(
Expand Down
55 changes: 0 additions & 55 deletions src/thirdparty/pratikabu-simple-slider.css

This file was deleted.

Loading