Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 12:09:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add build task in Grunt script.

Browse source 
Minor fixes
This commit is contained in:
RainLoop Team 2013-11-17 02:02:13 +04:00
parent ea4262e954
commit 67e6084276
18 changed files with 321 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -2991,6 +2991,20 @@ class Actions
return $this->DefaultResponse(__FUNCTION__, $bResult);
}
/**
* @return array
*/
public function DoJsInfo()
{
$bIsError = '1' === (string) $this->GetActionParam('IsError', '0');
$mData = $this->GetActionParam('Data', null);
$this->Logger()->WriteDump(is_array($mData) ? $mData : array(),
$bIsError ? \MailSo\Log\Enumerations\Type::ERROR : \MailSo\Log\Enumerations\Type::INFO, 'JS-INFO');
return $this->DefaultResponse(__FUNCTION__, true);
}
/**
* @return array
*/

26
rainloop/v/0.0.0/static/js/admin.js
View file

@ -1,4 +1,4 @@
/*! RainLoop Admin Module (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
/*! RainLoop Webmail Admin Module (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (window, $, ko, crossroads, hasher, _) {
'use strict';
@ -71,6 +71,7 @@ var
NotificationClass = window.Notification && window.Notification.requestPermission ? window.Notification : null
;
/*jshint onevar: false*/
/**
* @type {?AdminApp}
*/
@ -1737,7 +1738,7 @@ Utils.fakeMd5 = function(iLen)
while (sResult.length < iLen)
{
sResult += sLine.substr(window.Math.round(window.Math.random() * sLine.length), 1);
sResult += sLine.substr(Math.round(Math.random() * sLine.length), 1);
}
return sResult;
@ -1839,7 +1840,7 @@ Utils.settingsSaveHelperSimpleFunction = function (koTrigger, oContext)
Utils.resizeAndCrop = function (sUrl, iValue, fCallback)
{
var oTempImg = new Image();
var oTempImg = new window.Image();
oTempImg.onload = function() {
var
@ -2280,7 +2281,7 @@ ko.bindingHandlers.draggable = {
moveUp();
}
if(oEvent.pageY >= oOffset.top && oEvent.pageY <= oOffset.top + iTriggerZone)
if (oEvent.pageY >= oOffset.top && oEvent.pageY <= oOffset.top + iTriggerZone)
{
moveDown = function() {
$this.scrollTop($this.scrollTop() - iScrollSpeed);
@ -2291,7 +2292,7 @@ ko.bindingHandlers.draggable = {
moveDown();
}
}
});
});
};
oConf['stop'] = function() {
@ -5784,6 +5785,21 @@ AbstractAjaxRemoteStorage.prototype.jsError = function (fCallback, sMessage, sFi
'TimeOnPage': iTime
});
};
/**
* @param {?Function} fCallback
* @param {string} sType
* @param {Array=} mData = null
* @param {boolean=} bIsError = false
*/
AbstractAjaxRemoteStorage.prototype.jsInfo = function (fCallback, sType, mData, bIsError)
{
this.defaultRequest(fCallback, 'JsInfo', {
'Type': sType,
'Data': mData,
'IsError': (Utils.isUnd(bIsError) ? false : !!bIsError) ? '1' : '0'
});
};
/**
* @constructor

6
rainloop/v/0.0.0/static/js/admin.min.js vendored
View file

File diff suppressed because one or more lines are too long

42
rainloop/v/0.0.0/static/js/app.js
View file

@ -1,4 +1,4 @@
/*! RainLoop Webmail Module (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
/*! RainLoop Webmail Main Module (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (window, $, ko, crossroads, hasher, moment, Jua, _) {
'use strict';
@ -71,6 +71,7 @@ var
NotificationClass = window.Notification && window.Notification.requestPermission ? window.Notification : null
;
/*jshint onevar: false*/
/**
* @type {?RainLoopApp}
*/
@ -1737,7 +1738,7 @@ Utils.fakeMd5 = function(iLen)
while (sResult.length < iLen)
{
sResult += sLine.substr(window.Math.round(window.Math.random() * sLine.length), 1);
sResult += sLine.substr(Math.round(Math.random() * sLine.length), 1);
}
return sResult;
@ -1839,7 +1840,7 @@ Utils.settingsSaveHelperSimpleFunction = function (koTrigger, oContext)
Utils.resizeAndCrop = function (sUrl, iValue, fCallback)
{
var oTempImg = new Image();
var oTempImg = new window.Image();
oTempImg.onload = function() {
var
@ -2280,7 +2281,7 @@ ko.bindingHandlers.draggable = {
moveUp();
}
if(oEvent.pageY >= oOffset.top && oEvent.pageY <= oOffset.top + iTriggerZone)
if (oEvent.pageY >= oOffset.top && oEvent.pageY <= oOffset.top + iTriggerZone)
{
moveDown = function() {
$this.scrollTop($this.scrollTop() - iScrollSpeed);
@ -2291,7 +2292,7 @@ ko.bindingHandlers.draggable = {
moveDown();
}
}
});
});
};
oConf['stop'] = function() {
@ -8017,7 +8018,7 @@ PopupsComposeViewModel.prototype.saveMessageResponse = function (sResult, oData)
if (this.modalVisibility())
{
this.savedTime(window.Math.round((new window.Date()).getTime() / 1000));
this.savedTime(Math.round((new window.Date()).getTime() / 1000));
this.savedOrSendingText(
0 < this.savedTime() ? Utils.i18n('COMPOSE/SAVED_TIME', {
@ -13532,6 +13533,21 @@ AbstractAjaxRemoteStorage.prototype.jsError = function (fCallback, sMessage, sFi
'TimeOnPage': iTime
});
};
/**
* @param {?Function} fCallback
* @param {string} sType
* @param {Array=} mData = null
* @param {boolean=} bIsError = false
*/
AbstractAjaxRemoteStorage.prototype.jsInfo = function (fCallback, sType, mData, bIsError)
{
this.defaultRequest(fCallback, 'JsInfo', {
'Type': sType,
'Data': mData,
'IsError': (Utils.isUnd(bIsError) ? false : !!bIsError) ? '1' : '0'
});
};
/**
* @constructor
@ -15201,6 +15217,10 @@ function RainLoopApp()
this.iSuggestionsLimit = 0 === this.iSuggestionsLimit ? 20 : this.iSuggestionsLimit;
this.quotaDebounce = _.debounce(this.quota, 1000 * 30);
$.wakeUp(function (iSleepTime) {
RL.remote().jsInfo(Utils.emptyFunction, {'WakeUpTime': Math.round(iSleepTime / 1000)}, true);
}, {}, 60 * 60 * 1000);
}
_.extend(RainLoopApp.prototype, AbstractApp.prototype);
@ -15783,15 +15803,15 @@ RainLoopApp.prototype.bootstart = function ()
'tClose': Utils.i18n('MAGNIFIC_POPUP/CLOSE'),
'tLoading': Utils.i18n('MAGNIFIC_POPUP/LOADING'),
'gallery': {
'tPrev': Utils.i18n('MAGNIFIC_POPUP/GALLERY_PREV'),
'tNext': Utils.i18n('MAGNIFIC_POPUP/GALLERY_NEXT'),
'tCounter': Utils.i18n('MAGNIFIC_POPUP/GALLERY_COUNTER')
'tPrev': Utils.i18n('MAGNIFIC_POPUP/GALLERY_PREV'),
'tNext': Utils.i18n('MAGNIFIC_POPUP/GALLERY_NEXT'),
'tCounter': Utils.i18n('MAGNIFIC_POPUP/GALLERY_COUNTER')
},
'image': {
'tError': Utils.i18n('MAGNIFIC_POPUP/IMAGE_ERROR')
'tError': Utils.i18n('MAGNIFIC_POPUP/IMAGE_ERROR')
},
'ajax': {
'tError': Utils.i18n('MAGNIFIC_POPUP/AJAX_ERROR')
'tError': Utils.i18n('MAGNIFIC_POPUP/AJAX_ERROR')
}
});

14
rainloop/v/0.0.0/static/js/app.min.js vendored
View file

File diff suppressed because one or more lines are too long