From 1638b554119eb9d36b966fc595b3cee1428c7ffc Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Thu, 30 Oct 2014 19:09:48 +0400 Subject: [PATCH] Small fixes --- dev/Component/AbstracCheckbox.js | 6 +++--- dev/Component/AbstracRadio.js | 6 +++--- dev/Component/Abstract.js | 6 +++--- dev/Component/AbstractInput.js | 6 +++--- dev/Component/Checkbox.js | 6 +++--- dev/Component/Input.js | 9 +++------ dev/Component/MaterialDesign/Checkbox.js | 6 +++--- dev/Component/Radio.js | 6 +++--- dev/Component/SaveTrigger.js | 8 ++++---- dev/Component/Select.js | 6 +++--- dev/Component/TextArea.js | 6 +++--- dev/Screen/User/MailBox.js | 2 -- gulpfile.js | 7 ++++--- rainloop/v/0.0.0/app/src/RainLoop/Actions.php | 2 +- rainloop/v/0.0.0/app/templates/Views/User/Login.html | 4 ++-- 15 files changed, 41 insertions(+), 45 deletions(-) diff --git a/dev/Component/AbstracCheckbox.js b/dev/Component/AbstracCheckbox.js index 9be52944b..7bb6533b5 100644 --- a/dev/Component/AbstracCheckbox.js +++ b/dev/Component/AbstracCheckbox.js @@ -19,8 +19,8 @@ * * @extends AbstractComponent */ - function AbstracCheckbox(oParams) { - + function AbstracCheckbox(oParams) + { AbstractComponent.call(this); this.value = oParams.value; @@ -48,7 +48,7 @@ this.inverted = Utils.isUnd(oParams.inverted) ? false : !!oParams.inverted; this.labeled = !Utils.isUnd(oParams.label); - }; + } _.extend(AbstracCheckbox.prototype, AbstractComponent.prototype); diff --git a/dev/Component/AbstracRadio.js b/dev/Component/AbstracRadio.js index 4a7e3430d..cbe8eefb8 100644 --- a/dev/Component/AbstracRadio.js +++ b/dev/Component/AbstracRadio.js @@ -19,8 +19,8 @@ * * @extends AbstractComponent */ - function AbstracRadio(oParams) { - + function AbstracRadio(oParams) + { AbstractComponent.call(this); this.values = ko.observableArray([]); @@ -47,7 +47,7 @@ } this.click = _.bind(this.click, this); - }; + } AbstracRadio.prototype.click = function(oValue) { if (!this.readOnly && oValue) diff --git a/dev/Component/Abstract.js b/dev/Component/Abstract.js index ba5836e76..f9adde2d2 100644 --- a/dev/Component/Abstract.js +++ b/dev/Component/Abstract.js @@ -34,11 +34,11 @@ }; /** - * @param {AbstractComponent} fClassObject + * @param {*} ClassObject * @param {string} sTemplateID * @return {Object} */ - AbstractComponent.componentExportHelper = function (fClassObject, sTemplateID) { + AbstractComponent.componentExportHelper = function (ClassObject, sTemplateID) { return { viewModel: { createViewModel: function(oParams, oCmponentInfo) { @@ -58,7 +58,7 @@ } } - return new fClassObject(oParams); + return new ClassObject(oParams); } }, template: { diff --git a/dev/Component/AbstractInput.js b/dev/Component/AbstractInput.js index 54c3b6f66..d2603a067 100644 --- a/dev/Component/AbstractInput.js +++ b/dev/Component/AbstractInput.js @@ -20,8 +20,8 @@ * * @extends AbstractComponent */ - function AbstractInput(oParams) { - + function AbstractInput(oParams) + { AbstractComponent.call(this); this.value = oParams.value || ''; @@ -63,7 +63,7 @@ this.trigger.subscribe(this.setTriggerState, this) ); } - }; + } AbstractInput.prototype.setTriggerState = function (nValue) { diff --git a/dev/Component/Checkbox.js b/dev/Component/Checkbox.js index 3846450c6..5e1b6e9db 100644 --- a/dev/Component/Checkbox.js +++ b/dev/Component/Checkbox.js @@ -16,10 +16,10 @@ * * @extends AbstracCheckbox */ - function CheckboxComponent(oParams) { - + function CheckboxComponent(oParams) + { AbstracCheckbox.call(this, oParams); - }; + } _.extend(CheckboxComponent.prototype, AbstracCheckbox.prototype); diff --git a/dev/Component/Input.js b/dev/Component/Input.js index bfc58263a..cb144a9f1 100644 --- a/dev/Component/Input.js +++ b/dev/Component/Input.js @@ -6,9 +6,6 @@ var _ = require('_'), - Enums = require('Common/Enums'), - Utils = require('Common/Utils'), - AbstractInput = require('Component/AbstractInput') ; @@ -19,10 +16,10 @@ * * @extends AbstractInput */ - function InputComponent(oParams) { - + function InputComponent(oParams) + { AbstractInput.call(this, oParams); - }; + } _.extend(InputComponent.prototype, AbstractInput.prototype); diff --git a/dev/Component/MaterialDesign/Checkbox.js b/dev/Component/MaterialDesign/Checkbox.js index 486e0f858..fa48c1274 100644 --- a/dev/Component/MaterialDesign/Checkbox.js +++ b/dev/Component/MaterialDesign/Checkbox.js @@ -17,8 +17,8 @@ * * @extends AbstracCheckbox */ - function CheckboxMaterialDesignComponent(oParams) { - + function CheckboxMaterialDesignComponent(oParams) + { AbstracCheckbox.call(this, oParams); this.animationBox = ko.observable(false).extend({'falseTimeout': 200}); @@ -32,7 +32,7 @@ this.triggerAnimation(bValue); }, this) ); - }; + } _.extend(CheckboxMaterialDesignComponent.prototype, AbstracCheckbox.prototype); diff --git a/dev/Component/Radio.js b/dev/Component/Radio.js index 178bbc0d4..36fdb9200 100644 --- a/dev/Component/Radio.js +++ b/dev/Component/Radio.js @@ -16,10 +16,10 @@ * * @extends AbstracRadio */ - function RadioComponent(oParams) { - + function RadioComponent(oParams) + { AbstracRadio.call(this, oParams); - }; + } _.extend(RadioComponent.prototype, AbstracRadio.prototype); diff --git a/dev/Component/SaveTrigger.js b/dev/Component/SaveTrigger.js index 1cba4f40a..6a7a1edf9 100644 --- a/dev/Component/SaveTrigger.js +++ b/dev/Component/SaveTrigger.js @@ -19,8 +19,8 @@ * * @extends AbstractComponent */ - function SaveTriggerComponent(oParams) { - + function SaveTriggerComponent(oParams) + { AbstractComponent.call(this); this.element = oParams.element || null; @@ -48,7 +48,7 @@ this.element.hide(); } } - }; + } SaveTriggerComponent.prototype.setState = function (nValue) { @@ -75,8 +75,8 @@ .find('.animated').show().addClass('visible') ; break; - case Enums.SaveSettingsStep.Idle: default: + case Enums.SaveSettingsStep.Idle: this.element .find('.animated').hide() .end() diff --git a/dev/Component/Select.js b/dev/Component/Select.js index d9162b166..a987e7669 100644 --- a/dev/Component/Select.js +++ b/dev/Component/Select.js @@ -18,8 +18,8 @@ * * @extends AbstractInput */ - function SelectComponent(oParams) { - + function SelectComponent(oParams) + { AbstractInput.call(this, oParams); this.options = oParams.options || ''; @@ -28,7 +28,7 @@ this.optionsValue = oParams.optionsValue || null; this.defautOptionsAfterRender = Utils.defautOptionsAfterRender; - }; + } _.extend(SelectComponent.prototype, AbstractInput.prototype); diff --git a/dev/Component/TextArea.js b/dev/Component/TextArea.js index 11cd1b0ba..ed86289e2 100644 --- a/dev/Component/TextArea.js +++ b/dev/Component/TextArea.js @@ -18,13 +18,13 @@ * * @extends AbstractInput */ - function TextAreaComponent(oParams) { - + function TextAreaComponent(oParams) + { AbstractInput.call(this, oParams); this.rows = oParams.rows || 5; this.spellcheck = Utils.isUnd(oParams.spellcheck) ? false : !!oParams.spellcheck; - }; + } _.extend(TextAreaComponent.prototype, AbstractInput.prototype); diff --git a/dev/Screen/User/MailBox.js b/dev/Screen/User/MailBox.js index 094c3582f..74e4b31ec 100644 --- a/dev/Screen/User/MailBox.js +++ b/dev/Screen/User/MailBox.js @@ -11,10 +11,8 @@ Utils = require('Common/Utils'), Events = require('Common/Events'), - Settings = require('Storage/Settings'), Data = require('Storage/User/Data'), Cache = require('Storage/User/Cache'), - Remote = require('Storage/User/Remote'), AbstractScreen = require('Knoin/AbstractScreen') ; diff --git a/gulpfile.js b/gulpfile.js index fd9caba16..248e0a0b1 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -503,7 +503,8 @@ gulp.task('rl', ['rainloop']); gulp.task('rl+', ['rainloop+']); gulp.task('build', ['rainloop']); gulp.task('build+', ['rainloop+']); -gulp.task('b', ['rainloop']); -gulp.task('b+', ['rainloop+']); +gulp.task('b', ['build']); +gulp.task('b+', ['build+']); -gulp.task('own', ['owncloud']); \ No newline at end of file +gulp.task('own', ['owncloud']); +gulp.task('js:hint', ['js:lint']); \ No newline at end of file diff --git a/rainloop/v/0.0.0/app/src/RainLoop/Actions.php b/rainloop/v/0.0.0/app/src/RainLoop/Actions.php index d731f6a7e..23d5644a2 100644 --- a/rainloop/v/0.0.0/app/src/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/src/RainLoop/Actions.php @@ -961,7 +961,7 @@ class Actions static $bResult = null; if (null === $bResult) { -// $bResult = $this->licenseParser($this->licenseHelper(false, true)); + $bResult = $this->licenseParser($this->licenseHelper(false, true)); $bResult = true; } diff --git a/rainloop/v/0.0.0/app/templates/Views/User/Login.html b/rainloop/v/0.0.0/app/templates/Views/User/Login.html index fc0d6245b..6e2369d89 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/Login.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/Login.html @@ -79,7 +79,7 @@ - + @@ -89,7 +89,7 @@