@everymatrix/lottery-ticket-controller 1.54.8 → 1.54.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/helper-accordion_5.cjs.entry.js +3 -1
- package/dist/esm/helper-accordion_5.entry.js +3 -1
- package/dist/lottery-ticket-controller/lottery-ticket-controller.esm.js +1 -1
- package/dist/lottery-ticket-controller/{p-6e6f07dc.entry.js → p-a6e4424e.entry.js} +3 -3
- package/dist/stencil.config.js +2 -1
- package/dist/types/Users/adrian.pripon/Documents/Work/widgets-monorepo/packages/stencil/lottery-ticket-controller/.stencil/tools/plugins/index.d.ts +3 -0
- package/dist/types/Users/adrian.pripon/Documents/Work/widgets-monorepo/packages/stencil/lottery-ticket-controller/.stencil/tools/plugins/stencil-clean-deps-plugin.d.ts +5 -0
- package/dist/types/Users/adrian.pripon/Documents/Work/widgets-monorepo/packages/stencil/lottery-ticket-controller/.stencil/tools/plugins/vite-chunk-plugin.d.ts +6 -0
- package/dist/types/Users/adrian.pripon/Documents/Work/widgets-monorepo/packages/stencil/lottery-ticket-controller/.stencil/tools/plugins/vite-clean-deps-plugin.d.ts +4 -0
- package/package.json +2 -6
|
@@ -573,7 +573,7 @@ function dashToCamelCase$1(dash) {
|
|
|
573
573
|
|
|
574
574
|
const experimentalMap = {};
|
|
575
575
|
|
|
576
|
-
function defineCustomElement(CustomElement, version = '24.6.
|
|
576
|
+
function defineCustomElement(CustomElement, version = '24.6.4') {
|
|
577
577
|
Object.defineProperty(CustomElement, 'version', {
|
|
578
578
|
get() {
|
|
579
579
|
return version;
|
|
@@ -11680,6 +11680,7 @@ const ItemMixin = (superClass) =>
|
|
|
11680
11680
|
value: false,
|
|
11681
11681
|
reflectToAttribute: true,
|
|
11682
11682
|
observer: '_selectedChanged',
|
|
11683
|
+
sync: true,
|
|
11683
11684
|
},
|
|
11684
11685
|
|
|
11685
11686
|
/** @private */
|
|
@@ -12484,6 +12485,7 @@ const ListMixin = (superClass) =>
|
|
|
12484
12485
|
type: Number,
|
|
12485
12486
|
reflectToAttribute: true,
|
|
12486
12487
|
notify: true,
|
|
12488
|
+
sync: true,
|
|
12487
12489
|
},
|
|
12488
12490
|
|
|
12489
12491
|
/**
|
|
@@ -569,7 +569,7 @@ function dashToCamelCase$1(dash) {
|
|
|
569
569
|
|
|
570
570
|
const experimentalMap = {};
|
|
571
571
|
|
|
572
|
-
function defineCustomElement(CustomElement, version = '24.6.
|
|
572
|
+
function defineCustomElement(CustomElement, version = '24.6.4') {
|
|
573
573
|
Object.defineProperty(CustomElement, 'version', {
|
|
574
574
|
get() {
|
|
575
575
|
return version;
|
|
@@ -11676,6 +11676,7 @@ const ItemMixin = (superClass) =>
|
|
|
11676
11676
|
value: false,
|
|
11677
11677
|
reflectToAttribute: true,
|
|
11678
11678
|
observer: '_selectedChanged',
|
|
11679
|
+
sync: true,
|
|
11679
11680
|
},
|
|
11680
11681
|
|
|
11681
11682
|
/** @private */
|
|
@@ -12480,6 +12481,7 @@ const ListMixin = (superClass) =>
|
|
|
12480
12481
|
type: Number,
|
|
12481
12482
|
reflectToAttribute: true,
|
|
12482
12483
|
notify: true,
|
|
12484
|
+
sync: true,
|
|
12483
12485
|
},
|
|
12484
12486
|
|
|
12485
12487
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{p as e,b as t}from"./p-d0de5ea9.js";export{s as setNonce}from"./p-d0de5ea9.js";import{g as l}from"./p-e1255160.js";(()=>{const t=import.meta.url,l={};return""!==t&&(l.resourcesUrl=new URL(".",t).href),e(l)})().then((async e=>(await l(),t([["p-
|
|
1
|
+
import{p as e,b as t}from"./p-d0de5ea9.js";export{s as setNonce}from"./p-d0de5ea9.js";import{g as l}from"./p-e1255160.js";(()=>{const t=import.meta.url,l={};return""!==t&&(l.resourcesUrl=new URL(".",t).href),e(l)})().then((async e=>(await l(),t([["p-a6e4424e",[[1,"lottery-ticket-controller",{endpoint:[513],ticketId:[514,"ticket-id"],ticketDescription:[513,"ticket-description"],gameId:[513,"game-id"],postMessage:[516,"post-message"],eventName:[513,"event-name"],collapsed:[516],numberOfGrids:[514,"number-of-grids"],last:[516],language:[513],autoPick:[516,"auto-pick"],resetButton:[516,"reset-button"],totalControllers:[514,"total-controllers"],clientStyling:[513,"client-styling"],clientStylingUrlContent:[513,"client-styling-url-content"],translationUrl:[520,"translation-url"],limitStylingAppends:[32]},[[0,"helperAccordionAction","helperAccordionActionHandler"]]],[1,"lottery-ticket",{endpoint:[513],gameId:[513,"game-id"],numberOfGrids:[514,"number-of-grids"],multipleDraws:[516,"multiple-draws"],ticketId:[514,"ticket-id"],resetButton:[516,"reset-button"],autoPick:[516,"auto-pick"],language:[513],clientStyling:[513,"client-styling"],clientStylingUrlContent:[513,"client-styling-url-content"],translationUrl:[520,"translation-url"],isLoading:[32],hasErrors:[32],ticketDone:[32],isCustomSelect:[32],amountInfo:[32],limitStylingAppends:[32],stakeMultiplier:[32],lineMultiplier:[32],isCustomSelectStake:[32],isCustomSelectDraw:[32],isCustomSelectLine:[32],drawMultiplier:[32],secondarySelectionAllowed:[32],partialQuickpickAvailable:[32],boardsAllowed:[32],tabIndex:[32],groupType:[32],playType:[32],selectedPlayTypeId:[32],maximumAllowed:[32],numberRange:[32],secondaryNumberRange:[32],secondaryMaximumAllowed:[32],minimumAllowed:[32],secondaryMinimumAllowed:[32]},[[8,"click","checkForClickOutside"],[0,"gridFilled","gridFilledHandler"],[0,"gridClearAllEvent","handleGridClearAllEvent"]],{lineMultiplier:["handleLineMultiplierChange"],tabIndex:["handleTabIndexChange"]}],[1,"helper-accordion",{ticketHistoryFlag:[516,"ticket-history-flag"],headerTitle:[513,"header-title"],headerSubtitle:[513,"header-subtitle"],description:[513],footer:[516],deleteTab:[516,"delete-tab"],postMessage:[516,"post-message"],eventName:[513,"event-name"],collapsed:[516],language:[513],clientStyling:[513,"client-styling"],clientStylingUrlContent:[513,"client-styling-url-content"],translationUrl:[520,"translation-url"],showContent:[32],limitStylingAppends:[32]}],[1,"lottery-grid",{ticketId:[514,"ticket-id"],totalNumbers:[514,"total-numbers"],gameId:[513,"game-id"],maximumAllowed:[514,"maximum-allowed"],minimumAllowed:[514,"minimum-allowed"],numberRange:[513,"number-range"],selectable:[516],selectedNumbers:[513,"selected-numbers"],secondaryNumbers:[513,"secondary-numbers"],displaySelected:[516,"display-selected"],language:[513],gridIndex:[514,"grid-index"],gridType:[513,"grid-type"],clientStyling:[513,"client-styling"],clientStylingUrlContent:[513,"client-styling-url-content"],highNumber:[514,"high-number"],lowNumber:[514,"low-number"],selectionType:[513,"selection-type"],partialQuickpickAvailable:[516,"partial-quickpick-available"],numbers:[32],bonusNumbers:[32],limitStylingAppends:[32]},[[0,"lotteryBulletSelection","lotteryBulletSelectionHandler"],[4,"resetSelection","resetSelectionHandler"],[4,"autoSelection","autoSelectionHandler"]]],[1,"lottery-bullet",{value:[513],selectable:[516],isSelected:[516,"is-selected"],isBonus:[516,"is-bonus"],clientStyling:[513,"client-styling"],clientStylingUrlContent:[513,"client-styling-url-content"],limitStylingAppends:[32]}]]]],e))));
|
|
@@ -4,7 +4,7 @@ import{r as t,c as e,h as i}from"./p-d0de5ea9.js";const s=["ro","en","hr"],o={en
|
|
|
4
4
|
* Copyright (c) 2021 - 2024 Vaadin Ltd.
|
|
5
5
|
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
|
|
6
6
|
*/
|
|
7
|
-
window.Vaadin||={},window.Vaadin.featureFlags||={};const d={};function u(t,e="24.6.
|
|
7
|
+
window.Vaadin||={},window.Vaadin.featureFlags||={};const d={};function u(t,e="24.6.4"){if(Object.defineProperty(t,"version",{get:()=>e}),t.experimental){const e="string"==typeof t.experimental?t.experimental:`${i=t.is.split("-").slice(1).join("-"),i.replace(/-[a-z]/gu,(t=>t[1].toUpperCase()))}Component`;if(!window.Vaadin.featureFlags[e]&&!d[e])return d[e]=new Set,d[e].add(t),void Object.defineProperty(window.Vaadin.featureFlags,e,{get:()=>0===d[e].size,set(t){t&&d[e].size>0&&(d[e].forEach((t=>{customElements.define(t.is,t)})),d[e].clear())}});if(d[e])return void d[e].add(t)}var i;const s=customElements.get(t.is);if(s){const e=s.version;e&&t.version&&e===t.version?console.warn(`The component ${t.is} has been loaded twice`):console.error(`Tried to define ${t.is} version ${t.version} when version ${s.version} is already in use. Something will probably break.`)}else customElements.define(t.is,t)}
|
|
8
8
|
/**
|
|
9
9
|
* @license
|
|
10
10
|
* Copyright (c) 2017 - 2024 Vaadin Ltd.
|
|
@@ -1690,7 +1690,7 @@ let ns=0,as=0;const ls=[];let hs=!1;const cs={after:t=>({run:e=>window.setTimeou
|
|
|
1690
1690
|
* Copyright (c) 2021 - 2024 Vaadin Ltd.
|
|
1691
1691
|
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
|
|
1692
1692
|
*/
|
|
1693
|
-
const so=ue((t=>class extends t{get _keyboardActive(){return Zs()}ready(){this.addEventListener("focusin",(t=>{this._shouldSetFocus(t)&&this._setFocused(!0)})),this.addEventListener("focusout",(t=>{this._shouldRemoveFocus(t)&&this._setFocused(!1)})),super.ready()}disconnectedCallback(){super.disconnectedCallback(),this.hasAttribute("focused")&&this._setFocused(!1)}_setFocused(t){this.toggleAttribute("focused",t),this.toggleAttribute("focus-ring",t&&this._keyboardActive)}_shouldSetFocus(t){return!0}_shouldRemoveFocus(t){return!0}})),oo=t=>class extends(Vs(so(t))){static get properties(){return{_hasVaadinItemMixin:{value:!0},selected:{type:Boolean,value:!1,reflectToAttribute:!0,observer:"_selectedChanged"},_value:String}}get _activeKeys(){return["Enter"," "]}get value(){return void 0!==this._value?this._value:this.textContent.trim()}set value(t){this._value=t}ready(){super.ready();const t=this.getAttribute("value");null!==t&&(this.value=t)}focus(){this.disabled||(super.focus(),this._setFocused(!0))}_shouldSetActive(t){return!(this.disabled||"keydown"===t.type&&t.defaultPrevented)}_selectedChanged(t){this.setAttribute("aria-selected",t)}_disabledChanged(t){super._disabledChanged(t),t&&(this.selected=!1,this.blur())}_onKeyDown(t){super._onKeyDown(t),this._activeKeys.includes(t.key)&&!t.defaultPrevented&&(t.preventDefault(),this.click())}}
|
|
1693
|
+
const so=ue((t=>class extends t{get _keyboardActive(){return Zs()}ready(){this.addEventListener("focusin",(t=>{this._shouldSetFocus(t)&&this._setFocused(!0)})),this.addEventListener("focusout",(t=>{this._shouldRemoveFocus(t)&&this._setFocused(!1)})),super.ready()}disconnectedCallback(){super.disconnectedCallback(),this.hasAttribute("focused")&&this._setFocused(!1)}_setFocused(t){this.toggleAttribute("focused",t),this.toggleAttribute("focus-ring",t&&this._keyboardActive)}_shouldSetFocus(t){return!0}_shouldRemoveFocus(t){return!0}})),oo=t=>class extends(Vs(so(t))){static get properties(){return{_hasVaadinItemMixin:{value:!0},selected:{type:Boolean,value:!1,reflectToAttribute:!0,observer:"_selectedChanged",sync:!0},_value:String}}get _activeKeys(){return["Enter"," "]}get value(){return void 0!==this._value?this._value:this.textContent.trim()}set value(t){this._value=t}ready(){super.ready();const t=this.getAttribute("value");null!==t&&(this.value=t)}focus(){this.disabled||(super.focus(),this._setFocused(!0))}_shouldSetActive(t){return!(this.disabled||"keydown"===t.type&&t.defaultPrevented)}_selectedChanged(t){this.setAttribute("aria-selected",t)}_disabledChanged(t){super._disabledChanged(t),t&&(this.selected=!1,this.blur())}_onKeyDown(t){super._onKeyDown(t),this._activeKeys.includes(t.key)&&!t.defaultPrevented&&(t.preventDefault(),this.click())}}
|
|
1694
1694
|
/**
|
|
1695
1695
|
* @license
|
|
1696
1696
|
* Copyright (c) 2017 - 2024 Vaadin Ltd.
|
|
@@ -1740,7 +1740,7 @@ class po{constructor(t,e){this.slot=t,this.callback=e,this._storedNodes=[],this.
|
|
|
1740
1740
|
* @license
|
|
1741
1741
|
* Copyright (c) 2017 - 2024 Vaadin Ltd.
|
|
1742
1742
|
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
|
|
1743
|
-
*/,fo=t=>class extends(mo(t)){static get properties(){return{disabled:{type:Boolean,value:!1,reflectToAttribute:!0},selected:{type:Number,reflectToAttribute:!0,notify:!0},orientation:{type:String,reflectToAttribute:!0,value:""},items:{type:Array,readOnly:!0,notify:!0},_searchBuf:{type:String,value:""}}}static get observers(){return["_enhanceItems(items, orientation, selected, disabled)"]}get _isRTL(){return!this._vertical&&"rtl"===this.getAttribute("dir")}get _scrollerElement(){return console.warn(`Please implement the '_scrollerElement' property in <${this.localName}>`),this}get _vertical(){return"horizontal"!==this.orientation}focus(){this._observer&&this._observer.flush();const t=Array.isArray(this.items)?this.items:[],e=this._getAvailableIndex(t,0,null,(t=>0===t.tabIndex&&!to(t)));e>=0?this._focus(e):super.focus()}ready(){super.ready(),this.addEventListener("click",(t=>this._onClick(t)));const t=this.shadowRoot.querySelector("slot:not([name])");this._observer=new po(t,(()=>{this._setItems(this._filterItems(lo(this)))}))}_getItems(){return this.items}_enhanceItems(t,e,i,s){if(!s&&t){this.setAttribute("aria-orientation",e||"vertical"),t.forEach((t=>{e?t.setAttribute("orientation",e):t.removeAttribute("orientation")})),this._setFocusable(i<0||!i?0:i);const s=t[i];t.forEach((t=>{t.selected=t===s})),s&&!s.disabled&&this._scrollToItem(i)}}_filterItems(t){return t.filter((t=>t._hasVaadinItemMixin))}_onClick(t){if(t.metaKey||t.shiftKey||t.ctrlKey||t.defaultPrevented)return;const e=this._filterItems(t.composedPath())[0];let i;e&&!e.disabled&&(i=this.items.indexOf(e))>=0&&(this.selected=i)}_searchKey(t,e){return this._searchReset=ao.debounce(this._searchReset,cs.after(500),(()=>{this._searchBuf=""})),this._searchBuf+=e.toLowerCase(),this.items.some((t=>this.__isMatchingKey(t)))||(this._searchBuf=e.toLowerCase()),this._getAvailableIndex(this.items,1===this._searchBuf.length?t+1:t,1,(t=>this.__isMatchingKey(t)&&"none"!==getComputedStyle(t).display))}__isMatchingKey(t){return t.textContent.replace(/[^\p{L}\p{Nd}]/gu,"").toLowerCase().startsWith(this._searchBuf)}_onKeyDown(t){if(t.metaKey||t.ctrlKey)return;const e=t.key,i=this.items.indexOf(this.focused);if(/[\p{L}\p{Nd}]/u.test(e)&&1===e.length){const t=this._searchKey(i,e);t>=0&&this._focus(t)}else super._onKeyDown(t)}_isItemHidden(t){return"none"===getComputedStyle(t).display}_setFocusable(t){t=this._getAvailableIndex(this.items,t,1);const e=this.items[t];this.items.forEach((t=>{t.tabIndex=t===e?0:-1}))}_focus(t){this.items.forEach(((e,i)=>{e.focused=i===t})),this._setFocusable(t),this._scrollToItem(t),super._focus(t)}_scrollToItem(t){const e=this.items[t];if(!e)return;const i=this._vertical?["top","bottom"]:this._isRTL?["right","left"]:["left","right"],s=this._scrollerElement.getBoundingClientRect(),o=(this.items[t+1]||e).getBoundingClientRect(),r=(this.items[t-1]||e).getBoundingClientRect();let n=0;!this._isRTL&&o[i[1]]>=s[i[1]]||this._isRTL&&o[i[1]]<=s[i[1]]?n=o[i[1]]-s[i[1]]:(!this._isRTL&&r[i[0]]<=s[i[0]]||this._isRTL&&r[i[0]]>=s[i[0]])&&(n=r[i[0]]-s[i[0]]),this._scroll(n)}_scroll(t){if(this._vertical)this._scrollerElement.scrollTop+=t;else{const e=this.getAttribute("dir")||"ltr",i=
|
|
1743
|
+
*/,fo=t=>class extends(mo(t)){static get properties(){return{disabled:{type:Boolean,value:!1,reflectToAttribute:!0},selected:{type:Number,reflectToAttribute:!0,notify:!0,sync:!0},orientation:{type:String,reflectToAttribute:!0,value:""},items:{type:Array,readOnly:!0,notify:!0},_searchBuf:{type:String,value:""}}}static get observers(){return["_enhanceItems(items, orientation, selected, disabled)"]}get _isRTL(){return!this._vertical&&"rtl"===this.getAttribute("dir")}get _scrollerElement(){return console.warn(`Please implement the '_scrollerElement' property in <${this.localName}>`),this}get _vertical(){return"horizontal"!==this.orientation}focus(){this._observer&&this._observer.flush();const t=Array.isArray(this.items)?this.items:[],e=this._getAvailableIndex(t,0,null,(t=>0===t.tabIndex&&!to(t)));e>=0?this._focus(e):super.focus()}ready(){super.ready(),this.addEventListener("click",(t=>this._onClick(t)));const t=this.shadowRoot.querySelector("slot:not([name])");this._observer=new po(t,(()=>{this._setItems(this._filterItems(lo(this)))}))}_getItems(){return this.items}_enhanceItems(t,e,i,s){if(!s&&t){this.setAttribute("aria-orientation",e||"vertical"),t.forEach((t=>{e?t.setAttribute("orientation",e):t.removeAttribute("orientation")})),this._setFocusable(i<0||!i?0:i);const s=t[i];t.forEach((t=>{t.selected=t===s})),s&&!s.disabled&&this._scrollToItem(i)}}_filterItems(t){return t.filter((t=>t._hasVaadinItemMixin))}_onClick(t){if(t.metaKey||t.shiftKey||t.ctrlKey||t.defaultPrevented)return;const e=this._filterItems(t.composedPath())[0];let i;e&&!e.disabled&&(i=this.items.indexOf(e))>=0&&(this.selected=i)}_searchKey(t,e){return this._searchReset=ao.debounce(this._searchReset,cs.after(500),(()=>{this._searchBuf=""})),this._searchBuf+=e.toLowerCase(),this.items.some((t=>this.__isMatchingKey(t)))||(this._searchBuf=e.toLowerCase()),this._getAvailableIndex(this.items,1===this._searchBuf.length?t+1:t,1,(t=>this.__isMatchingKey(t)&&"none"!==getComputedStyle(t).display))}__isMatchingKey(t){return t.textContent.replace(/[^\p{L}\p{Nd}]/gu,"").toLowerCase().startsWith(this._searchBuf)}_onKeyDown(t){if(t.metaKey||t.ctrlKey)return;const e=t.key,i=this.items.indexOf(this.focused);if(/[\p{L}\p{Nd}]/u.test(e)&&1===e.length){const t=this._searchKey(i,e);t>=0&&this._focus(t)}else super._onKeyDown(t)}_isItemHidden(t){return"none"===getComputedStyle(t).display}_setFocusable(t){t=this._getAvailableIndex(this.items,t,1);const e=this.items[t];this.items.forEach((t=>{t.tabIndex=t===e?0:-1}))}_focus(t){this.items.forEach(((e,i)=>{e.focused=i===t})),this._setFocusable(t),this._scrollToItem(t),super._focus(t)}_scrollToItem(t){const e=this.items[t];if(!e)return;const i=this._vertical?["top","bottom"]:this._isRTL?["right","left"]:["left","right"],s=this._scrollerElement.getBoundingClientRect(),o=(this.items[t+1]||e).getBoundingClientRect(),r=(this.items[t-1]||e).getBoundingClientRect();let n=0;!this._isRTL&&o[i[1]]>=s[i[1]]||this._isRTL&&o[i[1]]<=s[i[1]]?n=o[i[1]]-s[i[1]]:(!this._isRTL&&r[i[0]]<=s[i[0]]||this._isRTL&&r[i[0]]>=s[i[0]])&&(n=r[i[0]]-s[i[0]]),this._scroll(n)}_scroll(t){if(this._vertical)this._scrollerElement.scrollTop+=t;else{const e=this.getAttribute("dir")||"ltr",i=
|
|
1744
1744
|
/**
|
|
1745
1745
|
* @license
|
|
1746
1746
|
* Copyright (c) 2021 - 2024 Vaadin Ltd.
|
package/dist/stencil.config.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { sass } from "@stencil/sass";
|
|
2
|
+
import { cleanPackageJsonStencil } from "../../../tools/plugins";
|
|
2
3
|
export const config = {
|
|
3
4
|
namespace: 'lottery-ticket-controller',
|
|
4
5
|
taskQueue: 'async',
|
|
@@ -7,7 +8,7 @@ export const config = {
|
|
|
7
8
|
extras: {
|
|
8
9
|
experimentalImportInjection: true
|
|
9
10
|
},
|
|
10
|
-
plugins: [sass()],
|
|
11
|
+
plugins: [sass(), cleanPackageJsonStencil()],
|
|
11
12
|
outputTargets: [
|
|
12
13
|
{
|
|
13
14
|
type: 'dist',
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@everymatrix/lottery-ticket-controller",
|
|
3
|
-
"version": "1.54.
|
|
3
|
+
"version": "1.54.10",
|
|
4
4
|
"main": "./dist/index.cjs.js",
|
|
5
5
|
"module": "./dist/index.js",
|
|
6
6
|
"es2015": "./dist/esm/index.mjs",
|
|
@@ -22,9 +22,5 @@
|
|
|
22
22
|
],
|
|
23
23
|
"publishConfig": {
|
|
24
24
|
"access": "public"
|
|
25
|
-
},
|
|
26
|
-
"dependencies": {
|
|
27
|
-
"@everymatrix/helper-accordion": "1.45.7",
|
|
28
|
-
"@everymatrix/lottery-ticket": "1.45.7"
|
|
29
25
|
}
|
|
30
|
-
}
|
|
26
|
+
}
|