diff options
Diffstat (limited to 'client/components')
-rw-r--r-- | client/components/boards/boardBody.jade | 2 | ||||
-rw-r--r-- | client/components/cards/cardDetails.jade | 2 | ||||
-rw-r--r-- | client/components/cards/cardDetails.js | 9 | ||||
-rw-r--r-- | client/components/cards/cardDetails.styl | 4 | ||||
-rw-r--r-- | client/components/lists/list.styl | 3 | ||||
-rw-r--r-- | client/components/lists/listBody.jade | 4 | ||||
-rw-r--r-- | client/components/lists/listBody.js | 6 | ||||
-rw-r--r-- | client/components/main/popup.styl | 5 | ||||
-rw-r--r-- | client/components/mixins/perfectScrollbar.js | 16 | ||||
-rw-r--r-- | client/components/mixins/perfectScrollbar.styl | 2 | ||||
-rw-r--r-- | client/components/sidebar/sidebar.jade | 2 | ||||
-rw-r--r-- | client/components/sidebar/sidebar.js | 2 | ||||
-rw-r--r-- | client/components/sidebar/sidebarSearches.jade | 2 |
13 files changed, 11 insertions, 48 deletions
diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade index 76a85d87..c11d0bd2 100644 --- a/client/components/boards/boardBody.jade +++ b/client/components/boards/boardBody.jade @@ -15,7 +15,7 @@ template(name="board") template(name="boardBody") .board-wrapper(class=currentBoard.colorClass) +sidebar - .board-canvas.js-swimlanes.js-perfect-scrollbar( + .board-canvas.js-swimlanes( class="{{#if Sidebar.isOpen}}is-sibling-sidebar-open{{/if}}" class="{{#if MultiSelection.isActive}}is-multiselection-active{{/if}}" class="{{#if draggingActive.get}}is-dragging-active{{/if}}") diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index dabee971..f16b255e 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -1,5 +1,5 @@ template(name="cardDetails") - section.card-details.js-card-details.js-perfect-scrollbar: .card-details-canvas + section.card-details.js-card-details: .card-details-canvas .card-details-header(class='{{#if colorClass}}card-details-{{colorClass}}{{/if}}') +inlinedForm(classNames="js-card-details-title") +editCardTitleForm diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index a91d9b6e..c9d5c769 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -8,7 +8,7 @@ Meteor.startup(() => { BlazeComponent.extendComponent({ mixins() { - return [Mixins.InfiniteScrolling, Mixins.PerfectScrollbar]; + return [Mixins.InfiniteScrolling]; }, calculateNextPeak() { @@ -171,13 +171,6 @@ BlazeComponent.extendComponent({ if (!Utils.isMiniScreen()) { Meteor.setTimeout(() => { - $('.card-details').mCustomScrollbar({ - theme: 'minimal-dark', - setWidth: false, - setLeft: 0, - scrollbarPosition: 'outside', - mouseWheel: true, - }); this.scrollParentContainer(); }, 500); } diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl index 12d0dda9..8f2d37bf 100644 --- a/client/components/cards/cardDetails.styl +++ b/client/components/cards/cardDetails.styl @@ -104,10 +104,6 @@ avatar-radius = 50% .mCustomScrollBox padding-left: 0 - .ps-scrollbar-y-rail - pointer-event: all - position: absolute - .card-details-canvas width: 470px padding-left: 20px diff --git a/client/components/lists/list.styl b/client/components/lists/list.styl index bc7f763f..584c1281 100644 --- a/client/components/lists/list.styl +++ b/client/components/lists/list.styl @@ -120,9 +120,6 @@ form margin-bottom: 9px - .ps-scrollbar-y-rail - transform: translateX(2px) - .open-minicard-composer border-radius: 2px color: #8c8c8c diff --git a/client/components/lists/listBody.jade b/client/components/lists/listBody.jade index 2f175205..94b558e6 100644 --- a/client/components/lists/listBody.jade +++ b/client/components/lists/listBody.jade @@ -1,5 +1,5 @@ template(name="listBody") - .list-body.js-perfect-scrollbar + .list-body .minicards.clearfix.js-minicards(class="{{#if reachedWipLimit}}js-list-full{{/if}}") if cards.count +inlinedForm(autoclose=false position="top") @@ -106,7 +106,7 @@ template(name="searchElementPopup") option(value="{{_id}}") {{title}} form.js-search-term-form input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus dir="auto") - .list-body.js-perfect-scrollbar.search-card-results + .list-body.search-card-results .minicards.clearfix.js-minicards if isBoardTemplateSearch each results diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js index 2d913aa9..c08f8267 100644 --- a/client/components/lists/listBody.js +++ b/client/components/lists/listBody.js @@ -8,7 +8,7 @@ BlazeComponent.extendComponent({ }, mixins() { - return [Mixins.PerfectScrollbar]; + return []; }, openForm(options) { @@ -523,7 +523,7 @@ BlazeComponent.extendComponent({ BlazeComponent.extendComponent({ mixins() { - return [Mixins.PerfectScrollbar]; + return []; }, onCreated() { @@ -721,7 +721,7 @@ BlazeComponent.extendComponent({ onRendered() { this.spinner = this.find('.sk-spinner-list'); - this.container = this.$(this.spinner).parents('.js-perfect-scrollbar')[0]; + this.container = this.$(this.spinner).parents('.list-body')[0]; $(this.container).on( `scroll.spinner_${this.swimlaneId}_${this.listId}`, diff --git a/client/components/main/popup.styl b/client/components/main/popup.styl index b4815ca6..91f5fa03 100644 --- a/client/components/main/popup.styl +++ b/client/components/main/popup.styl @@ -107,11 +107,6 @@ $popupWidth = 300px padding: 8px 4px 8px 10px margin-right: 8px - &::-webkit-scrollbar-button - display: block - height: 4px - width: 4px - .at-form .at-error, .at-result padding: 8px 12px diff --git a/client/components/mixins/perfectScrollbar.js b/client/components/mixins/perfectScrollbar.js deleted file mode 100644 index 12f8a892..00000000 --- a/client/components/mixins/perfectScrollbar.js +++ /dev/null @@ -1,16 +0,0 @@ -const { isTouchDevice } = Utils; - -Mixins.PerfectScrollbar = BlazeComponent.extendComponent({ - onRendered() { - if (!isTouchDevice()) { - const component = this.mixinParent(); - const domElement = component.find('.js-perfect-scrollbar'); - Ps.initialize(domElement); - - // XXX We should create an event map to be consistent with other components - // but since BlazeComponent doesn't merge Mixins events transparently I - // prefered to use a jQuery event (which is what an event map ends up doing) - component.$(domElement).on('mouseenter', () => Ps.update(domElement)); - } - }, -}); diff --git a/client/components/mixins/perfectScrollbar.styl b/client/components/mixins/perfectScrollbar.styl deleted file mode 100644 index c8267668..00000000 --- a/client/components/mixins/perfectScrollbar.styl +++ /dev/null @@ -1,2 +0,0 @@ -.ps-container - position: relative diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade index 443de9f3..ec605376 100644 --- a/client/components/sidebar/sidebar.jade +++ b/client/components/sidebar/sidebar.jade @@ -9,7 +9,7 @@ template(name="sidebar") a.board-header-btn.js-shortcuts i.fa.fa-keyboard-o span {{_ 'keyboard-shortcuts' }} - .sidebar-content.js-board-sidebar-content.js-perfect-scrollbar + .sidebar-content.js-board-sidebar-content //a.hide-btn.js-hide-sidebar // i.fa.fa-navicon unless isDefaultView diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index 7dfee78d..a97cefcc 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -16,7 +16,7 @@ const viewTitles = { BlazeComponent.extendComponent({ mixins() { - return [Mixins.InfiniteScrolling, Mixins.PerfectScrollbar]; + return [Mixins.InfiniteScrolling]; }, onCreated() { diff --git a/client/components/sidebar/sidebarSearches.jade b/client/components/sidebar/sidebarSearches.jade index 4ee7fc9c..d75be7bb 100644 --- a/client/components/sidebar/sidebarSearches.jade +++ b/client/components/sidebar/sidebarSearches.jade @@ -1,7 +1,7 @@ template(name="searchSidebar") form.js-search-term-form input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus dir="auto") - .list-body.js-perfect-scrollbar + .list-body .minilists.clearfix.js-minilists each (lists) a.minilist-wrapper.js-minilist(href=absoluteUrl) |