Skip to content

Commit

Permalink
Merge pull request #15 from marcominerva/develop
Browse files Browse the repository at this point in the history
Libraries update
  • Loading branch information
marcominerva authored Jul 12, 2023
2 parents bd5329c + c845176 commit fb05c76
Show file tree
Hide file tree
Showing 16 changed files with 176 additions and 93 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ChatGptNet" Version="2.0.16" />
<PackageReference Include="DallENet" Version="1.0.8" />
<PackageReference Include="ChatGptNet" Version="2.1.9" />
<PackageReference Include="DallENet" Version="1.0.9" />
<PackageReference Include="OperationResultTools" Version="1.0.12" />
<PackageReference Include="Polly" Version="7.2.4" />
<PackageReference Include="TinyHelpers" Version="2.0.31" />
<PackageReference Include="TinyHelpers" Version="2.0.35" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/RandomPhotos/RandomPhotos.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@

<ItemGroup>
<PackageReference Include="LigerShark.WebOptimizer.Core" Version="3.0.384" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.7" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.9" />
<PackageReference Include="MinimalHelpers.OpenApi" Version="1.0.4" />
<PackageReference Include="MinimalHelpers.Routing" Version="1.0.17" />
<PackageReference Include="OperationResultTools.AspNetCore.Http" Version="1.0.14" />
<PackageReference Include="Scrutor" Version="4.2.2" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="TinyHelpers.AspNetCore" Version="2.0.20" />
<PackageReference Include="TinyHelpers.AspNetCore" Version="2.0.23" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/RandomPhotos/libman.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
"destination": "wwwroot/lib/jquery"
},
{
"library": "alpinejs@3.12.2",
"library": "alpinejs@3.12.3",
"destination": "wwwroot/lib/alpinejs"
},
{
"library": "photoswipe@5.3.7",
"library": "photoswipe@5.3.8",
"destination": "wwwroot/lib/photoswipe"
},
{
Expand Down
74 changes: 51 additions & 23 deletions src/RandomPhotos/wwwroot/lib/alpinejs/cdn.js
Original file line number Diff line number Diff line change
Expand Up @@ -432,8 +432,9 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
function dontAutoEvaluateFunctions(callback) {
let cache = shouldAutoEvaluateFunctions;
shouldAutoEvaluateFunctions = false;
callback();
let result = callback();
shouldAutoEvaluateFunctions = cache;
return result;
}
function evaluate(el, expression, extras = {}) {
let result;
Expand Down Expand Up @@ -601,15 +602,15 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
function getDirectiveHandler(el, directive2) {
let noop = () => {
};
let handler3 = directiveHandlers[directive2.type] || noop;
let handler4 = directiveHandlers[directive2.type] || noop;
let [utilities, cleanup2] = getElementBoundUtilities(el);
onAttributeRemoved(el, directive2.original, cleanup2);
let fullHandler = () => {
if (el._x_ignore || el._x_ignoreSelf)
return;
handler3.inline && handler3.inline(el, directive2, utilities);
handler3 = handler3.bind(handler3, el, directive2, utilities);
isDeferringHandlers ? directiveHandlerStacks.get(currentHandlerStackKey).push(handler3) : handler3();
handler4.inline && handler4.inline(el, directive2, utilities);
handler4 = handler4.bind(handler4, el, directive2, utilities);
isDeferringHandlers ? directiveHandlerStacks.get(currentHandlerStackKey).push(handler4) : handler4();
};
fullHandler.runCleanups = cleanup2;
return fullHandler;
Expand Down Expand Up @@ -1363,6 +1364,21 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
function getBinding(el, name, fallback) {
if (el._x_bindings && el._x_bindings[name] !== void 0)
return el._x_bindings[name];
return getAttributeBinding(el, name, fallback);
}
function extractProp(el, name, fallback, extract = true) {
if (el._x_bindings && el._x_bindings[name] !== void 0)
return el._x_bindings[name];
if (el._x_inlineBindings && el._x_inlineBindings[name] !== void 0) {
let binding = el._x_inlineBindings[name];
binding.extract = extract;
return dontAutoEvaluateFunctions(() => {
return evaluate(el, binding.expression);
});
}
return getAttributeBinding(el, name, fallback);
}
function getAttributeBinding(el, name, fallback) {
let attr = el.getAttribute(name);
if (attr === null)
return typeof fallback === "function" ? fallback() : fallback;
Expand Down Expand Up @@ -1504,7 +1520,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
get raw() {
return raw;
},
version: "3.12.2",
version: "3.12.3",
flushAndStopDeferringMutations,
dontAutoEvaluateFunctions,
disableEffectScheduling,
Expand All @@ -1523,6 +1539,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
interceptInit,
setEvaluator,
mergeProxies,
extractProp,
findClosest,
closestRoot,
destroyTree,
Expand Down Expand Up @@ -2446,7 +2463,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
// packages/alpinejs/src/utils/on.js
function on(el, event, modifiers, callback) {
let listenerTarget = el;
let handler3 = (e) => callback(e);
let handler4 = (e) => callback(e);
let options = {};
let wrapHandler = (callback2, wrapper) => (e) => wrapper(callback2, e);
if (modifiers.includes("dot"))
Expand All @@ -2464,30 +2481,30 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
if (modifiers.includes("debounce")) {
let nextModifier = modifiers[modifiers.indexOf("debounce") + 1] || "invalid-wait";
let wait = isNumeric(nextModifier.split("ms")[0]) ? Number(nextModifier.split("ms")[0]) : 250;
handler3 = debounce(handler3, wait);
handler4 = debounce(handler4, wait);
}
if (modifiers.includes("throttle")) {
let nextModifier = modifiers[modifiers.indexOf("throttle") + 1] || "invalid-wait";
let wait = isNumeric(nextModifier.split("ms")[0]) ? Number(nextModifier.split("ms")[0]) : 250;
handler3 = throttle(handler3, wait);
handler4 = throttle(handler4, wait);
}
if (modifiers.includes("prevent"))
handler3 = wrapHandler(handler3, (next, e) => {
handler4 = wrapHandler(handler4, (next, e) => {
e.preventDefault();
next(e);
});
if (modifiers.includes("stop"))
handler3 = wrapHandler(handler3, (next, e) => {
handler4 = wrapHandler(handler4, (next, e) => {
e.stopPropagation();
next(e);
});
if (modifiers.includes("self"))
handler3 = wrapHandler(handler3, (next, e) => {
handler4 = wrapHandler(handler4, (next, e) => {
e.target === el && next(e);
});
if (modifiers.includes("away") || modifiers.includes("outside")) {
listenerTarget = document;
handler3 = wrapHandler(handler3, (next, e) => {
handler4 = wrapHandler(handler4, (next, e) => {
if (el.contains(e.target))
return;
if (e.target.isConnected === false)
Expand All @@ -2500,22 +2517,22 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
});
}
if (modifiers.includes("once")) {
handler3 = wrapHandler(handler3, (next, e) => {
handler4 = wrapHandler(handler4, (next, e) => {
next(e);
listenerTarget.removeEventListener(event, handler3, options);
listenerTarget.removeEventListener(event, handler4, options);
});
}
handler3 = wrapHandler(handler3, (next, e) => {
handler4 = wrapHandler(handler4, (next, e) => {
if (isKeyEvent(event)) {
if (isListeningForASpecificKeyThatHasntBeenPressed(e, modifiers)) {
return;
}
}
next(e);
});
listenerTarget.addEventListener(event, handler3, options);
listenerTarget.addEventListener(event, handler4, options);
return () => {
listenerTarget.removeEventListener(event, handler3, options);
listenerTarget.removeEventListener(event, handler4, options);
};
}
function dotSyntax(subject) {
Expand Down Expand Up @@ -2753,7 +2770,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);

// packages/alpinejs/src/directives/x-bind.js
mapAttributes(startingWith(":", into(prefix("bind:"))));
directive("bind", (el, {value, modifiers, expression, original}, {effect: effect3}) => {
var handler2 = (el, {value, modifiers, expression, original}, {effect: effect3}) => {
if (!value) {
let bindingProviders = {};
injectBindingProviders(bindingProviders);
Expand All @@ -2765,14 +2782,25 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
}
if (value === "key")
return storeKeyForXFor(el, expression);
if (el._x_inlineBindings && el._x_inlineBindings[value] && el._x_inlineBindings[value].extract) {
return;
}
let evaluate2 = evaluateLater(el, expression);
effect3(() => evaluate2((result) => {
if (result === void 0 && typeof expression === "string" && expression.match(/\./)) {
result = "";
}
mutateDom(() => bind(el, value, result, modifiers));
}));
});
};
handler2.inline = (el, {value, modifiers, expression}) => {
if (!value)
return;
if (!el._x_inlineBindings)
el._x_inlineBindings = {};
el._x_inlineBindings[value] = {expression, extract: false};
};
directive("bind", handler2);
function storeKeyForXFor(el, expression) {
el._x_keyExpression = expression;
}
Expand Down Expand Up @@ -3019,16 +3047,16 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
}

// packages/alpinejs/src/directives/x-ref.js
function handler2() {
function handler3() {
}
handler2.inline = (el, {expression}, {cleanup: cleanup2}) => {
handler3.inline = (el, {expression}, {cleanup: cleanup2}) => {
let root = closestRoot(el);
if (!root._x_refs)
root._x_refs = {};
root._x_refs[expression] = el;
cleanup2(() => delete root._x_refs[expression]);
};
directive("ref", handler2);
directive("ref", handler3);

// packages/alpinejs/src/directives/x-if.js
directive("if", (el, {expression}, {effect: effect3, cleanup: cleanup2}) => {
Expand Down
4 changes: 2 additions & 2 deletions src/RandomPhotos/wwwroot/lib/alpinejs/cdn.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit fb05c76

Please sign in to comment.