Skip to content

Commit

Permalink
Merge branch 'develop' into release/5.1.0-beta.1
Browse files Browse the repository at this point in the history
  • Loading branch information
DominikGuzei committed Apr 16, 2019
2 parents aa445ac + 8f0a451 commit c07196c
Show file tree
Hide file tree
Showing 6 changed files with 224 additions and 214 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ matrix:

language: node_js

install:
install:
- echo do nothing

before_script:
- npx lerna bootstrap
- npm install node-sass -g

script:
# - npm run lint
- npm run test
- travis_wait 30 npm run build

cache: npm
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ cache:

before_build:
- npm run lint
- npm run test

build_script:
- npm run build
Expand Down
7 changes: 7 additions & 0 deletions src/features/announcements/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ export class AnnouncementsStore extends FeatureStore {
return getAnnouncementRequest.result;
}

@computed get areNewsAvailable() {
const isChangelogAvailable = getChangelogRequest.wasExecuted && !!this.changelog;
const isAnnouncementAvailable = getAnnouncementRequest.wasExecuted && !!this.announcement;
return isChangelogAvailable || isAnnouncementAvailable;
}

@computed get settings() {
return localStorage.getItem(LOCAL_STORAGE_KEY) || {};
}
Expand Down Expand Up @@ -87,6 +93,7 @@ export class AnnouncementsStore extends FeatureStore {
// ======= ACTIONS ======= //

@action _showAnnouncement = ({ targetVersion } = {}) => {
if (!this.areNewsAvailable) return;
this.targetVersion = targetVersion || this.currentVersion;
this.isAnnouncementVisible = true;
this.actions.service.blurActive();
Expand Down
Loading

0 comments on commit c07196c

Please sign in to comment.