Skip to content

Commit 49d1287

Browse files
nolimits4webnolimits4web
committed
3.0.0-beta.12 release
1 parent 1ced382 commit 49d1287

File tree

98 files changed

+1283
-639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+1283
-639
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
# Change Log
44

5+
# [v3.0.0-beta.12](https://github.com/framework7io/framework7/compare/v3.0.0-beta.11...v3.0.0-beta.12) - June 22, 2018
6+
* Core
7+
* Tooltip
8+
* `el` parameter has been renamed to `targetEl`
9+
* Accordion
10+
* Now it toggles `aria-hidden` attribute on accordion content toggle
11+
512
# [v3.0.0-beta.11](https://github.com/framework7io/framework7/compare/v3.0.0-beta.10...v3.0.0-beta.11) - June 19, 2018
613
* Core
714
* Fix touch ripple issues that happen from time to time in Edge

‎packages/core/components/accordion/accordion.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const Accordion = {
1515
const $el = $(el);
1616
const $list = $el.parents('.accordion-list').eq(0);
1717
let $contentEl = $el.children('.accordion-item-content');
18+
$contentEl.removeAttr('aria-hidden');
1819
if ($contentEl.length === 0) $contentEl = $el.find('.accordion-item-content');
1920
if ($contentEl.length === 0) return;
2021
const $openedItem = $list.length > 0 && $el.parent().children('.accordion-item-opened');
@@ -46,6 +47,7 @@ const Accordion = {
4647
let $contentEl = $el.children('.accordion-item-content');
4748
if ($contentEl.length === 0) $contentEl = $el.find('.accordion-item-content');
4849
$el.removeClass('accordion-item-opened');
50+
$contentEl.attr('aria-hidden', true);
4951
$contentEl.transition(0);
5052
$contentEl.css('height', `${$contentEl[0].scrollHeight}px`);
5153
$contentEl._clientLeft = $contentEl[0].clientLeft;

‎packages/core/components/actions/actions-class.js‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ class Actions extends Modal {
8585
if (actions.params.convertToPopover && (targetEl || (targetX !== undefined && targetY !== undefined))) {
8686
// Popover
8787
if (
88-
actions.params.forceToPopover ||
89-
(app.device.ios && app.device.ipad) ||
90-
app.width >= 768
88+
actions.params.forceToPopover
89+
|| (app.device.ios && app.device.ipad)
90+
|| app.width >= 768
9191
) {
9292
convertToPopover = true;
9393
}
@@ -159,10 +159,10 @@ class Actions extends Modal {
159159
const $target = $(target);
160160
if ($target.closest(actions.el).length === 0) {
161161
if (
162-
actions.params.closeByBackdropClick &&
163-
actions.params.backdrop &&
164-
actions.backdropEl &&
165-
actions.backdropEl === target
162+
actions.params.closeByBackdropClick
163+
&& actions.params.backdrop
164+
&& actions.backdropEl
165+
&& actions.backdropEl === target
166166
) {
167167
actions.close();
168168
} else if (actions.params.closeByOutsideClick) {
@@ -188,14 +188,14 @@ class Actions extends Modal {
188188

189189
return actions;
190190
}
191+
191192
render() {
192193
const actions = this;
193194
if (actions.params.render) return actions.params.render.call(actions, actions);
194195
const { groups } = actions;
195196
return `
196197
<div class="actions-modal${actions.params.grid ? ' actions-grid' : ''}">
197-
${groups.map(group =>
198-
`<div class="actions-group">
198+
${groups.map(group => `<div class="actions-group">
199199
${group.map((button) => {
200200
const buttonClasses = [`actions-${button.label ? 'label' : 'button'}`];
201201
const { color, bg, bold, disabled, label, text, icon } = button;
@@ -216,6 +216,7 @@ class Actions extends Modal {
216216
</div>
217217
`.trim();
218218
}
219+
219220
renderPopover() {
220221
const actions = this;
221222
if (actions.params.renderPopover) return actions.params.renderPopover.call(actions, actions);

‎packages/core/components/app/app-class.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ class Framework7 extends Framework7Class {
8282
// Return app instance
8383
return app;
8484
}
85+
8586
init() {
8687
const app = this;
8788
if (app.initialized) return app;
@@ -135,15 +136,19 @@ class Framework7 extends Framework7Class {
135136
get t7() {
136137
return Template7;
137138
}
139+
138140
static get Dom7() {
139141
return $;
140142
}
143+
141144
static get $() {
142145
return $;
143146
}
147+
144148
static get Template7() {
145149
return Template7;
146150
}
151+
147152
static get Class() {
148153
return Framework7Class;
149154
}

‎packages/core/components/autocomplete/autocomplete-class.js‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ class Autocomplete extends Framework7Class {
291291

292292
return ac;
293293
}
294+
294295
positionDropdown() {
295296
const ac = this;
296297
const { $inputEl, app, $dropdownEl } = ac;
@@ -333,10 +334,12 @@ class Autocomplete extends Framework7Class {
333334
[paddingProp]: $listEl.length > 0 && !ac.params.expandInput ? `${paddingValue}px` : '',
334335
});
335336
}
337+
336338
focus() {
337339
const ac = this;
338340
ac.$el.find('input[type=search]').focus();
339341
}
342+
340343
source(query) {
341344
const ac = this;
342345
if (!ac.params.source) return;
@@ -378,6 +381,7 @@ class Autocomplete extends Framework7Class {
378381
}
379382
});
380383
}
384+
381385
updateValues() {
382386
const ac = this;
383387
let valuesHTML = '';
@@ -393,6 +397,7 @@ class Autocomplete extends Framework7Class {
393397
}
394398
ac.$el.find('.autocomplete-values ul').html(valuesHTML);
395399
}
400+
396401
preloaderHide() {
397402
const ac = this;
398403
if (ac.params.openIn === 'dropdown' && ac.$dropdownEl) {
@@ -401,6 +406,7 @@ class Autocomplete extends Framework7Class {
401406
$('.autocomplete-preloader').removeClass('autocomplete-preloader-visible');
402407
}
403408
}
409+
404410
preloaderShow() {
405411
const ac = this;
406412
if (ac.params.openIn === 'dropdown' && ac.$dropdownEl) {
@@ -409,12 +415,14 @@ class Autocomplete extends Framework7Class {
409415
$('.autocomplete-preloader').addClass('autocomplete-preloader-visible');
410416
}
411417
}
418+
412419
renderPreloader() {
413420
const ac = this;
414421
return `
415422
<div class="autocomplete-preloader preloader ${ac.params.preloaderColor ? `color-${ac.params.preloaderColor}` : ''}">${ac.app.theme === 'md' ? Utils.mdPreloaderContent : ''}</div>
416423
`.trim();
417424
}
425+
418426
renderSearchbar() {
419427
const ac = this;
420428
if (ac.params.renderSearchbar) return ac.params.renderSearchbar.call(ac);
@@ -432,6 +440,7 @@ class Autocomplete extends Framework7Class {
432440
`.trim();
433441
return searchbarHTML;
434442
}
443+
435444
renderItem(item, index) {
436445
const ac = this;
437446
if (ac.params.renderItem) return ac.params.renderItem.call(ac, item, index);
@@ -503,6 +512,7 @@ class Autocomplete extends Framework7Class {
503512
`.trim();
504513
return navbarHtml;
505514
}
515+
506516
renderDropdown() {
507517
const ac = this;
508518
if (ac.params.renderDropdown) return ac.params.renderDropdown.call(ac, ac.items);
@@ -518,6 +528,7 @@ class Autocomplete extends Framework7Class {
518528
`.trim();
519529
return dropdownHtml;
520530
}
531+
521532
renderPage() {
522533
const ac = this;
523534
if (ac.params.renderPage) return ac.params.renderPage.call(ac, ac.items);
@@ -543,6 +554,7 @@ class Autocomplete extends Framework7Class {
543554
`.trim();
544555
return pageHtml;
545556
}
557+
546558
renderPopup() {
547559
const ac = this;
548560
if (ac.params.renderPopup) return ac.params.renderPopup.call(ac, ac.items);
@@ -555,6 +567,7 @@ class Autocomplete extends Framework7Class {
555567
`.trim();
556568
return popupHtml;
557569
}
570+
558571
onOpen(type, el) {
559572
const ac = this;
560573
const app = ac.app;
@@ -603,13 +616,15 @@ class Autocomplete extends Framework7Class {
603616

604617
ac.emit('local::open autocompleteOpen', ac);
605618
}
619+
606620
onOpened() {
607621
const ac = this;
608622
if (ac.params.openIn !== 'dropdown' && ac.params.autoFocus) {
609623
ac.autoFocus();
610624
}
611625
ac.emit('local::opened autocompleteOpened', ac);
612626
}
627+
613628
onClose() {
614629
const ac = this;
615630
if (ac.destroyed) return;
@@ -631,6 +646,7 @@ class Autocomplete extends Framework7Class {
631646

632647
ac.emit('local::close autocompleteClose', ac);
633648
}
649+
634650
onClosed() {
635651
const ac = this;
636652
if (ac.destroyed) return;
@@ -642,6 +658,7 @@ class Autocomplete extends Framework7Class {
642658

643659
ac.emit('local::closed autocompleteClosed', ac);
644660
}
661+
645662
openPage() {
646663
const ac = this;
647664
if (ac.opened) return ac;
@@ -672,6 +689,7 @@ class Autocomplete extends Framework7Class {
672689
});
673690
return ac;
674691
}
692+
675693
openPopup() {
676694
const ac = this;
677695
if (ac.opened) return ac;
@@ -709,6 +727,7 @@ class Autocomplete extends Framework7Class {
709727
}
710728
return ac;
711729
}
730+
712731
openDropdown() {
713732
const ac = this;
714733

@@ -732,6 +751,7 @@ class Autocomplete extends Framework7Class {
732751
ac.onOpen('dropdown', ac.$dropdownEl);
733752
ac.onOpened('dropdown', ac.$dropdownEl);
734753
}
754+
735755
open() {
736756
const ac = this;
737757
if (ac.opened) return ac;
@@ -742,6 +762,7 @@ class Autocomplete extends Framework7Class {
742762
}).join('')}`]();
743763
return ac;
744764
}
765+
745766
close() {
746767
const ac = this;
747768
if (!ac.opened) return ac;
@@ -761,10 +782,12 @@ class Autocomplete extends Framework7Class {
761782
}
762783
return ac;
763784
}
785+
764786
init() {
765787
const ac = this;
766788
ac.attachEvents();
767789
}
790+
768791
destroy() {
769792
const ac = this;
770793
ac.emit('local::beforeDestroy autocompleteBeforeDestroy', ac);

0 commit comments

Comments
 (0)