Skip to content

Commit

Permalink
Merge pull request #434 from NateWr/i2746_ios_lists
Browse files Browse the repository at this point in the history
pkp/pkp-lib#2746 Fix submission list filtering in iOS
  • Loading branch information
NateWr authored Aug 30, 2017
2 parents 563d46e + e6596e5 commit aef0959
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="pkpListPanel__filter pkpListPanel__filter--catalogSubmissions" :class="{'--isVisible': isVisible}" :aria-hidden="!isVisible">
<div class="pkpListPanel__filter pkpListPanel__filter--catalogSubmissions" :class="{'-isVisible': isVisible}" :aria-hidden="!isVisible">
<div class="pkpListPanel__filterHeader pkpListPanel__filterHeader--catalogSubmissions" tabindex="0">
<span class="fa fa-filter"></span>
{{ i18n.filter }}
Expand All @@ -14,7 +14,7 @@
<a href="#"
@click.prevent.stop="filterBy(filterItem.param, filterItem.val)"
class="pkpListPanel__filterLabel"
:class="{'--isActive': isFilterActive(filterItem.param, filterItem.val)}"
:class="{'-isActive': isFilterActive(filterItem.param, filterItem.val)}"
:tabindex="tabIndex"
>{{ filterItem.title }}</a>
<button
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<li class="pkpListPanelItem pkpListPanelItem--submission pkpListPanelItem--catalog" :class="{'--hasFocus': isFocused, '--isLoading': isSaving, '--isFeatured': isFeatured}">
<li class="pkpListPanelItem pkpListPanelItem--submission pkpListPanelItem--catalog" :class="{'--hasFocus': isFocused, '-isLoading': isSaving, '-isFeatured': isFeatured}">
<list-panel-item-orderer
v-if="isOrdering"
@itemOrderUp="itemOrderUp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<div class="pkpListPanel__title">{{ i18n.title }}</div>
<ul class="pkpListPanel__actions">
<li>
<button @click.prevent="toggleFilter" :class="{'--isActive': isFilterVisible}">
<button @click.prevent="toggleFilter" :class="{'-isActive': isFilterVisible}">
<span class="fa fa-filter"></span>
{{ i18n.filter }}
</button>
</li>
<li class="pkpListPanel__orderToggle" v-if="canOrder">
<button @click.prevent="toggleOrdering" :class="{'--isActive': isOrdering}">
<button @click.prevent="toggleOrdering" :class="{'-isActive': isOrdering}">
<span class="fa fa-sort"></span>
<template v-if="isOrdering">
{{ i18n.saveFeatureOrder }}
Expand All @@ -21,7 +21,7 @@
</button>
</li>
<li v-if="isOrdering" class="pkpListPanel__orderToggleCancel">
<button @click.prevent="cancelOrdering" class="--isWarnable">
<button @click.prevent="cancelOrdering" class="-isWarnable">
{{ i18n.cancel }}
</button>
</li>
Expand Down Expand Up @@ -131,7 +131,7 @@ export default {
* Set status on the component
*/
classStatus: function() {
return { '--isLoading': this.isLoading, '--isOrdering': this.isOrdering };
return { '-isLoading': this.isLoading, '-isOrdering': this.isOrdering };
},
/**
Expand Down
6 changes: 3 additions & 3 deletions styles/controllers/catalogSubmissionsListPanel.less
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
}
}

&.--isLoading {
&.-isLoading {

// Hide the list when loading because the featured and new release
// actions change depending on the filter used. This prevents a brief
Expand Down Expand Up @@ -88,7 +88,7 @@
}
}

.pkpListPanel--catalogSubmissions.--isOrdering {
.pkpListPanel--catalogSubmissions.-isOrdering {

.pkpListPanel__actions > li:not(.pkpListPanel__orderToggle):not(.pkpListPanel__orderToggleCancel),
.pkpListPanel__search,
Expand All @@ -102,7 +102,7 @@
padding-right: 0;
}

.pkpListPanelItem:not(.--isFeatured) {
.pkpListPanelItem:not(.-isFeatured) {
display: none;
}
}

0 comments on commit aef0959

Please sign in to comment.