Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-28 11:39:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Release fixes

Browse source
This commit is contained in:
RainLoop Team 2015-04-17 17:56:29 +04:00
parent b00959b2d0
commit c73eb76816
9 changed files with 67 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

20
dev/View/Popup/Compose.js
View file

@ -1099,6 +1099,26 @@
oText.find('.rlBlockquoteSwitcher').off('.rlBlockquoteSwitcher').remove();
oText.find('[data-html-editor-font-wrapper]').removeAttr('data-html-editor-font-wrapper');
(function () {
var oTmp = null, iLimit = 0;
while (true)
{
iLimit++;
oTmp = oText.children();
if (10 > iLimit && oTmp.is('div') && 1 === oTmp.length)
{
oTmp.children().unwrap();
continue;
}
break;
}
}());
sText = oText.html();
}

9
dev/View/Popup/Languages.js
View file

@ -24,15 +24,16 @@
var self = this;
this.fLang = null;
this.sUserLanguage = '';
this.userLanguage = ko.observable('');
this.langs = ko.observableArray([]);
this.languages = ko.computed(function () {
var sUserLanguage = self.userLanguage();
return _.map(self.langs(), function (sLanguage) {
return {
'key': sLanguage,
'user': sLanguage === self.sUserLanguage,
'user': sLanguage === sUserLanguage,
'selected': ko.observable(false),
'fullName': Utils.convertLangName(sLanguage)
};
@ -66,7 +67,7 @@
LanguagesPopupView.prototype.onShow = function (fLanguage, aLangs, sUserLanguage)
{
this.fLang = fLanguage;
this.sUserLanguage = sUserLanguage || '';
this.userLanguage(sUserLanguage || '');
this.langs(aLangs);
};
@ -74,7 +75,7 @@
LanguagesPopupView.prototype.onHide = function ()
{
this.fLang = null;
this.sUserLanguage = '';
this.userLanguage('');
this.langs([]);
};