Small fixes

This commit is contained in:
RainLoop Team 2014-02-23 02:38:35 +04:00
parent 48c2f7807d
commit a60c2014b0
9 changed files with 203 additions and 203 deletions

View file

@ -21,9 +21,9 @@ function PopupsComposeViewModel()
self = this, self = this,
oRainLoopData = RL.data(), oRainLoopData = RL.data(),
fCcAndBccCheckHelper = function (aValue) { fCcAndBccCheckHelper = function (aValue) {
if (false === this.showCcAndBcc() && 0 < aValue.length) if (false === self.showCcAndBcc() && 0 < aValue.length)
{ {
this.showCcAndBcc(true); self.showCcAndBcc(true);
} }
} }
; ;

View file

@ -505,8 +505,8 @@ PopupsContactsViewModel.prototype.populateViewContact = function (oContact)
this.viewScopeType(oContact.scopeType); this.viewScopeType(oContact.scopeType);
} }
aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.FirstName, sFirstName, false, 'CONTACTS/PLACEHOLDER_ENTER_FIRST_NAME'));
aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.LastName, sLastName, !oContact, 'CONTACTS/PLACEHOLDER_ENTER_LAST_NAME')); aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.LastName, sLastName, !oContact, 'CONTACTS/PLACEHOLDER_ENTER_LAST_NAME'));
aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.FirstName, sFirstName, false, 'CONTACTS/PLACEHOLDER_ENTER_FIRST_NAME'));
this.viewID(sId); this.viewID(sId);
this.viewIDStr(sIdStr); this.viewIDStr(sIdStr);

View file

@ -140,7 +140,7 @@ class Contact
$sDisplay = ''; $sDisplay = '';
if (0 < \strlen($sLastName) || 0 < \strlen($sFirstName)) if (0 < \strlen($sLastName) || 0 < \strlen($sFirstName))
{ {
$sDisplay = \trim($sLastName.' '.$sFirstName); $sDisplay = \trim($sFirstName.' '.$sLastName);
} }
if ('' === $sDisplay && 0 < \strlen($sEmail)) if ('' === $sDisplay && 0 < \strlen($sEmail))

File diff suppressed because one or more lines are too long

View file

@ -7584,9 +7584,9 @@ function PopupsComposeViewModel()
self = this, self = this,
oRainLoopData = RL.data(), oRainLoopData = RL.data(),
fCcAndBccCheckHelper = function (aValue) { fCcAndBccCheckHelper = function (aValue) {
if (false === this.showCcAndBcc() && 0 < aValue.length) if (false === self.showCcAndBcc() && 0 < aValue.length)
{ {
this.showCcAndBcc(true); self.showCcAndBcc(true);
} }
} }
; ;
@ -9549,8 +9549,8 @@ PopupsContactsViewModel.prototype.populateViewContact = function (oContact)
this.viewScopeType(oContact.scopeType); this.viewScopeType(oContact.scopeType);
} }
aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.FirstName, sFirstName, false, 'CONTACTS/PLACEHOLDER_ENTER_FIRST_NAME'));
aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.LastName, sLastName, !oContact, 'CONTACTS/PLACEHOLDER_ENTER_LAST_NAME')); aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.LastName, sLastName, !oContact, 'CONTACTS/PLACEHOLDER_ENTER_LAST_NAME'));
aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.FirstName, sFirstName, false, 'CONTACTS/PLACEHOLDER_ENTER_FIRST_NAME'));
this.viewID(sId); this.viewID(sId);
this.viewIDStr(sIdStr); this.viewIDStr(sIdStr);

File diff suppressed because one or more lines are too long