Skip to content

Commit b9e7123

Browse files
committed
Make fixed factor optional
1 parent d49a49e commit b9e7123

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

www/mappingScreen.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,12 @@ setupMapping = function(mappingType) {
4848
setupArrows();
4949
setupFactorMenu(dynamicFactors);
5050

51-
var xFixed = canvasStyle.xFixedFactor[factors.fixedPosition];
52-
var yFixed = canvasStyle.yFixedFactor;
51+
if (fixedFactor != "") {
52+
var xFixed = canvasStyle.xFixedFactor[factors.fixedPosition];
53+
var yFixed = canvasStyle.yFixedFactor;
5354

54-
drawFactorIcon(fixedFactor, xFixed, yFixed, true);
55+
drawFactorIcon(fixedFactor, xFixed, yFixed, true);
56+
}
5557

5658
// Setup buttons
5759
var halfButton = canvasStyle.buttonSize / 2;

www/settingsScreen.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ factorRow = function(factorKey, used, defaultName, defaultImg, defaultAudio) {
158158
listFactors = function(mappingType) {
159159

160160
var fixedFactorElement = document.getElementById("fixed-factor-" + mappingType);
161-
populateSelection(fixedFactorElement, "images", settings.factors[mappingType].fixed, false);
161+
populateSelection(fixedFactorElement, "images", settings.factors[mappingType].fixed, true);
162162

163163
var factorTable = document.getElementById("factor-media-" + mappingType);
164164
for (var factorKey in settings.factorMedia){

0 commit comments

Comments
 (0)