This commit is contained in:
end-4 2024-01-22 16:28:05 +07:00
parent dad5141472
commit 5ab9a16587
2 changed files with 4 additions and 4 deletions

View file

@ -4,7 +4,7 @@ import Widget from 'resource:///com/github/Aylur/ags/widget.js';
import * as Utils from 'resource:///com/github/Aylur/ags/utils.js'; import * as Utils from 'resource:///com/github/Aylur/ags/utils.js';
const { execAsync, exec } = Utils; const { execAsync, exec } = Utils;
import { searchItem } from './searchitem.js'; import { searchItem } from './searchitem.js';
import { execAndClose, startsWithNumber, launchCustomCommand } from './miscfunctions.js'; import { execAndClose, couldBeMath, launchCustomCommand } from './miscfunctions.js';
export const DirectoryButton = ({ parentPath, name, type, icon }) => { export const DirectoryButton = ({ parentPath, name, type, icon }) => {
const actionText = Widget.Revealer({ const actionText = Widget.Revealer({

View file

@ -5,7 +5,7 @@ import * as Utils from 'resource:///com/github/Aylur/ags/utils.js';
import Applications from 'resource:///com/github/Aylur/ags/service/applications.js'; import Applications from 'resource:///com/github/Aylur/ags/service/applications.js';
const { execAsync, exec } = Utils; const { execAsync, exec } = Utils;
import { execAndClose, expandTilde, hasUnterminatedBackslash, startsWithNumber, launchCustomCommand, ls } from './miscfunctions.js'; import { execAndClose, expandTilde, hasUnterminatedBackslash, couldBeMath, launchCustomCommand, ls } from './miscfunctions.js';
import { import {
CalculationResultButton, CustomCommandButton, DirectoryButton, CalculationResultButton, CustomCommandButton, DirectoryButton,
DesktopEntryButton, ExecuteCommandButton, SearchButton DesktopEntryButton, ExecuteCommandButton, SearchButton
@ -104,7 +104,7 @@ export const SearchAndWindows = () => {
const isAction = text.startsWith('>'); const isAction = text.startsWith('>');
const isDir = (['/', '~'].includes(entry.text[0])); const isDir = (['/', '~'].includes(entry.text[0]));
if (startsWithNumber(text)) { // Eval on typing is dangerous, this is a workaround if (couldBeMath(text)) { // Eval on typing is dangerous, this is a workaround
try { try {
const fullResult = eval(text); const fullResult = eval(text);
// copy // copy
@ -166,7 +166,7 @@ export const SearchAndWindows = () => {
_appSearchResults = Applications.query(text); _appSearchResults = Applications.query(text);
// Calculate // Calculate
if (startsWithNumber(text)) { // Eval on typing is dangerous; this is a small workaround. if (couldBeMath(text)) { // Eval on typing is dangerous; this is a small workaround.
try { try {
const fullResult = eval(text); const fullResult = eval(text);
resultsBox.add(CalculationResultButton({ result: fullResult, text: text })); resultsBox.add(CalculationResultButton({ result: fullResult, text: text }));