diff options
| author | Sam X. Chen <sam.xi.chen@gmail.com> | 2019-08-13 09:31:14 -0400 |
|---|---|---|
| committer | Sam X. Chen <sam.xi.chen@gmail.com> | 2019-08-13 09:31:14 -0400 |
| commit | 7198e6b66eaf622fb8378d928bd8a85df8da7505 (patch) | |
| tree | 0bd61461ec7907b245345b56f4089376fa93339e /client | |
| parent | a666883986073f9b2f00fce0b9be30d709628b22 (diff) | |
| parent | 76dbadf1bad1a7ecf59b111df34751c04277db5b (diff) | |
| download | wekan-7198e6b66eaf622fb8378d928bd8a85df8da7505.tar.gz wekan-7198e6b66eaf622fb8378d928bd8a85df8da7505.tar.bz2 wekan-7198e6b66eaf622fb8378d928bd8a85df8da7505.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'client')
| -rw-r--r-- | client/components/settings/informationBody.jade | 12 | ||||
| -rw-r--r-- | client/components/settings/settingBody.styl | 8 | ||||
| -rw-r--r-- | client/components/sidebar/sidebar.js | 7 |
3 files changed, 21 insertions, 6 deletions
diff --git a/client/components/settings/informationBody.jade b/client/components/settings/informationBody.jade index feb7c0dc..2c615ffd 100644 --- a/client/components/settings/informationBody.jade +++ b/client/components/settings/informationBody.jade @@ -20,9 +20,21 @@ template(name='statistics') th Wekan {{_ 'info'}} td {{statistics.version}} tr + th {{_ 'Meteor_version'}} + td {{statistics.meteor.meteorVersion}} + tr th {{_ 'Node_version'}} td {{statistics.process.nodeVersion}} tr + th {{_ 'MongoDB_version'}} + td {{statistics.mongo.mongoVersion}} + tr + th {{_ 'MongoDB_storage_engine'}} + td {{statistics.mongo.mongoStorageEngine}} + tr + th {{_ 'MongoDB_Oplog_enabled'}} + td {{statistics.mongo.mongoOplogEnabled}} + tr th {{_ 'OS_Type'}} td {{statistics.os.type}} tr diff --git a/client/components/settings/settingBody.styl b/client/components/settings/settingBody.styl index b9300782..bcbd2ea1 100644 --- a/client/components/settings/settingBody.styl +++ b/client/components/settings/settingBody.styl @@ -52,10 +52,10 @@ .main-body padding: 0.1em 1em - -webkit-user-select: auto // Safari 3.1+ - -moz-user-select: auto // Firefox 2+ - -ms-user-select: auto // IE 10+ - user-select: auto // Standard syntax + -webkit-user-select: text // Safari 3.1+ + -moz-user-select: text // Firefox 2+ + -ms-user-select: text // IE 10+ + user-select: text // Standard syntax ul li diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index 8b98fd7e..f7efb1e8 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -47,8 +47,11 @@ BlazeComponent.extendComponent({ }, calculateNextPeak() { - const altitude = this.find('.js-board-sidebar-content').scrollHeight; - this.callFirstWith(this, 'setNextPeak', altitude); + const sidebarElement = this.find('.js-board-sidebar-content'); + if (sidebarElement) { + const altitude = sidebarElement.scrollHeight; + this.callFirstWith(this, 'setNextPeak', altitude); + } }, reachNextPeak() { |