Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Bug 35626. refactoring rev. 1843040605.

Browse source
This commit is contained in:
Julia Radzhabova 2017-08-17 16:44:57 +03:00
parent 1843040605
commit 4f37e52b8c
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/common/main/lib/view/Header.js
View file

@ -135,7 +135,7 @@ define([
function onResetUsers(collection, opts) { function onResetUsers(collection, opts) {
var usercount = collection.getEditingCount(); var usercount = collection.getEditingCount();
if ( $userList ) { if ( $userList ) {
if ( usercount > 1 || usercount > 0 && !appConfig.isEdit) { if ( usercount > 1 || usercount > 0 && appConfig && !appConfig.isEdit) {
$userList.html(templateUserList({ $userList.html(templateUserList({
users: collection.models, users: collection.models,
usertpl: _.template(templateUserItem), usertpl: _.template(templateUserItem),
@ -157,7 +157,7 @@ define([
}; };
function applyUsers(count) { function applyUsers(count) {
if ( count > 1 || count > 0 && !appConfig.isEdit) { if ( count > 1 || count > 0 && appConfig && !appConfig.isEdit) {
$btnUsers $btnUsers
.attr('data-toggle', 'dropdown') .attr('data-toggle', 'dropdown')
.addClass('dropdown-toggle') .addClass('dropdown-toggle')
@ -174,13 +174,13 @@ define([
} }
$btnUsers.find('.caption') $btnUsers.find('.caption')
.css({'font-size': ((count > 1 || count > 0 && !appConfig.isEdit) ? '12px' : '14px'), .css({'font-size': ((count > 1 || count > 0 && appConfig && !appConfig.isEdit) ? '12px' : '14px'),
'margin-top': ((count > 1 || count > 0 && !appConfig.isEdit) ? '0' : '-1px')}) 'margin-top': ((count > 1 || count > 0 && appConfig && !appConfig.isEdit) ? '0' : '-1px')})
.html((count > 1 || count > 0 && !appConfig.isEdit) ? count : '+'); .html((count > 1 || count > 0 && appConfig && !appConfig.isEdit) ? count : '+');
var usertip = $btnUsers.data('bs.tooltip'); var usertip = $btnUsers.data('bs.tooltip');
if ( usertip ) { if ( usertip ) {
usertip.options.title = (count > 1 || count > 0 && !appConfig.isEdit) ? usertip.options.titleExt : usertip.options.titleNorm; usertip.options.title = (count > 1 || count > 0 && appConfig && !appConfig.isEdit) ? usertip.options.titleExt : usertip.options.titleNorm;
usertip.setContent(); usertip.setContent();
} }
} }