Gmail like message list navigation (#70)

This commit is contained in:
RainLoop Team 2014-04-10 04:15:46 +04:00
parent da88e0d2b5
commit fbf17aa6f3
14 changed files with 556 additions and 543 deletions

View file

@ -18,24 +18,33 @@ function Selector(oKoList, oKoSelectedItem,
return _.filter(this.list(), function (oItem) {
return oItem.checked();
});
}, this);
}, this).extend({'rateLimit': 0});
this.isListChecked = ko.computed(function () {
return 0 < this.listChecked().length;
}, this);
this.lastSelectedItem = ko.observable(null);
this.focusedItem = ko.observable(null);
this.selectedItem = oKoSelectedItem;
this.selectedItemUseCallback = true;
this.itemSelectedTrottle = _.throttle(_.bind(this.itemSelected, this), 300);
this.listChecked.subscribe(function (aItems) {
if (0 < aItems.length)
{
this.selectedItem(null);
if (null === this.selectedItem())
{
this.selectedItem.valueHasMutated();
}
else
{
this.selectedItem(null);
}
}
else if (this.bAutoSelect && this.lastSelectedItem())
else if (this.bAutoSelect && this.focusedItem())
{
this.selectedItem(this.lastSelectedItem());
this.selectedItem(this.focusedItem());
}
}, this);
@ -43,17 +52,21 @@ function Selector(oKoList, oKoSelectedItem,
if (oItem)
{
if (this.bAutoSelect)
{
this.lastSelectedItem(oItem);
}
if (this.isListChecked())
{
_.each(this.listChecked(), function (oSubItem) {
oSubItem.checked(false);
});
}
if (this.selectedItemUseCallback)
{
this.itemSelectedTrottle(oItem);
}
}
else if (this.selectedItemUseCallback)
{
this.itemSelected(null);
}
}, this);
@ -96,37 +109,12 @@ function Selector(oKoList, oKoSelectedItem,
this.sLastUid = '';
this.oCallbacks = {};
this.iSelectTimer = 0;
this.bUseKeyboard = true;
this.bAutoSelect = true;
this.emptyFunction = function () {};
this.useItemSelectCallback = true;
this.selectedItem.subscribe(function (oItem) {
if (oItem)
{
this.sLastUid = this.getItemUid(oItem);
this.focusedItem(oItem);
}
if (this.useItemSelectCallback)
{
if (oItem)
{
this.selectItemCallbacks(oItem);
}
else
{
this.selectItemCallbacks(null);
}
}
}, this);
this.focusedItem.subscribe(function (oItem) {
if (oItem)
{
@ -135,47 +123,55 @@ function Selector(oKoList, oKoSelectedItem,
}, this);
var
aCache = [],
aCheckedCache = [],
mFocused = null,
mSelected = null
;
this.list.subscribe(function () {
this.list.subscribe(function (aItems) {
var self = this, aItems = this.list();
var self = this;
if (Utils.isArray(aItems))
{
_.each(aItems, function (oItem) {
if (oItem.checked())
if (oItem)
{
aCheckedCache.push(self.getItemUid(oItem));
var sUid = self.getItemUid(oItem);
aCache.push(sUid);
if (oItem.checked())
{
aCheckedCache.push(sUid);
}
if (null === mFocused && oItem.focused())
{
mFocused = sUid;
}
if (null === mSelected && oItem.selected())
{
mSelected = sUid;
}
}
if (null === mFocused && oItem.focused())
{
mFocused = self.getItemUid(oItem);
}
if (null === mSelected && oItem.selected())
{
mSelected = self.getItemUid(oItem);
}
});
}
}, this, 'beforeChange');
this.list.subscribe(function (aItems) {
this.useItemSelectCallback = false;
var
self = this,
oTemp = null,
bGetNext = false,
aUids = [],
mNextFocused = mFocused,
bChecked = false,
bSelected = false,
iLen = 0
;
this.selectedItemUseCallback = false;
this.focusedItem(null);
this.selectedItem(null);
@ -184,15 +180,9 @@ function Selector(oKoList, oKoSelectedItem,
iLen = aCheckedCache.length;
_.each(aItems, function (oItem) {
var sUid = self.getItemUid(oItem);
if (0 < iLen && -1 < Utils.inArray(sUid, aCheckedCache))
{
bChecked = true;
oItem.checked(true);
iLen--;
}
aUids.push(sUid);
if (null !== mFocused && mFocused === sUid)
{
@ -200,28 +190,84 @@ function Selector(oKoList, oKoSelectedItem,
mFocused = null;
}
if (0 < iLen && -1 < Utils.inArray(sUid, aCheckedCache))
{
bChecked = true;
oItem.checked(true);
iLen--;
}
if (!bChecked && null !== mSelected && mSelected === sUid)
{
bSelected = true;
self.selectedItem(oItem);
mSelected = null;
}
});
this.selectedItemUseCallback = true;
if (!bChecked && !bSelected && this.bAutoSelect)
{
if (self.focusedItem())
{
self.selectedItem(self.focusedItem());
}
else if (0 < aItems.length)
{
if (null !== mNextFocused)
{
bGetNext = false;
mNextFocused = _.find(aCache, function (sUid) {
if (bGetNext && -1 < Utils.inArray(sUid, aUids))
{
return sUid;
}
else if (mNextFocused === sUid)
{
bGetNext = true;
}
return false;
});
if (mNextFocused)
{
oTemp = _.find(aItems, function (oItem) {
return mNextFocused === self.getItemUid(oItem);
});
}
}
self.selectedItem(oTemp || null);
self.focusedItem(self.selectedItem());
}
}
}
this.useItemSelectCallback = true;
aCache = [];
aCheckedCache = [];
mFocused = null;
mSelected = null;
}, this);
this.selectItemCallbacksThrottle = _.debounce(this.selectItemCallbacks, 300);
}
Selector.prototype.selectItemCallbacks = function (oItem)
Selector.prototype.itemSelected = function (oItem)
{
(this.oCallbacks['onItemSelect'] || this.emptyFunction)(oItem);
if (this.isListChecked())
{
if (!oItem)
{
(this.oCallbacks['onItemSelect'] || this.emptyFunction)(oItem || null);
}
}
else
{
if (oItem)
{
(this.oCallbacks['onItemSelect'] || this.emptyFunction)(oItem);
}
}
};
Selector.prototype.goDown = function (bForceSelect)
@ -255,7 +301,7 @@ Selector.prototype.init = function (oContentVisible, oContentScrollable, sKeySco
}
})
.on('click', this.sItemSelector, function (oEvent) {
self.actionClick(ko.dataFor(this), oEvent, true);
self.actionClick(ko.dataFor(this), oEvent);
})
.on('click', this.sItemCheckedSelector, function (oEvent) {
var oItem = ko.dataFor(this);
@ -267,7 +313,7 @@ Selector.prototype.init = function (oContentVisible, oContentScrollable, sKeySco
}
else
{
self.sLastUid = self.getItemUid(oItem);
self.focusedItem(oItem);
oItem.checked(!oItem.checked());
}
}
@ -275,15 +321,12 @@ Selector.prototype.init = function (oContentVisible, oContentScrollable, sKeySco
;
key('enter', sKeyScope, function () {
if (!self.bAutoSelect)
if (self.focusedItem())
{
if (self.focusedItem())
{
self.actionClick(self.focusedItem());
}
return false;
self.actionClick(self.focusedItem());
}
return false;
});
key('ctrl+up, command+up, ctrl+down, command+down', sKeyScope, function () {
@ -372,7 +415,6 @@ Selector.prototype.getItemUid = function (oItem)
Selector.prototype.newSelectPosition = function (iEventKeyCode, bShiftKey, bForceSelect)
{
var
self = this,
iIndex = 0,
iPageStep = 10,
bNext = false,
@ -416,7 +458,6 @@ Selector.prototype.newSelectPosition = function (iEventKeyCode, bShiftKey, bForc
break;
case Enums.EventKeyCode.Down:
case Enums.EventKeyCode.Insert:
// case Enums.EventKeyCode.Space:
if (bNext)
{
oResult = oItem;
@ -473,6 +514,8 @@ Selector.prototype.newSelectPosition = function (iEventKeyCode, bShiftKey, bForc
if (oResult)
{
this.focusedItem(oResult);
if (oFocused)
{
if (bShiftKey)
@ -488,15 +531,10 @@ Selector.prototype.newSelectPosition = function (iEventKeyCode, bShiftKey, bForc
}
}
this.focusedItem(oResult);
if ((this.bAutoSelect || !!bForceSelect) && !this.isListChecked() && Enums.EventKeyCode.Space !== iEventKeyCode)
if ((this.bAutoSelect || !!bForceSelect) &&
!this.isListChecked() && Enums.EventKeyCode.Space !== iEventKeyCode)
{
window.clearTimeout(this.iSelectTimer);
this.iSelectTimer = window.setTimeout(function () {
self.iSelectTimer = 0;
self.actionClick(oResult);
}, 300);
this.selectedItem(oResult);
}
this.scrollToFocused();
@ -511,6 +549,8 @@ Selector.prototype.newSelectPosition = function (iEventKeyCode, bShiftKey, bForc
{
oFocused.checked(!oFocused.checked());
}
this.focusedItem(oFocused);
}
};
@ -622,18 +662,20 @@ Selector.prototype.actionClick = function (oItem, oEvent)
oItem.checked(!oItem.checked());
this.eventClickFunction(oItem, oEvent);
this.focusedItem(oItem);
}
else if (oEvent.ctrlKey)
{
bClick = false;
this.sLastUid = sUid;
this.focusedItem(oItem);
oItem.checked(!oItem.checked());
}
}
if (bClick)
{
this.focusedItem(oItem);
this.selectedItem(oItem);
}
}

View file

@ -55,10 +55,12 @@ MailBoxScreen.prototype.onRoute = function (sFolderHash, iPage, sSearch, bPrevie
{
if (Utils.isUnd(bPreview) ? false : !!bPreview)
{
if (Enums.Layout.NoPreview === RL.data().layout() && !RL.data().message())
{
RL.historyBack();
}
_.delay(function () {
if (Enums.Layout.NoPreview === RL.data().layout() && !RL.data().message())
{
RL.historyBack();
}
}, 5);
}
else
{

View file

@ -192,7 +192,7 @@ function WebMailDataStorage()
// message list
this.staticMessageList = [];
this.messageList = ko.observableArray([]);
this.messageList = ko.observableArray([]).extend({'rateLimit': 0});
this.messageListCount = ko.observable(0);
this.messageListSearch = ko.observable('');
@ -263,6 +263,11 @@ function WebMailDataStorage()
{
this.message.focused(false);
this.hideMessageBodies();
if (Enums.Layout.NoPreview === RL.data().layout())
{
RL.historyBack();
}
}
else if (Enums.Layout.NoPreview === this.layout())
{
@ -298,12 +303,16 @@ function WebMailDataStorage()
}, this);
this.currentMessage = ko.observable(null);
this.messageListChecked = ko.computed(function () {
return _.filter(this.messageList(), function (oItem) {
return oItem.checked();
});
}, this);
}, this).extend({'rateLimit': 0});
this.hasCheckedMessages = ko.computed(function () {
return 0 < this.messageListChecked().length;
}, this).extend({'rateLimit': 0});
this.messageListCheckedOrSelected = ko.computed(function () {
@ -752,9 +761,6 @@ WebMailDataStorage.prototype.removeMessagesFromList = function (
iUnseenCount = 0,
oData = RL.data(),
oCache = RL.cache(),
bMoveSelected = false,
bGetNext = false,
oNextMessage = null,
aMessageList = oData.messageList(),
oFromFolder = RL.cache().getFolderFromCacheList(sFromFolderFullNameRaw),
oToFolder = '' === sToFolderFullNameRaw ? null : oCache.getFolderFromCacheList(sToFolderFullNameRaw || ''),
@ -770,11 +776,6 @@ WebMailDataStorage.prototype.removeMessagesFromList = function (
{
iUnseenCount++;
}
if (oMessage.selected())
{
bMoveSelected = true;
}
});
if (oFromFolder && !bCopy)
@ -810,29 +811,6 @@ WebMailDataStorage.prototype.removeMessagesFromList = function (
}
else
{
// select next message // TODO
// if (bMoveSelected)
// {
// _.each(aMessageList, function (oMessage) {
// if (!oNextMessage && oMessage)
// {
// if (bGetNext && !oMessage.checked() && !oMessage.deleted() && !oMessage.selected())
// {
// oNextMessage = oMessage;
// }
// else if (!bGetNext && oMessage.selected())
// {
// bGetNext = true;
// }
// }
// });
//
// if (oNextMessage)
// {
// this.currentMessage(oNextMessage);
// }
// }
oData.messageListIsNotCompleted(true);
_.each(aMessages, function (oMessage) {
@ -1046,7 +1024,6 @@ WebMailDataStorage.prototype.setMessageList = function (oData, bCached)
iLen = 0,
iCount = 0,
iOffset = 0,
aPrevList = [],
aList = [],
iUtc = moment().unix(),
aStaticList = oRainLoopData.staticMessageList,
@ -1140,26 +1117,9 @@ WebMailDataStorage.prototype.setMessageList = function (oData, bCached)
oRainLoopData.messageListEndFolder(Utils.isNormal(oData.Result.Folder) ? oData.Result.Folder : '');
oRainLoopData.messageListPage(Math.ceil((iOffset / oRainLoopData.messagesPerPage()) + 1));
aPrevList = oRainLoopData.messageList();
if (aPrevList.length !== aList.length)
{
oRainLoopData.messageList(aList);
}
else if (this.calculateMessageListHash(aPrevList) !== this.calculateMessageListHash(aList))
{
oRainLoopData.messageList(aList);
}
aPrevList = [];
oRainLoopData.messageList(aList);
oRainLoopData.messageListIsNotCompleted(false);
oMessage = oRainLoopData.message();
// TODO
// if (oMessage && oRainLoopData.messageList.setSelectedByUid)
// {
// oRainLoopData.messageList.setSelectedByUid(oMessage.generateUid());
// }
if (aStaticList.length < aList.length)
{
oRainLoopData.staticMessageList = aList;

View file

@ -230,7 +230,7 @@ html.rl-no-preview-pane {
}
&.focused .sidebarParent {
background-color: #bbb !important;
background-color: #ccc !important;
}
&.e-single-line {
@ -471,10 +471,6 @@ html.rl-no-preview-pane {
background-color: #398CF2 !important;
}
&.focused .sidebarParent {
background-color: darken(#398CF2, 5%) !important;
}
.delimiter {
background-color: #398CF2;
.opacity(20);

View file

@ -38,6 +38,21 @@ html.rl-no-preview-pane {
background-color: #fff;
.b-message-view-checked-helper {
text-align: center;
font-size: 70px;
line-height: 70px;
padding-top: 140px;
color: #999;
.icon-mail {
font-size: 100px;
font-size: 50px;
line-height: 90px;
padding-left: 10px;
}
}
.b-message-view-desc {
text-align: center;
font-size: 24px;

View file

@ -24,6 +24,8 @@ function MailBoxMessageViewViewModel()
this.keyScope = oData.keyScope;
this.message = oData.message;
this.currentMessage = oData.currentMessage;
this.messageListChecked = oData.messageListChecked;
this.hasCheckedMessages = oData.hasCheckedMessages;
this.messageLoading = oData.messageLoading;
this.messageLoadingThrottle = oData.messageLoadingThrottle;
this.messagesBodiesDom = oData.messagesBodiesDom;
@ -38,31 +40,24 @@ function MailBoxMessageViewViewModel()
this.fullScreenMode = oData.messageFullScreenMode;
this.showFullInfo = ko.observable(false);
this.messageDomFocused = ko.observable(false);
this.messageDomFocused = ko.observable(false).extend({'rateLimit': 0});
this.messageVisibility = ko.computed(function () {
return !this.messageLoadingThrottle() && !!this.message();
}, this);
this.message.subscribe(function (oMessage) {
if (!oMessage && this.currentMessage())
if (!oMessage)
{
this.currentMessage(null);
}
}, this);
this.canBeRepliedOrForwarded = this.messageVisibility;
// commands
this.closeMessage = Utils.createCommand(this, function () {
if (Enums.Layout.NoPreview === oData.layout())
{
RL.historyBack();
}
else
{
oData.message(null);
}
oData.message(null);
});
this.replyCommand = createCommandHelper(Enums.ComposeType.Reply);
@ -138,7 +133,6 @@ function MailBoxMessageViewViewModel()
return this.message() ? this.message().pgpSignedVerifyUser() : '';
}, this);
this.message.subscribe(function (oMessage) {
this.messageActiveDom(null);
@ -392,11 +386,7 @@ MailBoxMessageViewViewModel.prototype.escShortcuts = function ()
}
else
{
this.message.focused(false);
if (Enums.Layout.NoPreview === RL.data().layout())
{
RL.historyBack();
}
this.message(null);
}
return false;

View file

@ -123,7 +123,11 @@
</div>
<div class="b-content thm-message-view-background-color">
<div>
<div class="b-message-view-desc" data-bind="visible: !message() && '' === messageError()">
<div class="b-message-view-checked-helper" data-bind="visible: !message() && '' === messageError() && hasCheckedMessages()">
<span data-bind="text: messageListChecked().length"></span>
<i class="icon-mail"></i>
</div>
<div class="b-message-view-desc" data-bind="visible: !message() && '' === messageError() && !hasCheckedMessages()">
<span class="i18n" data-i18n-text="MESSAGE/MESSAGE_VIEW_DESC"></span>
</div>
<div class="b-message-view-desc error" data-bind="visible: !message() && '' !== messageError()">

View file

@ -637,7 +637,7 @@
border-radius: 8px;
}
/*! normalize.css 2012-03-11T12:53 UTC - http://github.com/necolas/normalize.css */
/* =============================================================================
@ -1142,7 +1142,7 @@ table {
border-collapse: collapse;
border-spacing: 0;
}
@charset "UTF-8";
@font-face {
@ -1483,7 +1483,7 @@ table {
.icon-filter:before {
content: "\e063";
}
/** initial setup **/
.nano {
/*
@ -1600,7 +1600,7 @@ table {
.nano > .pane2:hover > .slider2, .nano > .pane2.active > .slider2 {
background-color: rgba(0, 0, 0, 0.4);
}
/* Magnific Popup CSS */
.mfp-bg {
top: 0;
@ -1965,7 +1965,7 @@ img.mfp-img {
right: 0;
padding-top: 0; }
/* overlay at start */
.mfp-fade.mfp-bg {
@ -2011,7 +2011,7 @@ img.mfp-img {
-moz-transform: translateX(50px);
transform: translateX(50px);
}
.simple-pace {
-webkit-pointer-events: none;
pointer-events: none;
@ -2082,7 +2082,7 @@ img.mfp-img {
@keyframes simple-pace-stripe-animation {
0% { transform: none; transform: none; }
100% { transform: translate(-32px, 0); transform: translate(-32px, 0); }
}
}
.inputosaurus-container {
background-color:#fff;
border:1px solid #bcbec0;
@ -2150,7 +2150,7 @@ img.mfp-img {
box-shadow:none;
}
.inputosaurus-input-hidden { display:none; }
.flag-wrapper {
width: 24px;
height: 16px;
@ -2194,7 +2194,7 @@ img.mfp-img {
.flag.flag-pt-br {background-position: -192px -11px}
.flag.flag-cn, .flag.flag-zh-tw, .flag.flag-zh-cn, .flag.flag-zh-hk {background-position: -208px -22px}
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
.clearfix {
*zoom: 1;
@ -6844,7 +6844,7 @@ html.rl-no-preview-pane .messageList.message-selected {
height: 100%;
}
.messageList .b-content .messageListItem.focused .sidebarParent {
background-color: #bbb !important;
background-color: #ccc !important;
}
.messageList .b-content .messageListItem.e-single-line {
height: 35px;
@ -7045,9 +7045,6 @@ html.rl-no-preview-pane .messageList.message-selected {
.messageList .b-content .messageListItem.selected .sidebarParent {
background-color: #398CF2 !important;
}
.messageList .b-content .messageListItem.selected.focused .sidebarParent {
background-color: #217ef0 !important;
}
.messageList .b-content .messageListItem.selected .delimiter {
background-color: #398CF2;
opacity: 0.2;
@ -7137,6 +7134,19 @@ html.rl-no-preview-pane .messageView.message-selected {
border-bottom-right-radius: 3px;
background-color: #fff;
}
.messageView .b-content .b-message-view-checked-helper {
text-align: center;
font-size: 70px;
line-height: 70px;
padding-top: 140px;
color: #999;
}
.messageView .b-content .b-message-view-checked-helper .icon-mail {
font-size: 100px;
font-size: 50px;
line-height: 90px;
padding-left: 10px;
}
.messageView .b-content .b-message-view-desc {
text-align: center;
font-size: 24px;

File diff suppressed because one or more lines are too long

View file

@ -1,5 +1,5 @@
/*! RainLoop Webmail Admin Module (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (window, $, ko, crossroads, hasher, _) {
/*! RainLoop Webmail Admin Module (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (window, $, ko, crossroads, hasher, _) {
'use strict';
@ -70,14 +70,14 @@ var
$document = $(window.document),
NotificationClass = window.Notification && window.Notification.requestPermission ? window.Notification : null
;
;
/*jshint onevar: false*/
/**
* @type {?AdminApp}
*/
var RL = null;
/*jshint onevar: true*/
/**
* @type {?}
*/
@ -221,7 +221,7 @@ if (Globals.bAllowPdfPreview && navigator && navigator.mimeTypes)
return oType && 'application/pdf' === oType.type;
});
}
Consts.Defaults = {};
Consts.Values = {};
Consts.DataImages = {};
@ -339,7 +339,7 @@ Consts.DataImages.UserDotPic = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA
* @type {string}
*/
Consts.DataImages.TranspPic = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQIW2NkAAIAAAoAAggA9GkAAAAASUVORK5CYII=';
/**
* @enum {string}
*/
@ -714,7 +714,7 @@ Enums.Notification = {
'UnknownNotification': 999,
'UnknownError': 999
};
Utils.trim = $.trim;
Utils.inArray = $.inArray;
Utils.isArray = _.isArray;
@ -2473,7 +2473,7 @@ Utils.restoreKeyFilter = function ()
};
}
};
// Base64 encode / decode
// http://www.webtoolkit.info/
@ -2636,7 +2636,7 @@ Base64 = {
}
};
/*jslint bitwise: false*/
/*jslint bitwise: false*/
ko.bindingHandlers.tooltip = {
'init': function (oElement, fValueAccessor) {
if (!Globals.bMobileDevice)
@ -3285,7 +3285,7 @@ ko.observable.fn.validateFunc = function (fFunc)
return this;
};
/**
* @constructor
*/
@ -3583,7 +3583,7 @@ LinkBuilder.prototype.socialFacebook = function ()
{
return this.sServer + 'SocialFacebook' + ('' !== this.sSpecSuffix ? '/' + this.sSpecSuffix + '/' : '');
};
/**
* @type {Object}
*/
@ -3677,7 +3677,7 @@ Plugins.settingsGet = function (sPluginSection, sName)
};
/**
* @constructor
*/
@ -3751,7 +3751,7 @@ CookieDriver.prototype.get = function (sKey)
return mResult;
};
/**
* @constructor
*/
@ -3822,7 +3822,7 @@ LocalStorageDriver.prototype.get = function (sKey)
return mResult;
};
/**
* @constructor
*/
@ -3865,7 +3865,7 @@ LocalStorage.prototype.get = function (iKey)
{
return this.oDriver ? this.oDriver.get('p' + iKey) : null;
};
/**
* @constructor
*/
@ -3878,7 +3878,7 @@ KnoinAbstractBoot.prototype.bootstart = function ()
{
};
/**
* @param {string=} sPosition = ''
* @param {string=} sTemplate = ''
@ -3967,7 +3967,7 @@ KnoinAbstractViewModel.prototype.registerPopupEscapeKey = function ()
return true;
});
};
/**
* @param {string} sScreenName
* @param {?=} aViewModels = []
@ -4043,7 +4043,7 @@ KnoinAbstractScreen.prototype.__start = function ()
this.oCross = oRoute;
}
};
/**
* @constructor
*/
@ -4432,7 +4432,7 @@ Knoin.prototype.bootstart = function ()
};
kn = new Knoin();
/**
* @param {string=} sEmail
* @param {string=} sName
@ -4796,7 +4796,7 @@ EmailModel.prototype.inputoTagLine = function ()
{
return 0 < this.name.length ? this.name + ' (' + this.email + ')' : this.email;
};
/**
* @constructor
* @extends KnoinAbstractViewModel
@ -5014,7 +5014,7 @@ PopupsDomainViewModel.prototype.clearForm = function ()
this.smtpAuth(true);
this.whiteList('');
};
/**
* @constructor
* @extends KnoinAbstractViewModel
@ -5151,7 +5151,7 @@ PopupsPluginViewModel.prototype.onBuild = function ()
}
}, this));
};
/**
* @constructor
* @extends KnoinAbstractViewModel
@ -5267,7 +5267,7 @@ PopupsActivateViewModel.prototype.validateSubscriptionKey = function ()
{
var sValue = this.key();
return '' === sValue || !!/^RL[\d]+-[A-Z0-9\-]+Z$/.test(Utils.trim(sValue));
};
};
/**
* @constructor
* @extends KnoinAbstractViewModel
@ -5327,7 +5327,7 @@ PopupsLanguagesViewModel.prototype.changeLanguage = function (sLang)
RL.data().mainLanguage(sLang);
this.cancelCommand();
};
/**
* @constructor
* @extends KnoinAbstractViewModel
@ -5435,7 +5435,7 @@ PopupsAskViewModel.prototype.onBuild = function ()
}, this));
};
/**
* @constructor
* @extends KnoinAbstractViewModel
@ -5522,7 +5522,7 @@ AdminLoginViewModel.prototype.onHide = function ()
{
this.loginFocus(false);
};
/**
* @param {?} oScreen
*
@ -5544,7 +5544,7 @@ AdminMenuViewModel.prototype.link = function (sRoute)
{
return '#/' + sRoute;
};
/**
* @constructor
* @extends KnoinAbstractViewModel
@ -5566,7 +5566,7 @@ AdminPaneViewModel.prototype.logoutClick = function ()
RL.remote().adminLogout(function () {
RL.loginAndLogoutReload();
});
};
};
/**
* @constructor
*/
@ -5666,7 +5666,7 @@ AdminGeneral.prototype.selectLanguage = function ()
{
kn.showScreenPopup(PopupsLanguagesViewModel);
};
/**
* @constructor
*/
@ -5718,7 +5718,7 @@ AdminLogin.prototype.onBuild = function ()
}, 50);
};
/**
* @constructor
*/
@ -5787,7 +5787,7 @@ AdminBranding.prototype.onBuild = function ()
}, 50);
};
/**
* @constructor
*/
@ -6007,7 +6007,7 @@ AdminContacts.prototype.onBuild = function ()
}, 50);
};
/**
* @constructor
*/
@ -6096,7 +6096,7 @@ AdminDomains.prototype.onDomainListChangeRequest = function ()
{
RL.reloadDomainList();
};
/**
* @constructor
*/
@ -6191,7 +6191,7 @@ AdminSecurity.prototype.phpInfoLink = function ()
{
return RL.link().phpInfo();
};
/**
* @constructor
*/
@ -6307,7 +6307,7 @@ AdminSocial.prototype.onBuild = function ()
}, 50);
};
/**
* @constructor
*/
@ -6404,7 +6404,7 @@ AdminPlugins.prototype.onPluginDisableRequest = function (sResult, oData)
RL.reloadPluginList();
};
/**
* @constructor
*/
@ -6502,7 +6502,7 @@ AdminPackages.prototype.installPackage = function (oPackage)
RL.remote().packageInstall(this.requestHelper(oPackage, true), oPackage);
}
};
/**
* @constructor
*/
@ -6553,7 +6553,7 @@ AdminLicensing.prototype.licenseExpiredMomentValue = function ()
{
var oDate = moment.unix(this.licenseExpired());
return oDate.format('LL') + ' (' + oDate.from(moment()) + ')';
};
};
/**
* @constructor
*/
@ -6644,7 +6644,7 @@ AbstractData.prototype.populateDataOnStart = function()
this.contactsIsAllowed(!!RL.settingsGet('ContactsIsAllowed'));
};
/**
* @constructor
* @extends AbstractData
@ -6678,7 +6678,7 @@ _.extend(AdminDataStorage.prototype, AbstractData.prototype);
AdminDataStorage.prototype.populateDataOnStart = function()
{
AbstractData.prototype.populateDataOnStart.call(this);
};
};
/**
* @constructor
*/
@ -6952,7 +6952,7 @@ AbstractAjaxRemoteStorage.prototype.jsVersion = function (fCallback, sVersion)
'Version': sVersion
});
};
/**
* @constructor
* @extends AbstractAjaxRemoteStorage
@ -7196,7 +7196,7 @@ AdminAjaxRemoteStorage.prototype.adminPing = function (fCallback)
{
this.defaultRequest(fCallback, 'AdminPing');
};
/**
* @constructor
*/
@ -7262,7 +7262,7 @@ AbstractCacheStorage.prototype.setEmailsPicsHashesData = function (oData)
{
this.oEmailsPicsHashes = oData;
};
/**
* @constructor
* @extends AbstractCacheStorage
@ -7273,7 +7273,7 @@ function AdminCacheStorage()
}
_.extend(AdminCacheStorage.prototype, AbstractCacheStorage.prototype);
/**
* @param {Array} aViewModels
* @constructor
@ -7451,7 +7451,7 @@ AbstractSettings.prototype.routes = function ()
['', oRules]
];
};
/**
* @constructor
* @extends KnoinAbstractScreen
@ -7466,7 +7466,7 @@ _.extend(AdminLoginScreen.prototype, KnoinAbstractScreen.prototype);
AdminLoginScreen.prototype.onShow = function ()
{
RL.setTitle('');
};
};
/**
* @constructor
* @extends AbstractSettings
@ -7486,7 +7486,7 @@ AdminSettingsScreen.prototype.onShow = function ()
// AbstractSettings.prototype.onShow.call(this);
RL.setTitle('');
};
};
/**
* @constructor
* @extends KnoinAbstractBoot
@ -7806,7 +7806,7 @@ AbstractApp.prototype.bootstart = function ()
ssm.ready();
};
/**
* @constructor
* @extends AbstractApp
@ -8045,7 +8045,7 @@ AdminApp.prototype.bootstart = function ()
* @type {AdminApp}
*/
RL = new AdminApp();
$html.addClass(Globals.bMobileDevice ? 'mobile' : 'no-mobile');
$window.keydown(Utils.killCtrlAandS).keyup(Utils.killCtrlAandS);
@ -8092,9 +8092,9 @@ window['__RLBOOT'] = function (fCall) {
window['__RLBOOT'] = null;
});
};
if (window.SimplePace) {
window.SimplePace.add(10);
}
}
}(window, jQuery, ko, crossroads, hasher, _));

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long