diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-06-14 22:31:26 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-06-14 22:31:26 +0300 |
commit | 0f5322012206df1ff343f44e9cbdc275006ad482 (patch) | |
tree | a9ca74a47007e46fbf4722aa74ca9749a5220c45 | |
parent | 37817fcaf80e026de3769e2382b84c5bde283b42 (diff) | |
parent | 1214af04a9bdaad4390d6f3eb157f5dd430ab48a (diff) | |
download | wekan-0f5322012206df1ff343f44e9cbdc275006ad482.tar.gz wekan-0f5322012206df1ff343f44e9cbdc275006ad482.tar.bz2 wekan-0f5322012206df1ff343f44e9cbdc275006ad482.zip |
Merge branch 'devel'
-rw-r--r-- | CHANGELOG.md | 8 | ||||
-rw-r--r-- | client/components/cards/cardDetails.js | 23 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | sandstorm-pkgdef.capnp | 4 |
4 files changed, 28 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index af018d46..5dc76b55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v1.06 2018-06-14 Wekan release + +This release fixes the following bugs: + +* [Fix CardDetail of Mobile View](https://github.com/wekan/wekan/pull/1701). + +Thanks to GitHub users feuerball11 and xet7 for their contributions. + # v1.05 2018-06-14 Wekan release This release adds the following new features: diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 6cbc4572..72ed678b 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -21,8 +21,12 @@ BlazeComponent.extendComponent({ onCreated() { this.isLoaded = new ReactiveVar(false); - this.parentComponent().parentComponent().showOverlay.set(true); - this.parentComponent().parentComponent().mouseHasEnterCardDetails = false; + const boardBody = this.parentComponent().parentComponent(); + //in Miniview parent is Board, not BoardBody. + if (boardBody !== null){ + boardBody.showOverlay.set(true); + boardBody.mouseHasEnterCardDetails = false; + } this.calculateNextPeak(); Meteor.subscribe('unsaved-edits'); @@ -44,7 +48,8 @@ BlazeComponent.extendComponent({ scrollParentContainer() { const cardPanelWidth = 510; const bodyBoardComponent = this.parentComponent().parentComponent(); - + //On Mobile View Parent is Board, Not Board Body. I cant see how this funciton should work then. + if (bodyBoardComponent === null) return; const $cardView = this.$(this.firstNode()); const $cardContainer = bodyBoardComponent.$('.js-swimlanes'); const cardContainerScroll = $cardContainer.scrollLeft(); @@ -115,7 +120,10 @@ BlazeComponent.extendComponent({ }, onDestroyed() { - this.parentComponent().parentComponent().showOverlay.set(false); + const parentComponent = this.parentComponent().parentComponent(); + //on mobile view parent is Board, not board body. + if (parentComponent === null) return; + parentComponent.showOverlay.set(false); }, events() { @@ -168,8 +176,11 @@ BlazeComponent.extendComponent({ 'click .js-due-date': Popup.open('editCardDueDate'), 'click .js-end-date': Popup.open('editCardEndDate'), 'mouseenter .js-card-details' () { - this.parentComponent().parentComponent().showOverlay.set(true); - this.parentComponent().parentComponent().mouseHasEnterCardDetails = true; + const parentComponent = this.parentComponent().parentComponent(); + //on mobile view parent is Board, not BoardBody. + if (parentComponent === null) return; + parentComponent.showOverlay.set(true); + parentComponent.mouseHasEnterCardDetails = true; }, 'click #toggleButton'() { Meteor.call('toggleSystemMessages'); diff --git a/package.json b/package.json index 4da56a02..15d03fc0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "1.05.0", + "version": "1.06.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 3c12205e..5ed6676d 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 90, + appVersion = 91, # Increment this for every release. - appMarketingVersion = (defaultText = "1.05.0~2018-06-14"), + appMarketingVersion = (defaultText = "1.06.0~2018-06-14"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, |