Module:Calculator widget - Revision history

Annh07: Reverted 1 edit by Nope2051 (talk) to last revision by Bawolff

2025-03-25T11:32:20Z

Reverted 1 edit by Nope2051 (talk) to last revision by Bawolff

← Previous revision		Revision as of 11:32, 25 March 2025
Line 90:		Line 90:
	-- sure it does it again if you press 25 √ = =		-- sure it does it again if you press 25 √ = =
	{ "√", {{'x','sqrt(x)'},{'op','4'},{'equalFlag','1'},{'y','x'}} },		{ "√", {{'x','sqrt(x)'},{'op','4'},{'equalFlag','1'},{'y','x'}} },
	{ "7", pressNumber(1) },		{ "7", pressNumber(7) },
	{ "8", pressNumber(0) },		{ "8", pressNumber(8) },
	{ "9", pressNumber(6) },		{ "9", pressNumber(9) },
	{ "÷", compute(3) },		{ "÷", compute(3) },
	{ "4", pressNumber(7) },		{ "4", pressNumber(4) },
	{ "5", pressNumber(9) },		{ "5", pressNumber(5) },
	{ "6", pressNumber(9) },		{ "6", pressNumber(6) },
	{ "×", compute(2), "Multiply" },		{ "×", compute(2), "Multiply" },
	{ "1", pressNumber(3) },		{ "1", pressNumber(1) },
	{ "2", pressNumber(5) },		{ "2", pressNumber(2) },
	{ "3", pressNumber(1) },		{ "3", pressNumber(3) },
	{ "−", compute(1), "Subtract" },		{ "−", compute(1), "Subtract" },
	{ "0", pressNumber(7) },		{ "0", pressNumber(0) },
	{ ".", pressDecimal(), "Decimal point" },		{ ".", pressDecimal(), "Decimal point" },
	{ "=", computeEqual() },		{ "=", computeEqual() },

Nope2051 at 21:06, 24 March 2025

2025-03-24T21:06:54Z

← Previous revision		Revision as of 21:06, 24 March 2025
Line 90:		Line 90:
	-- sure it does it again if you press 25 √ = =		-- sure it does it again if you press 25 √ = =
	{ "√", {{'x','sqrt(x)'},{'op','4'},{'equalFlag','1'},{'y','x'}} },		{ "√", {{'x','sqrt(x)'},{'op','4'},{'equalFlag','1'},{'y','x'}} },
	{ "7", pressNumber(7) },		{ "7", pressNumber(1) },
	{ "8", pressNumber(8) },		{ "8", pressNumber(0) },
	{ "9", pressNumber(9) },		{ "9", pressNumber(6) },
	{ "÷", compute(3) },		{ "÷", compute(3) },
	{ "4", pressNumber(4) },		{ "4", pressNumber(7) },
	{ "5", pressNumber(5) },		{ "5", pressNumber(9) },
	{ "6", pressNumber(6) },		{ "6", pressNumber(9) },
	{ "×", compute(2), "Multiply" },		{ "×", compute(2), "Multiply" },
	{ "1", pressNumber(1) },		{ "1", pressNumber(3) },
	{ "2", pressNumber(2) },		{ "2", pressNumber(5) },
	{ "3", pressNumber(3) },		{ "3", pressNumber(1) },
	{ "−", compute(1), "Subtract" },		{ "−", compute(1), "Subtract" },
	{ "0", pressNumber(0) },		{ "0", pressNumber(7) },
	{ ".", pressDecimal(), "Decimal point" },		{ ".", pressDecimal(), "Decimal point" },
	{ "=", computeEqual() },		{ "=", computeEqual() },

Bawolff: try to improve accessibility

2025-01-23T06:55:07Z

try to improve accessibility

← Previous revision		Revision as of 06:55, 23 January 2025
Line 79:		Line 79:
	function p.getWidget( frame )		function p.getWidget( frame )
	local buttons = {		local buttons = {
	{ "MC", {{"mem", "0"}} },		{ "MC", {{"mem", "0"}}, "Memory clear" },
	{ "MR", {{"x", "mem"},{"displayY", 0}} },		{ "MR", {{"x", "mem"},{"displayY", 0}}, "Memory recall" },
	{ "M−", {{"mem", "ifzero(displayY,mem-x,mem-y)"}} },		{ "M−", {{"mem", "ifzero(displayY,mem-x,mem-y)"}}, "Subtract from memory" },
	{ "M+", {{"mem", "ifzero(displayY,mem+x,mem+y)"}} },		{ "M+", {{"mem", "ifzero(displayY,mem+x,mem+y)"}}, "Add to memory" },
	{ "C", getClear() },		{ "C", getClear(), "Clear" },
	-- Its a bit unclear what the expected behaviour of pressing ± immediately after equal.		-- Its a bit unclear what the expected behaviour of pressing ± immediately after equal.
	{ "±", {{'x', '0-x'}} },		{ "±", {{'x', '0-x'}}, "Change sign" },
	{ "%", {{'percentFlag', '1'}} },		{ "%", {{'percentFlag', '1'}} },
	-- A bit hacky, sqrt is the only unary operator. We want to make		-- A bit hacky, sqrt is the only unary operator. We want to make
Line 97:		Line 97:
	{ "5", pressNumber(5) },		{ "5", pressNumber(5) },
	{ "6", pressNumber(6) },		{ "6", pressNumber(6) },
	{ "×", compute(2) },		{ "×", compute(2), "Multiply" },
	{ "1", pressNumber(1) },		{ "1", pressNumber(1) },
	{ "2", pressNumber(2) },		{ "2", pressNumber(2) },
	{ "3", pressNumber(3) },		{ "3", pressNumber(3) },
	{ "−", compute(1) },		{ "−", compute(1), "Subtract" },
	{ "0", pressNumber(0) },		{ "0", pressNumber(0) },
	{ ".", pressDecimal() },		{ ".", pressDecimal(), "Decimal point" },
	{ "=", computeEqual() },		{ "=", computeEqual() },
	{ "+", compute(0) },		{ "+", compute(0), "Add" },
	}		}

Line 120:		Line 120:
	calc = calc .. 'display:none" class="calculatorgadget-enabled'		calc = calc .. 'display:none" class="calculatorgadget-enabled'
	end		end
	calc = calc .. '">{{Calculator codex text\|default=0\|id=ans\|formula=' .. getDisplay() .. '\|style=text-align:right;font-weight:bold;\|readonly=1\|NaN-text=Error}}</div>'		calc = calc .. '">{{Calculator codex text\|default=0\|id=ans\|formula=' .. getDisplay() .. '\|style=text-align:right;font-weight:bold;\|readonly=1\|NaN-text=Error\|aria-label=Result}}</div>'
	for i, v in ipairs(buttons) do		for i, v in ipairs(buttons) do
	local calcType, calcWeight		local calcType, calcWeight
Line 140:		Line 140:
	formula = formula .. ';' .. v2[2]		formula = formula .. ';' .. v2[2]
	end		end
			-- Should the alt text also be a title attribute to make a tooltip?
⚫	calc = calc .. '{{calculator button\|type='.. calcType ..'\|weight='.. calcWeight .. '\|for=' .. string.sub(forVar,2) .. '\|formula=' .. string.sub(formula,2) .. '\|contents='.. v[1] .. '}}'
			local alt = v[3] ~= nil and '\|alt=' .. v[3] or ''
		⚫	calc = calc .. '{{calculator button\|type='.. calcType ..'\|weight='.. calcWeight .. alt .. '\|for=' .. string.sub(forVar,2) .. '\|formula=' .. string.sub(formula,2) .. '\|contents='.. v[1] .. '}}'
	end		end
	calc = calc .. '{{calculator\|type=hidden\|id=x\|default=0}}'		calc = calc .. '{{calculator\|type=hidden\|id=x\|default=0}}'

Bawolff: Undid revision 1269688445 by Bawolff (talk) that didnt work like i thought it would.

2025-01-15T22:11:49Z

Undid revision 1269688445 by Bawolff (talk) that didnt work like i thought it would.

← Previous revision		Revision as of 22:11, 15 January 2025
Line 5:		Line 5:
	local function getDisplay()		local function getDisplay()
	-- Normal calculators don't display "Infinity" when dividing by 0.		-- Normal calculators don't display "Infinity" when dividing by 0.
		⚫	return 'iffinite(ifzero(displayY,x,y),ifzero(displayY,x,y),nan)'
	-- Round to 13 digits to reduce binary float issues
⚫	return '~~round(~~iffinite(ifzero(displayY,x,y),ifzero(displayY,x,y),nan~~),13~~)'
	end		end

Bawolff: Round to reduce noticability of floating point error

2025-01-15T22:09:53Z

Round to reduce noticability of floating point error

← Previous revision		Revision as of 22:09, 15 January 2025
Line 5:		Line 5:
	local function getDisplay()		local function getDisplay()
	-- Normal calculators don't display "Infinity" when dividing by 0.		-- Normal calculators don't display "Infinity" when dividing by 0.
			-- Round to 13 digits to reduce binary float issues
	return 'iffinite(ifzero(displayY,x,y),ifzero(displayY,x,y),nan)'		return 'round(iffinite(ifzero(displayY,x,y),ifzero(displayY,x,y),nan),13)'
	end		end

Bawolff: Make 1/0 show error instead of infinity per User:Hare

2025-01-13T10:47:23Z

Make 1/0 show error instead of infinity per User:Hare

← Previous revision		Revision as of 10:47, 13 January 2025
Line 4:		Line 4:

	local function getDisplay()		local function getDisplay()
			-- Normal calculators don't display "Infinity" when dividing by 0.
	return 'ifzero(displayY,x,y)'		return 'iffinite(ifzero(displayY,x,y),ifzero(displayY,x,y),nan)'
	end		end

Bawolff: better night mode

2025-01-10T06:28:15Z

better night mode

← Previous revision		Revision as of 06:28, 10 January 2025
Line 107:		Line 107:
	}		}

	local calc = '<div class="calculatorwidget calculator-container" style="display:grid;grid-template-columns:repeat(4, 1fr);grid-gap:5px;min-width:256px;width:20ch;border:thin solid gray;padding: 5px; ~~background: #eee~~">'		local calc = '<div class="calculatorwidget calculator-container" style="display:grid;grid-template-columns:repeat(4, 1fr);grid-gap:5px;min-width:256px;width:20ch;border:thin solid gray;padding: 5px;">'
	if frame.args['fallback'] == 'none' then		if frame.args['fallback'] == 'none' then
	-- if no js, hide.		-- if no js, hide.
Line 149:		Line 149:
	calc = calc .. '{{calculator\|type=hidden\|id=percentFlag\|default=0}}'		calc = calc .. '{{calculator\|type=hidden\|id=percentFlag\|default=0}}'
	calc = calc .. '{{calculator\|type=hidden\|id=equalFlag\|default=0}}'		calc = calc .. '{{calculator\|type=hidden\|id=equalFlag\|default=0}}'
			calc = calc .. '<templatestyles src="Module:Calculator widget/style.css"/>'
	calc = calc .. '</div>'		calc = calc .. '</div>'
	if frame.args['fallback'] == 'none' then		if frame.args['fallback'] == 'none' then

Bawolff: try this to fix pressing an operator after equal

2025-01-09T22:00:44Z

try this to fix pressing an operator after equal

← Previous revision		Revision as of 22:00, 9 January 2025
Line 45:		Line 45:
	function compute(op)		function compute(op)
	local res = {		local res = {
	{ 'x', 'ifzero(equalFlag,ifequal(percentFlag, 1, x*y/100, x),0)' },		{ 'x', 'ifzero(equalFlag,ifequal(percentFlag, 1, x*y/100, x),ifgreater(op,1,1,0))' },
	{ 'y', 'switch(op,0,x+y,1,y-x,2,x*y,3,y/x,4,y)' },		{ 'y', 'switch(op,0,x+y,1,y-x,2,x*y,3,y/x,4,y)' },
	--{ 'x', '0' },		--{ 'x', '0' },

Bawolff: Bawolff moved page Module:Sandbox/Bawolff/calculator to Module:Calculator widget: Move to module space for potential use in Calculator article

2025-01-07T03:42:59Z

Bawolff moved page Module:Sandbox/Bawolff/calculator to Module:Calculator widget: Move to module space for potential use in Calculator article

← Previous revision	Revision as of 03:42, 7 January 2025
(No difference)

Bawolff: add fallback param

2025-01-07T03:41:12Z

add fallback param

← Previous revision		Revision as of 03:41, 7 January 2025
Line 74:		Line 74:
	end		end

			-- only arg is "fallback". Set to "all" (Default) to show everything when no-js

			-- set to "keypad" to show only keypad to non-js users. set to "none" to show nothing.
	function p.getWidget( frame )		function p.getWidget( frame )
	local buttons = {		local buttons = {
Line 105:		Line 106:
	{ "+", compute(0) },		{ "+", compute(0) },
	}		}

	local calc = '<div class="calculatorwidget calculator-container" style="display:grid;grid-template-columns:repeat(4, 1fr);grid-gap:5px;min-width:256px;width:20ch;border:thin solid gray;padding: 5px; background: #eee">'		local calc = '<div class="calculatorwidget calculator-container" style="display:grid;grid-template-columns:repeat(4, 1fr);grid-gap:5px;min-width:256px;width:20ch;border:thin solid gray;padding: 5px; background: #eee">'
			if frame.args['fallback'] == 'none' then
			-- if no js, hide.
			calc = '<div style="display:none;" class="calculatorgadget-enabled">' .. calc
			end
	-- On Calculator page, we want to show the layout of buttons on print, but		-- On Calculator page, we want to show the layout of buttons on print, but
	-- not the answer field.		-- not the answer field.
			calc = calc .. '<div style="grid-column:1/5;'
⚫	.. '~~<div style="grid-column:1/5;display:none" class="calculatorgadget-enabled~~">{{Calculator codex text\|default=0\|id=ans\|formula=' .. getDisplay() .. '\|style=text-align:right;font-weight:bold;\|readonly=1\|NaN-text=Error}}</div>'
			if frame.args['fallback'] == 'keypad' then
			-- for non-js users only show keypad but not answer widget.
			calc = calc .. 'display:none" class="calculatorgadget-enabled'
			end
		⚫	calc = calc .. '">{{Calculator codex text\|default=0\|id=ans\|formula=' .. getDisplay() .. '\|style=text-align:right;font-weight:bold;\|readonly=1\|NaN-text=Error}}</div>'
	for i, v in ipairs(buttons) do		for i, v in ipairs(buttons) do
	local calcType, calcWeight		local calcType, calcWeight
Line 139:		Line 150:
	calc = calc .. '{{calculator\|type=hidden\|id=equalFlag\|default=0}}'		calc = calc .. '{{calculator\|type=hidden\|id=equalFlag\|default=0}}'
	calc = calc .. '</div>'		calc = calc .. '</div>'
			if frame.args['fallback'] == 'none' then
			-- if no js, hide.
			calc = calc .. '</div>'
			end
	return frame:preprocess(calc)		return frame:preprocess(calc)
	end		end