mirror of
https://github.com/the-djmaze/snappymail.git
synced 2025-10-09 13:17:32 +08:00
Small fixes
This commit is contained in:
parent
256b624366
commit
1638b55411
15 changed files with 41 additions and 45 deletions
|
@ -19,8 +19,8 @@
|
||||||
*
|
*
|
||||||
* @extends AbstractComponent
|
* @extends AbstractComponent
|
||||||
*/
|
*/
|
||||||
function AbstracCheckbox(oParams) {
|
function AbstracCheckbox(oParams)
|
||||||
|
{
|
||||||
AbstractComponent.call(this);
|
AbstractComponent.call(this);
|
||||||
|
|
||||||
this.value = oParams.value;
|
this.value = oParams.value;
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
this.inverted = Utils.isUnd(oParams.inverted) ? false : !!oParams.inverted;
|
this.inverted = Utils.isUnd(oParams.inverted) ? false : !!oParams.inverted;
|
||||||
|
|
||||||
this.labeled = !Utils.isUnd(oParams.label);
|
this.labeled = !Utils.isUnd(oParams.label);
|
||||||
};
|
}
|
||||||
|
|
||||||
_.extend(AbstracCheckbox.prototype, AbstractComponent.prototype);
|
_.extend(AbstracCheckbox.prototype, AbstractComponent.prototype);
|
||||||
|
|
||||||
|
|
|
@ -19,8 +19,8 @@
|
||||||
*
|
*
|
||||||
* @extends AbstractComponent
|
* @extends AbstractComponent
|
||||||
*/
|
*/
|
||||||
function AbstracRadio(oParams) {
|
function AbstracRadio(oParams)
|
||||||
|
{
|
||||||
AbstractComponent.call(this);
|
AbstractComponent.call(this);
|
||||||
|
|
||||||
this.values = ko.observableArray([]);
|
this.values = ko.observableArray([]);
|
||||||
|
@ -47,7 +47,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
this.click = _.bind(this.click, this);
|
this.click = _.bind(this.click, this);
|
||||||
};
|
}
|
||||||
|
|
||||||
AbstracRadio.prototype.click = function(oValue) {
|
AbstracRadio.prototype.click = function(oValue) {
|
||||||
if (!this.readOnly && oValue)
|
if (!this.readOnly && oValue)
|
||||||
|
|
|
@ -34,11 +34,11 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {AbstractComponent} fClassObject
|
* @param {*} ClassObject
|
||||||
* @param {string} sTemplateID
|
* @param {string} sTemplateID
|
||||||
* @return {Object}
|
* @return {Object}
|
||||||
*/
|
*/
|
||||||
AbstractComponent.componentExportHelper = function (fClassObject, sTemplateID) {
|
AbstractComponent.componentExportHelper = function (ClassObject, sTemplateID) {
|
||||||
return {
|
return {
|
||||||
viewModel: {
|
viewModel: {
|
||||||
createViewModel: function(oParams, oCmponentInfo) {
|
createViewModel: function(oParams, oCmponentInfo) {
|
||||||
|
@ -58,7 +58,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return new fClassObject(oParams);
|
return new ClassObject(oParams);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
template: {
|
template: {
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
*
|
*
|
||||||
* @extends AbstractComponent
|
* @extends AbstractComponent
|
||||||
*/
|
*/
|
||||||
function AbstractInput(oParams) {
|
function AbstractInput(oParams)
|
||||||
|
{
|
||||||
AbstractComponent.call(this);
|
AbstractComponent.call(this);
|
||||||
|
|
||||||
this.value = oParams.value || '';
|
this.value = oParams.value || '';
|
||||||
|
@ -63,7 +63,7 @@
|
||||||
this.trigger.subscribe(this.setTriggerState, this)
|
this.trigger.subscribe(this.setTriggerState, this)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
AbstractInput.prototype.setTriggerState = function (nValue)
|
AbstractInput.prototype.setTriggerState = function (nValue)
|
||||||
{
|
{
|
||||||
|
|
|
@ -16,10 +16,10 @@
|
||||||
*
|
*
|
||||||
* @extends AbstracCheckbox
|
* @extends AbstracCheckbox
|
||||||
*/
|
*/
|
||||||
function CheckboxComponent(oParams) {
|
function CheckboxComponent(oParams)
|
||||||
|
{
|
||||||
AbstracCheckbox.call(this, oParams);
|
AbstracCheckbox.call(this, oParams);
|
||||||
};
|
}
|
||||||
|
|
||||||
_.extend(CheckboxComponent.prototype, AbstracCheckbox.prototype);
|
_.extend(CheckboxComponent.prototype, AbstracCheckbox.prototype);
|
||||||
|
|
||||||
|
|
|
@ -6,9 +6,6 @@
|
||||||
var
|
var
|
||||||
_ = require('_'),
|
_ = require('_'),
|
||||||
|
|
||||||
Enums = require('Common/Enums'),
|
|
||||||
Utils = require('Common/Utils'),
|
|
||||||
|
|
||||||
AbstractInput = require('Component/AbstractInput')
|
AbstractInput = require('Component/AbstractInput')
|
||||||
;
|
;
|
||||||
|
|
||||||
|
@ -19,10 +16,10 @@
|
||||||
*
|
*
|
||||||
* @extends AbstractInput
|
* @extends AbstractInput
|
||||||
*/
|
*/
|
||||||
function InputComponent(oParams) {
|
function InputComponent(oParams)
|
||||||
|
{
|
||||||
AbstractInput.call(this, oParams);
|
AbstractInput.call(this, oParams);
|
||||||
};
|
}
|
||||||
|
|
||||||
_.extend(InputComponent.prototype, AbstractInput.prototype);
|
_.extend(InputComponent.prototype, AbstractInput.prototype);
|
||||||
|
|
||||||
|
|
|
@ -17,8 +17,8 @@
|
||||||
*
|
*
|
||||||
* @extends AbstracCheckbox
|
* @extends AbstracCheckbox
|
||||||
*/
|
*/
|
||||||
function CheckboxMaterialDesignComponent(oParams) {
|
function CheckboxMaterialDesignComponent(oParams)
|
||||||
|
{
|
||||||
AbstracCheckbox.call(this, oParams);
|
AbstracCheckbox.call(this, oParams);
|
||||||
|
|
||||||
this.animationBox = ko.observable(false).extend({'falseTimeout': 200});
|
this.animationBox = ko.observable(false).extend({'falseTimeout': 200});
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
this.triggerAnimation(bValue);
|
this.triggerAnimation(bValue);
|
||||||
}, this)
|
}, this)
|
||||||
);
|
);
|
||||||
};
|
}
|
||||||
|
|
||||||
_.extend(CheckboxMaterialDesignComponent.prototype, AbstracCheckbox.prototype);
|
_.extend(CheckboxMaterialDesignComponent.prototype, AbstracCheckbox.prototype);
|
||||||
|
|
||||||
|
|
|
@ -16,10 +16,10 @@
|
||||||
*
|
*
|
||||||
* @extends AbstracRadio
|
* @extends AbstracRadio
|
||||||
*/
|
*/
|
||||||
function RadioComponent(oParams) {
|
function RadioComponent(oParams)
|
||||||
|
{
|
||||||
AbstracRadio.call(this, oParams);
|
AbstracRadio.call(this, oParams);
|
||||||
};
|
}
|
||||||
|
|
||||||
_.extend(RadioComponent.prototype, AbstracRadio.prototype);
|
_.extend(RadioComponent.prototype, AbstracRadio.prototype);
|
||||||
|
|
||||||
|
|
|
@ -19,8 +19,8 @@
|
||||||
*
|
*
|
||||||
* @extends AbstractComponent
|
* @extends AbstractComponent
|
||||||
*/
|
*/
|
||||||
function SaveTriggerComponent(oParams) {
|
function SaveTriggerComponent(oParams)
|
||||||
|
{
|
||||||
AbstractComponent.call(this);
|
AbstractComponent.call(this);
|
||||||
|
|
||||||
this.element = oParams.element || null;
|
this.element = oParams.element || null;
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
this.element.hide();
|
this.element.hide();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
SaveTriggerComponent.prototype.setState = function (nValue)
|
SaveTriggerComponent.prototype.setState = function (nValue)
|
||||||
{
|
{
|
||||||
|
@ -75,8 +75,8 @@
|
||||||
.find('.animated').show().addClass('visible')
|
.find('.animated').show().addClass('visible')
|
||||||
;
|
;
|
||||||
break;
|
break;
|
||||||
case Enums.SaveSettingsStep.Idle:
|
|
||||||
default:
|
default:
|
||||||
|
case Enums.SaveSettingsStep.Idle:
|
||||||
this.element
|
this.element
|
||||||
.find('.animated').hide()
|
.find('.animated').hide()
|
||||||
.end()
|
.end()
|
||||||
|
|
|
@ -18,8 +18,8 @@
|
||||||
*
|
*
|
||||||
* @extends AbstractInput
|
* @extends AbstractInput
|
||||||
*/
|
*/
|
||||||
function SelectComponent(oParams) {
|
function SelectComponent(oParams)
|
||||||
|
{
|
||||||
AbstractInput.call(this, oParams);
|
AbstractInput.call(this, oParams);
|
||||||
|
|
||||||
this.options = oParams.options || '';
|
this.options = oParams.options || '';
|
||||||
|
@ -28,7 +28,7 @@
|
||||||
this.optionsValue = oParams.optionsValue || null;
|
this.optionsValue = oParams.optionsValue || null;
|
||||||
|
|
||||||
this.defautOptionsAfterRender = Utils.defautOptionsAfterRender;
|
this.defautOptionsAfterRender = Utils.defautOptionsAfterRender;
|
||||||
};
|
}
|
||||||
|
|
||||||
_.extend(SelectComponent.prototype, AbstractInput.prototype);
|
_.extend(SelectComponent.prototype, AbstractInput.prototype);
|
||||||
|
|
||||||
|
|
|
@ -18,13 +18,13 @@
|
||||||
*
|
*
|
||||||
* @extends AbstractInput
|
* @extends AbstractInput
|
||||||
*/
|
*/
|
||||||
function TextAreaComponent(oParams) {
|
function TextAreaComponent(oParams)
|
||||||
|
{
|
||||||
AbstractInput.call(this, oParams);
|
AbstractInput.call(this, oParams);
|
||||||
|
|
||||||
this.rows = oParams.rows || 5;
|
this.rows = oParams.rows || 5;
|
||||||
this.spellcheck = Utils.isUnd(oParams.spellcheck) ? false : !!oParams.spellcheck;
|
this.spellcheck = Utils.isUnd(oParams.spellcheck) ? false : !!oParams.spellcheck;
|
||||||
};
|
}
|
||||||
|
|
||||||
_.extend(TextAreaComponent.prototype, AbstractInput.prototype);
|
_.extend(TextAreaComponent.prototype, AbstractInput.prototype);
|
||||||
|
|
||||||
|
|
|
@ -11,10 +11,8 @@
|
||||||
Utils = require('Common/Utils'),
|
Utils = require('Common/Utils'),
|
||||||
Events = require('Common/Events'),
|
Events = require('Common/Events'),
|
||||||
|
|
||||||
Settings = require('Storage/Settings'),
|
|
||||||
Data = require('Storage/User/Data'),
|
Data = require('Storage/User/Data'),
|
||||||
Cache = require('Storage/User/Cache'),
|
Cache = require('Storage/User/Cache'),
|
||||||
Remote = require('Storage/User/Remote'),
|
|
||||||
|
|
||||||
AbstractScreen = require('Knoin/AbstractScreen')
|
AbstractScreen = require('Knoin/AbstractScreen')
|
||||||
;
|
;
|
||||||
|
|
|
@ -503,7 +503,8 @@ gulp.task('rl', ['rainloop']);
|
||||||
gulp.task('rl+', ['rainloop+']);
|
gulp.task('rl+', ['rainloop+']);
|
||||||
gulp.task('build', ['rainloop']);
|
gulp.task('build', ['rainloop']);
|
||||||
gulp.task('build+', ['rainloop+']);
|
gulp.task('build+', ['rainloop+']);
|
||||||
gulp.task('b', ['rainloop']);
|
gulp.task('b', ['build']);
|
||||||
gulp.task('b+', ['rainloop+']);
|
gulp.task('b+', ['build+']);
|
||||||
|
|
||||||
gulp.task('own', ['owncloud']);
|
gulp.task('own', ['owncloud']);
|
||||||
|
gulp.task('js:hint', ['js:lint']);
|
|
@ -961,7 +961,7 @@ class Actions
|
||||||
static $bResult = null;
|
static $bResult = null;
|
||||||
if (null === $bResult)
|
if (null === $bResult)
|
||||||
{
|
{
|
||||||
// $bResult = $this->licenseParser($this->licenseHelper(false, true));
|
$bResult = $this->licenseParser($this->licenseHelper(false, true));
|
||||||
$bResult = true;
|
$bResult = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -79,7 +79,7 @@
|
||||||
</a>
|
</a>
|
||||||
<a href="#" tabindex="-1" class="language-button" data-bind="click: selectLanguage, tooltip: 'POPUPS_LANGUAGES/TITLE_LANGUAGES',
|
<a href="#" tabindex="-1" class="language-button" data-bind="click: selectLanguage, tooltip: 'POPUPS_LANGUAGES/TITLE_LANGUAGES',
|
||||||
visible: allowLanguagesOnLogin() && !socialLoginEnabled()">
|
visible: allowLanguagesOnLogin() && !socialLoginEnabled()">
|
||||||
<i class="icon-world"></i>
|
<i data-bind="css: langRequest() ? 'icon-spinner animated' : 'icon-world'"></i>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -89,7 +89,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="e-languages thm-languages" data-bind="visible: allowLanguagesOnLogin() && socialLoginEnabled()">
|
<div class="e-languages thm-languages" data-bind="visible: allowLanguagesOnLogin() && socialLoginEnabled()">
|
||||||
<label class="flag-selector">
|
<label class="flag-selector">
|
||||||
<i class="icon-world"></i>
|
<i data-bind="css: langRequest() ? 'icon-spinner animated' : 'icon-world'"></i>
|
||||||
|
|
||||||
<span class="flag-name" data-bind="text: mainLanguageFullName, click: selectLanguage"></span>
|
<span class="flag-name" data-bind="text: mainLanguageFullName, click: selectLanguage"></span>
|
||||||
</label>
|
</label>
|
||||||
|
|
Loading…
Add table
Reference in a new issue