diff --git a/src/addon/calendar/calendar.module.ts b/src/addon/calendar/calendar.module.ts index b36d0bf0c..a0feb1722 100644 --- a/src/addon/calendar/calendar.module.ts +++ b/src/addon/calendar/calendar.module.ts @@ -46,7 +46,7 @@ export class AddonCalendarModule { localNotificationsProvider.registerClick(AddonCalendarProvider.COMPONENT, (data) => { if (data.eventid) { initDelegate.ready().then(() => { - calendarProvider.isDisabled(data.siteId).then(function(disabled) { + calendarProvider.isDisabled(data.siteId).then((disabled) => { if (disabled) { // The calendar is disabled in the site, don't open it. return; diff --git a/src/addon/calendar/pages/event/event.ts b/src/addon/calendar/pages/event/event.ts index 2778df277..4bce81ca5 100644 --- a/src/addon/calendar/pages/event/event.ts +++ b/src/addon/calendar/pages/event/event.ts @@ -45,10 +45,10 @@ export class AddonCalendarEventPage { courseName: string; notificationsEnabled = false; - constructor(private translate: TranslateService, private calendarProvider: AddonCalendarProvider, private navParams: NavParams, + constructor(private translate: TranslateService, private calendarProvider: AddonCalendarProvider, navParams: NavParams, private domUtils: CoreDomUtilsProvider, private coursesProvider: CoreCoursesProvider, - private calendarHelper: AddonCalendarHelperProvider, private sitesProvider: CoreSitesProvider, - private localNotificationsProvider: CoreLocalNotificationsProvider, private courseProvider: CoreCourseProvider) { + private calendarHelper: AddonCalendarHelperProvider, sitesProvider: CoreSitesProvider, + localNotificationsProvider: CoreLocalNotificationsProvider, private courseProvider: CoreCourseProvider) { this.eventId = navParams.get('id'); this.notificationsEnabled = localNotificationsProvider.isAvailable(); diff --git a/src/addon/calendar/pages/list/list.ts b/src/addon/calendar/pages/list/list.ts index 5e6a2fbd1..fb567453c 100644 --- a/src/addon/calendar/pages/list/list.ts +++ b/src/addon/calendar/pages/list/list.ts @@ -63,11 +63,11 @@ export class AddonCalendarListPage implements OnDestroy { course: this.allCourses }; - constructor(private translate: TranslateService, private calendarProvider: AddonCalendarProvider, private navParams: NavParams, + constructor(private translate: TranslateService, private calendarProvider: AddonCalendarProvider, navParams: NavParams, private domUtils: CoreDomUtilsProvider, private coursesProvider: CoreCoursesProvider, private utils: CoreUtilsProvider, - private calendarHelper: AddonCalendarHelperProvider, private sitesProvider: CoreSitesProvider, - private localNotificationsProvider: CoreLocalNotificationsProvider, private popoverCtrl: PopoverController, - private eventsProvider: CoreEventsProvider, private navCtrl: NavController, private appProvider: CoreAppProvider) { + private calendarHelper: AddonCalendarHelperProvider, sitesProvider: CoreSitesProvider, + localNotificationsProvider: CoreLocalNotificationsProvider, private popoverCtrl: PopoverController, + eventsProvider: CoreEventsProvider, private navCtrl: NavController, appProvider: CoreAppProvider) { this.siteHomeId = sitesProvider.getCurrentSite().getSiteHomeId(); this.notificationsEnabled = localNotificationsProvider.isAvailable(); diff --git a/src/addon/calendar/providers/helper.ts b/src/addon/calendar/providers/helper.ts index c0b578986..e0e08da98 100644 --- a/src/addon/calendar/providers/helper.ts +++ b/src/addon/calendar/providers/helper.ts @@ -14,7 +14,6 @@ import { Injectable } from '@angular/core'; import { CoreLoggerProvider } from '../../../providers/logger'; -import { CoreSitesProvider } from '../../../providers/sites'; import { CoreCourseProvider } from '../../../core/course/providers/course'; /** @@ -32,7 +31,7 @@ export class AddonCalendarHelperProvider { 'category': 'albums' }; - constructor(logger: CoreLoggerProvider, private sitesProvider: CoreSitesProvider, private courseProvider: CoreCourseProvider) { + constructor(logger: CoreLoggerProvider, private courseProvider: CoreCourseProvider) { this.logger = logger.getInstance('AddonCalendarHelperProvider'); } diff --git a/src/addon/userprofilefield/checkbox/component/checkbox.ts b/src/addon/userprofilefield/checkbox/component/checkbox.ts index b909bfac7..f04dabb92 100644 --- a/src/addon/userprofilefield/checkbox/component/checkbox.ts +++ b/src/addon/userprofilefield/checkbox/component/checkbox.ts @@ -14,6 +14,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { CoreUtilsProvider } from '../../../../providers/utils/utils'; /** * Directive to render a checkbox user profile field. @@ -28,7 +29,7 @@ export class AddonUserProfileFieldCheckboxComponent implements OnInit { @Input() disabled?: boolean = false; // True if disabled. Defaults to false. @Input() form?: FormGroup; // Form where to add the form control. - constructor(private fb: FormBuilder) {} + constructor(private fb: FormBuilder, protected utils: CoreUtilsProvider) {} /** * Component being initialized. @@ -41,10 +42,11 @@ export class AddonUserProfileFieldCheckboxComponent implements OnInit { // Initialize the value. let formData = { - value: field.defaultdata && field.defaultdata !== '0' && field.defaultdata !== 'false', + value: this.utils.isTrueOrOne(field.defaultdata), disabled: this.disabled }; - this.form.addControl(field.modelName, this.fb.control(formData, field.required && !field.locked ? Validators.requiredTrue : null)); + this.form.addControl(field.modelName, this.fb.control(formData, + field.required && !field.locked ? Validators.requiredTrue : null)); } } diff --git a/src/addon/userprofilefield/checkbox/providers/handler.ts b/src/addon/userprofilefield/checkbox/providers/handler.ts index ee5147f99..d6547bf96 100644 --- a/src/addon/userprofilefield/checkbox/providers/handler.ts +++ b/src/addon/userprofilefield/checkbox/providers/handler.ts @@ -13,7 +13,8 @@ // See the License for the specific language governing permissions and // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from '../../../../core/user/providers/user-profile-field-delegate'; +import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from + '../../../../core/user/providers/user-profile-field-delegate'; import { AddonUserProfileFieldCheckboxComponent } from '../component/checkbox'; /** diff --git a/src/addon/userprofilefield/datetime/component/datetime.ts b/src/addon/userprofilefield/datetime/component/datetime.ts index 737b6bed7..b7408eb1b 100644 --- a/src/addon/userprofilefield/datetime/component/datetime.ts +++ b/src/addon/userprofilefield/datetime/component/datetime.ts @@ -15,6 +15,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { CoreTimeUtilsProvider } from '../../../../providers/utils/time'; +import { CoreUtilsProvider } from '../../../../providers/utils/utils'; /** * Directive to render a datetime user profile field. @@ -29,7 +30,7 @@ export class AddonUserProfileFieldDatetimeComponent implements OnInit { @Input() disabled?: boolean = false; // True if disabled. Defaults to false. @Input() form?: FormGroup; // Form where to add the form control. - constructor(private fb: FormBuilder, private timeUtils: CoreTimeUtilsProvider) {} + constructor(private fb: FormBuilder, private timeUtils: CoreTimeUtilsProvider, protected utils: CoreUtilsProvider) {} /** * Component being initialized. @@ -41,7 +42,7 @@ export class AddonUserProfileFieldDatetimeComponent implements OnInit { field.modelName = 'profile_field_' + field.shortname; // Check if it's only date or it has time too. - let hasTime = field.param3 && field.param3 !== '0' && field.param3 !== 'false'; + let hasTime = this.utils.isTrueOrOne(field.param3); field.format = hasTime ? this.timeUtils.getLocalizedDateFormat('LLL') : this.timeUtils.getLocalizedDateFormat('LL'); // Check min value. @@ -64,7 +65,8 @@ export class AddonUserProfileFieldDatetimeComponent implements OnInit { value: field.defaultdata, disabled: this.disabled }; - this.form.addControl(field.modelName, this.fb.control(formData, field.required && !field.locked ? Validators.required : null)); + this.form.addControl(field.modelName, this.fb.control(formData, + field.required && !field.locked ? Validators.required : null)); } } diff --git a/src/addon/userprofilefield/datetime/providers/handler.ts b/src/addon/userprofilefield/datetime/providers/handler.ts index 16e1f7048..34f65bb25 100644 --- a/src/addon/userprofilefield/datetime/providers/handler.ts +++ b/src/addon/userprofilefield/datetime/providers/handler.ts @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from '../../../../core/user/providers/user-profile-field-delegate'; +import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from + '../../../../core/user/providers/user-profile-field-delegate'; import { AddonUserProfileFieldDatetimeComponent } from '../component/datetime'; -import { Platform } from 'ionic-angular'; /** * Datetime user profile field handlers. @@ -24,7 +24,7 @@ import { Platform } from 'ionic-angular'; export class AddonUserProfileFieldDatetimeHandler implements CoreUserProfileFieldHandler { name = 'datetime'; - constructor(private platform: Platform) {} + constructor() {} /** * Whether or not the handler is enabled on a site level. diff --git a/src/addon/userprofilefield/menu/component/menu.ts b/src/addon/userprofilefield/menu/component/menu.ts index a7048af52..09c44f1f5 100644 --- a/src/addon/userprofilefield/menu/component/menu.ts +++ b/src/addon/userprofilefield/menu/component/menu.ts @@ -51,7 +51,8 @@ export class AddonUserProfileFieldMenuComponent implements OnInit { disabled: this.disabled }; // Initialize the value using default data. - this.form.addControl(field.modelName, this.fb.control(formData, field.required && !field.locked ? Validators.required : null)); + this.form.addControl(field.modelName, this.fb.control(formData, + field.required && !field.locked ? Validators.required : null)); } } diff --git a/src/addon/userprofilefield/menu/providers/handler.ts b/src/addon/userprofilefield/menu/providers/handler.ts index 7a04a2b61..9004df1fc 100644 --- a/src/addon/userprofilefield/menu/providers/handler.ts +++ b/src/addon/userprofilefield/menu/providers/handler.ts @@ -13,7 +13,8 @@ // See the License for the specific language governing permissions and // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from '../../../../core/user/providers/user-profile-field-delegate'; +import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from + '../../../../core/user/providers/user-profile-field-delegate'; import { AddonUserProfileFieldMenuComponent } from '../component/menu'; /** diff --git a/src/addon/userprofilefield/text/component/text.ts b/src/addon/userprofilefield/text/component/text.ts index 3efb230e5..8ef5e8f2c 100644 --- a/src/addon/userprofilefield/text/component/text.ts +++ b/src/addon/userprofilefield/text/component/text.ts @@ -14,6 +14,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { CoreUtilsProvider } from '../../../../providers/utils/utils'; /** * Directive to render a text user profile field. @@ -28,7 +29,7 @@ export class AddonUserProfileFieldTextComponent implements OnInit { @Input() disabled?: boolean = false; // True if disabled. Defaults to false. @Input() form?: FormGroup; // Form where to add the form control. - constructor(private fb: FormBuilder) {} + constructor(private fb: FormBuilder, protected utils: CoreUtilsProvider) {} /** * Component being initialized. @@ -45,14 +46,15 @@ export class AddonUserProfileFieldTextComponent implements OnInit { } // Check if it's a password or text. - field.inputType = field.param3 && field.param3 !== '0' && field.param3 !== 'false' ? 'password' : 'text'; + field.inputType = this.utils.isTrueOrOne(field.param3) ? 'password' : 'text'; let formData = { value: field.defaultdata, disabled: this.disabled }; // Initialize the value using default data. - this.form.addControl(field.modelName, this.fb.control(formData, field.required && !field.locked ? Validators.required : null)); + this.form.addControl(field.modelName, this.fb.control(formData, + field.required && !field.locked ? Validators.required : null)); } } diff --git a/src/addon/userprofilefield/text/providers/handler.ts b/src/addon/userprofilefield/text/providers/handler.ts index cd6754e70..b3778b173 100644 --- a/src/addon/userprofilefield/text/providers/handler.ts +++ b/src/addon/userprofilefield/text/providers/handler.ts @@ -13,7 +13,8 @@ // See the License for the specific language governing permissions and // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from '../../../../core/user/providers/user-profile-field-delegate'; +import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from + '../../../../core/user/providers/user-profile-field-delegate'; import { AddonUserProfileFieldTextComponent } from '../component/text'; import { CoreTextUtilsProvider } from '../../../../providers/utils/text'; diff --git a/src/addon/userprofilefield/textarea/component/textarea.ts b/src/addon/userprofilefield/textarea/component/textarea.ts index dbcf50dfc..927dd128e 100644 --- a/src/addon/userprofilefield/textarea/component/textarea.ts +++ b/src/addon/userprofilefield/textarea/component/textarea.ts @@ -40,15 +40,15 @@ export class AddonUserProfileFieldTextareaComponent implements OnInit { if (field && this.edit && this.form) { field.modelName = 'profile_field_' + field.shortname; + + let formData = { + value: field.defaultdata, + disabled: this.disabled + }; + + this.control = new FormControl(formData, field.required && !field.locked ? Validators.required : null); + this.form.addControl(field.modelName, this.control); } - - let formData = { - value: field.defaultdata, - disabled: this.disabled - }; - - this.control = new FormControl(formData, field.required && !field.locked ? Validators.required : null); - this.form.addControl(field.modelName, this.control); } } \ No newline at end of file diff --git a/src/addon/userprofilefield/textarea/providers/handler.ts b/src/addon/userprofilefield/textarea/providers/handler.ts index 9604e9a6e..1047cbfdc 100644 --- a/src/addon/userprofilefield/textarea/providers/handler.ts +++ b/src/addon/userprofilefield/textarea/providers/handler.ts @@ -13,7 +13,8 @@ // See the License for the specific language governing permissions and // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from '../../../../core/user/providers/user-profile-field-delegate'; +import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from + '../../../../core/user/providers/user-profile-field-delegate'; import { AddonUserProfileFieldTextareaComponent } from '../component/textarea'; import { CoreTextUtilsProvider } from '../../../../providers/utils/text'; diff --git a/src/classes/delegate.ts b/src/classes/delegate.ts index d9d472fd2..6b34d75ca 100644 --- a/src/classes/delegate.ts +++ b/src/classes/delegate.ts @@ -39,7 +39,7 @@ export class CoreDelegate { /** * Logger instance get from CoreLoggerProvider. - * @type {function} + * @type {any} */ protected logger; @@ -84,7 +84,6 @@ export class CoreDelegate { constructor(delegateName: string, protected loggerProvider: CoreLoggerProvider, protected sitesProvider: CoreSitesProvider, protected eventsProvider: CoreEventsProvider) { this.logger = this.loggerProvider.getInstance(delegateName); - this.sitesProvider = sitesProvider; // Update handlers on this cases. eventsProvider.on(CoreEventsProvider.LOGIN, this.updateHandlers.bind(this)); @@ -151,9 +150,9 @@ export class CoreDelegate { * * @param {string} name The handler name. * @param {boolean} [enabled] Only enabled, or any. - * @return {boolean} If the controller is installed or not. + * @return {boolean} If the handler is registered or not. */ - hasHandler(name: string, enabled = false) : boolean { + hasHandler(name: string, enabled = false): boolean { return enabled ? typeof this.enabledHandlers[name] !== 'undefined' : typeof this.handlers[name] !== 'undefined'; } @@ -172,9 +171,12 @@ export class CoreDelegate { } /** - * Register a profile handler. + * Register a handler. + * + * @param {CoreDelegateHandler} handler The handler delegate object to register. + * @return {boolean} True when registered, false if already registered. */ - registerHandler(handler: CoreDelegateHandler) { + registerHandler(handler: CoreDelegateHandler): boolean { if (typeof this.handlers[handler.name] !== 'undefined') { this.logger.log(`Addon '${handler.name}' already registered`); return false; diff --git a/src/components/course-picker-menu/course-picker-menu-popover.ts b/src/components/course-picker-menu/course-picker-menu-popover.ts index e654664dc..fec561f64 100644 --- a/src/components/course-picker-menu/course-picker-menu-popover.ts +++ b/src/components/course-picker-menu/course-picker-menu-popover.ts @@ -26,7 +26,7 @@ export class CoreCoursePickerMenuPopoverComponent { courses: any[]; courseId = -1; - constructor(private navParams: NavParams, private viewCtrl: ViewController) { + constructor(navParams: NavParams, private viewCtrl: ViewController) { this.courses = navParams.get('courses') || []; this.courseId = navParams.get('courseId') || -1; } diff --git a/src/components/rich-text-editor/rich-text-editor.ts b/src/components/rich-text-editor/rich-text-editor.ts index 3f41f9f49..41a2df9c3 100644 --- a/src/components/rich-text-editor/rich-text-editor.ts +++ b/src/components/rich-text-editor/rich-text-editor.ts @@ -29,8 +29,7 @@ import { Keyboard } from '@ionic-native/keyboard'; * could be easily broken. * * Example: - * - * + * * * In the example above, the text written in the editor will be stored in newpost.text. */ diff --git a/src/components/split-view/split-view.ts b/src/components/split-view/split-view.ts index b6f20244a..3c65bee2b 100644 --- a/src/components/split-view/split-view.ts +++ b/src/components/split-view/split-view.ts @@ -14,9 +14,8 @@ // Code based on https://github.com/martinpritchardelevate/ionic-split-pane-demo -import { Component, ViewChild, Injectable, Input, ElementRef, OnInit } from '@angular/core'; +import { Component, ViewChild, Input, ElementRef, OnInit } from '@angular/core'; import { NavController, Nav } from 'ionic-angular'; -import { CoreSplitViewPlaceholderPage } from './placeholder/placeholder'; /** * Directive to create a split view layout. diff --git a/src/components/tabs/tab.ts b/src/components/tabs/tab.ts index 1435f2247..efeb1ef4d 100644 --- a/src/components/tabs/tab.ts +++ b/src/components/tabs/tab.ts @@ -12,8 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Component, Input, Output, OnInit, OnDestroy, ElementRef, EventEmitter, ContentChild, TemplateRef, - ViewChild } from '@angular/core'; +import { Component, Input, Output, OnInit, OnDestroy, ElementRef, EventEmitter, ContentChild, TemplateRef } from '@angular/core'; import { CoreTabsComponent } from './tabs'; import { Content } from 'ionic-angular'; diff --git a/src/components/tabs/tabs.ts b/src/components/tabs/tabs.ts index 2fca81ca0..2ad6402d2 100644 --- a/src/components/tabs/tabs.ts +++ b/src/components/tabs/tabs.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Component, Input, Output, EventEmitter, OnInit, OnChanges, AfterViewInit, ViewChild, ElementRef, - SimpleChange } from '@angular/core'; + SimpleChange } from '@angular/core'; import { CoreTabComponent } from './tab'; import { Content } from 'ionic-angular'; diff --git a/src/core/contentlinks/providers/helper.ts b/src/core/contentlinks/providers/helper.ts index 3033cc368..35768d6f7 100644 --- a/src/core/contentlinks/providers/helper.ts +++ b/src/core/contentlinks/providers/helper.ts @@ -72,7 +72,7 @@ export class CoreContentLinksHelperProvider { */ goInSite(navCtrl: NavController, pageName: string, pageParams: any, siteId?: string) : void { siteId = siteId || this.sitesProvider.getCurrentSiteId(); - if (siteId == this.sitesProvider.getCurrentSiteId()) { + if (navCtrl && siteId == this.sitesProvider.getCurrentSiteId()) { navCtrl.push(pageName, pageParams); } else { this.loginHelper.redirect(pageName, pageParams, siteId); diff --git a/src/core/course/components/unsupported-module/unsupported-module.ts b/src/core/course/components/unsupported-module/unsupported-module.ts index 1c1910d87..7c4fca123 100644 --- a/src/core/course/components/unsupported-module/unsupported-module.ts +++ b/src/core/course/components/unsupported-module/unsupported-module.ts @@ -13,9 +13,6 @@ // limitations under the License. import { Component, Input, OnInit } from '@angular/core'; -import { IonicPage, NavParams } from 'ionic-angular'; -import { TranslateService } from '@ngx-translate/core'; -import { CoreTextUtilsProvider } from '../../../../providers/utils/text'; import { CoreCourseProvider } from '../../providers/course'; import { CoreCourseModuleDelegate } from '../../providers/module-delegate'; @@ -34,8 +31,7 @@ export class CoreCourseUnsupportedModuleComponent implements OnInit { isSupportedByTheApp: boolean; moduleName: string; - constructor(navParams: NavParams, private translate: TranslateService, private textUtils: CoreTextUtilsProvider, - private courseProvider: CoreCourseProvider, private moduleDelegate: CoreCourseModuleDelegate) {} + constructor(private courseProvider: CoreCourseProvider, private moduleDelegate: CoreCourseModuleDelegate) {} /** * Component being initialized. diff --git a/src/core/course/pages/unsupported-module/unsupported-module.ts b/src/core/course/pages/unsupported-module/unsupported-module.ts index 9d2be19fe..3cbe20d7c 100644 --- a/src/core/course/pages/unsupported-module/unsupported-module.ts +++ b/src/core/course/pages/unsupported-module/unsupported-module.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Component } from '@angular/core'; -import { IonicPage, NavParams, NavController } from 'ionic-angular'; +import { IonicPage, NavParams } from 'ionic-angular'; import { TranslateService } from '@ngx-translate/core'; import { CoreTextUtilsProvider } from '../../../../providers/utils/text'; @@ -28,8 +28,7 @@ import { CoreTextUtilsProvider } from '../../../../providers/utils/text'; export class CoreCourseUnsupportedModulePage { module: any; - constructor(navParams: NavParams, private translate: TranslateService, private textUtils: CoreTextUtilsProvider, - private navCtrl: NavController) { + constructor(navParams: NavParams, private translate: TranslateService, private textUtils: CoreTextUtilsProvider) { this.module = navParams.get('module') || {}; } diff --git a/src/core/course/providers/helper.ts b/src/core/course/providers/helper.ts index 226ca0d19..fbd6ad427 100644 --- a/src/core/course/providers/helper.ts +++ b/src/core/course/providers/helper.ts @@ -25,7 +25,7 @@ import { CoreCoursesDelegate, CoreCoursesHandlerToDisplay } from '../../courses/ import { CoreSiteHomeProvider } from '../../sitehome/providers/sitehome'; import { CoreCourseProvider } from './course'; import { CoreCourseModuleDelegate } from './module-delegate'; -import { CoreCourseModulePrefetchDelegate, CoreCourseModulePrefetchHandler } from './module-prefetch-delegate'; +import { CoreCourseModulePrefetchDelegate } from './module-prefetch-delegate'; import { CoreLoginHelperProvider } from '../../login/providers/helper'; import { CoreConstants } from '../../constants'; import { CoreSite } from '../../../classes/site'; diff --git a/src/core/course/providers/module-prefetch-delegate.ts b/src/core/course/providers/module-prefetch-delegate.ts index 50b44fb64..39b492d7f 100644 --- a/src/core/course/providers/module-prefetch-delegate.ts +++ b/src/core/course/providers/module-prefetch-delegate.ts @@ -13,7 +13,6 @@ // limitations under the License. import { Injectable } from '@angular/core'; -import { NavController } from 'ionic-angular'; import { CoreEventsProvider } from '../../../providers/events'; import { CoreFileProvider } from '../../../providers/file'; import { CoreFilepoolProvider } from '../../../providers/filepool'; @@ -957,8 +956,7 @@ export class CoreCourseModulePrefetchDelegate { * @return {Promise} Promise resolved with true if downloadable, false otherwise. */ isModuleDownloadable(module: any, courseId: number) : Promise { - let handler = this.getPrefetchHandlerFor(module), - promise; + let handler = this.getPrefetchHandlerFor(module); if (handler) { if (typeof handler.isDownloadable == 'function') { diff --git a/src/core/courses/components/course-list-item/course-list-item.ts b/src/core/courses/components/course-list-item/course-list-item.ts index 9e67707f1..bdc378218 100644 --- a/src/core/courses/components/course-list-item/course-list-item.ts +++ b/src/core/courses/components/course-list-item/course-list-item.ts @@ -31,7 +31,8 @@ import { CoreCoursesProvider } from '../../providers/courses'; export class CoreCoursesCourseListItemComponent implements OnInit { @Input() course: any; // The course to render. - constructor(private navCtrl: NavController, private translate: TranslateService, private coursesProvider: CoreCoursesProvider) {} + constructor(private navCtrl: NavController, private translate: TranslateService, private coursesProvider: CoreCoursesProvider) { + } /** * Component being initialized. diff --git a/src/core/courses/components/course-progress/course-progress.ts b/src/core/courses/components/course-progress/course-progress.ts index 2084e6113..b5052c506 100644 --- a/src/core/courses/components/course-progress/course-progress.ts +++ b/src/core/courses/components/course-progress/course-progress.ts @@ -14,7 +14,6 @@ import { Component, Input, OnInit, OnDestroy } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { TranslateService } from '@ngx-translate/core'; import { CoreEventsProvider } from '../../../../providers/events'; import { CoreSitesProvider } from '../../../../providers/sites'; import { CoreDomUtilsProvider } from '../../../../providers/utils/dom'; @@ -45,7 +44,7 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy { protected isDestroyed = false; protected courseStatusObserver; - constructor(private navCtrl: NavController, private translate: TranslateService, private courseHelper: CoreCourseHelperProvider, + constructor(private navCtrl: NavController, private courseHelper: CoreCourseHelperProvider, private courseFormatDelegate: CoreCourseFormatDelegate, private domUtils: CoreDomUtilsProvider, private courseProvider: CoreCourseProvider, eventsProvider: CoreEventsProvider, sitesProvider: CoreSitesProvider) { // Listen for status change in course. diff --git a/src/core/courses/providers/my-overview-link-handler.ts b/src/core/courses/providers/my-overview-link-handler.ts index 28905b628..fb9d1f648 100644 --- a/src/core/courses/providers/my-overview-link-handler.ts +++ b/src/core/courses/providers/my-overview-link-handler.ts @@ -16,7 +16,6 @@ import { Injectable } from '@angular/core'; import { CoreContentLinksHandlerBase } from '../../contentlinks/classes/base-handler'; import { CoreContentLinksAction } from '../../contentlinks/providers/delegate'; import { CoreLoginHelperProvider } from '../../login/providers/helper'; -import { CoreCoursesProvider } from './courses'; /** * Handler to treat links to my overview. @@ -27,7 +26,7 @@ export class CoreCoursesMyOverviewLinkHandler extends CoreContentLinksHandlerBas featureName = '$mmSideMenuDelegate_mmCourses'; pattern = /\/my\/?$/; - constructor(private coursesProvider: CoreCoursesProvider, private loginHelper: CoreLoginHelperProvider) { + constructor(private loginHelper: CoreLoginHelperProvider) { super(); } diff --git a/src/core/emulator/providers/file.ts b/src/core/emulator/providers/file.ts index 70c61ba0d..4ffb1a4c5 100644 --- a/src/core/emulator/providers/file.ts +++ b/src/core/emulator/providers/file.ts @@ -384,7 +384,8 @@ export class FileMock extends File { * @param {string} dirName The source directory name. * @param {string} newPath The destionation path to the directory. * @param {string} newDirName The destination directory name. - * @returns {Promise} Returns a Promise that resolves to the new DirectoryEntry object or rejects with an error. + * @returns {Promise} Returns a Promise that resolves to the new DirectoryEntry object or rejects with + * an error. */ moveDir(path: string, dirName: string, newPath: string, newDirName: string): Promise { return this.resolveDirectoryUrl(path).then((fse) => { @@ -421,7 +422,8 @@ export class FileMock extends File { * Read file and return data as an ArrayBuffer. * @param {string} path Base FileSystem. * @param {string} file Name of file, relative to path. - * @returns {Promise} Returns a Promise that resolves with the contents of the file as ArrayBuffer or rejects with an error. + * @returns {Promise} Returns a Promise that resolves with the contents of the file as ArrayBuffer or rejects + * with an error. */ readAsArrayBuffer(path: string, file: string): Promise { return this.readFileMock(path, file, 'ArrayBuffer'); @@ -444,7 +446,8 @@ export class FileMock extends File { * @param {string} path Base FileSystem. * @param {string} file Name of file, relative to path. - * @returns {Promise} Returns a Promise that resolves with the contents of the file as data URL or rejects with an error. + * @returns {Promise} Returns a Promise that resolves with the contents of the file as data URL or rejects + * with an error. */ readAsDataURL(path: string, file: string): Promise { return this.readFileMock(path, file, 'DataURL'); diff --git a/src/core/emulator/providers/local-notifications.ts b/src/core/emulator/providers/local-notifications.ts index 2d8e27af1..5f0e23abb 100644 --- a/src/core/emulator/providers/local-notifications.ts +++ b/src/core/emulator/providers/local-notifications.ts @@ -712,7 +712,8 @@ export class LocalNotificationsMock extends LocalNotifications { let tileNotif = new this.winNotif.TileNotification({ tag: notification.id + '', template: this.tileTemplate, - strings: [notification.title, notification.text, notification.title, notification.text, notification.title, notification.text], + strings: [notification.title, notification.text, notification.title, notification.text, notification.title, + notification.text], expirationTime: new Date(Date.now() + CoreConstants.SECONDS_HOUR * 1000) // Expire in 1 hour. }) diff --git a/src/core/fileuploader/providers/helper.ts b/src/core/fileuploader/providers/helper.ts index 438ee93c9..3573eba52 100644 --- a/src/core/fileuploader/providers/helper.ts +++ b/src/core/fileuploader/providers/helper.ts @@ -65,7 +65,8 @@ export class CoreFileUploaderHelperProvider { } wifiThreshold = typeof wifiThreshold == 'undefined' ? CoreFileUploaderProvider.WIFI_SIZE_WARNING : wifiThreshold; - limitedThreshold = typeof limitedThreshold == 'undefined' ? CoreFileUploaderProvider.LIMITED_SIZE_WARNING : limitedThreshold; + limitedThreshold = typeof limitedThreshold == 'undefined' ? + CoreFileUploaderProvider.LIMITED_SIZE_WARNING : limitedThreshold; if (size < 0) { return this.domUtils.showConfirm(this.translate.instant('core.fileuploader.confirmuploadunknownsize')); diff --git a/src/core/login/pages/email-signup/email-signup.ts b/src/core/login/pages/email-signup/email-signup.ts index c351f4aab..e8853c67b 100644 --- a/src/core/login/pages/email-signup/email-signup.ts +++ b/src/core/login/pages/email-signup/email-signup.ts @@ -229,7 +229,8 @@ export class CoreLoginEmailSignupPage { } // Get the data for the custom profile fields. - this.userProfileFieldDelegate.getDataForFields(this.settings.profilefields, true, 'email', this.signupForm.value).then((fieldsData) => { + this.userProfileFieldDelegate.getDataForFields(this.settings.profilefields, true, 'email', this.signupForm.value).then( + (fieldsData) => { params.customprofilefields = fieldsData; this.wsProvider.callAjax('auth_email_signup_user', params, {siteUrl: this.siteUrl}).then((result) => { diff --git a/src/core/mainmenu/providers/delegate.ts b/src/core/mainmenu/providers/delegate.ts index da5594cd5..c2a4e3959 100644 --- a/src/core/mainmenu/providers/delegate.ts +++ b/src/core/mainmenu/providers/delegate.ts @@ -88,7 +88,7 @@ export class CoreMainMenuDelegate extends CoreDelegate { protected handlers: {[s: string]: CoreMainMenuHandler} = {}; protected enabledHandlers: {[s: string]: CoreMainMenuHandler} = {}; protected loaded = false; - protected siteHandlers: Subject = new BehaviorSubject([]); + protected siteHandlers: Subject = new BehaviorSubject([]); protected featurePrefix = '$mmSideMenuDelegate_'; constructor(protected loggerProvider: CoreLoggerProvider, protected sitesProvider: CoreSitesProvider, diff --git a/src/core/sitehome/components/all-course-list/all-course-list.ts b/src/core/sitehome/components/all-course-list/all-course-list.ts index 71ea79d22..3e71c3373 100644 --- a/src/core/sitehome/components/all-course-list/all-course-list.ts +++ b/src/core/sitehome/components/all-course-list/all-course-list.ts @@ -12,8 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Component, Input } from '@angular/core'; -import { IonicPage } from 'ionic-angular'; +import { Component } from '@angular/core'; import { CoreCoursesProvider } from '../../../courses/providers/courses'; /** diff --git a/src/core/sitehome/components/categories/categories.ts b/src/core/sitehome/components/categories/categories.ts index 6cfa1b25d..3ae52da32 100644 --- a/src/core/sitehome/components/categories/categories.ts +++ b/src/core/sitehome/components/categories/categories.ts @@ -12,8 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Component, Input } from '@angular/core'; -import { IonicPage } from 'ionic-angular'; +import { Component } from '@angular/core'; import { CoreCoursesProvider } from '../../../courses/providers/courses'; /** diff --git a/src/core/sitehome/components/course-search/course-search.ts b/src/core/sitehome/components/course-search/course-search.ts index 8a74bfad5..454a3d1f4 100644 --- a/src/core/sitehome/components/course-search/course-search.ts +++ b/src/core/sitehome/components/course-search/course-search.ts @@ -12,8 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Component, Input } from '@angular/core'; -import { IonicPage } from 'ionic-angular'; +import { Component } from '@angular/core'; import { CoreCoursesProvider } from '../../../courses/providers/courses'; /** diff --git a/src/core/sitehome/components/enrolled-course-list/enrolled-course-list.ts b/src/core/sitehome/components/enrolled-course-list/enrolled-course-list.ts index ab05eeb73..5c3cf6ae2 100644 --- a/src/core/sitehome/components/enrolled-course-list/enrolled-course-list.ts +++ b/src/core/sitehome/components/enrolled-course-list/enrolled-course-list.ts @@ -12,8 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Component, Input, OnInit } from '@angular/core'; -import { IonicPage } from 'ionic-angular'; +import { Component, OnInit } from '@angular/core'; import { CoreCoursesProvider } from '../../../courses/providers/courses'; /** diff --git a/src/core/sitehome/components/index/index.ts b/src/core/sitehome/components/index/index.ts index 88d052376..f883ab7dc 100644 --- a/src/core/sitehome/components/index/index.ts +++ b/src/core/sitehome/components/index/index.ts @@ -12,8 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Component, OnInit, Input } from '@angular/core'; -import { IonicPage } from 'ionic-angular'; +import { Component, OnInit } from '@angular/core'; import { CoreSitesProvider } from '../../../../providers/sites'; import { CoreDomUtilsProvider } from '../../../../providers/utils/dom'; import { CoreCourseProvider } from '../../../course/providers/course'; diff --git a/src/core/sitehome/components/news/news.ts b/src/core/sitehome/components/news/news.ts index 32519d767..a9b6ec75f 100644 --- a/src/core/sitehome/components/news/news.ts +++ b/src/core/sitehome/components/news/news.ts @@ -12,8 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Component, OnInit, Input } from '@angular/core'; -import { IonicPage } from 'ionic-angular'; +import { Component, OnInit } from '@angular/core'; import { CoreSitesProvider } from '../../../../providers/sites'; /** diff --git a/src/core/user/components/user-profile-field/user-profile-field.ts b/src/core/user/components/user-profile-field/user-profile-field.ts index b79bdfd0f..f10494844 100644 --- a/src/core/user/components/user-profile-field/user-profile-field.ts +++ b/src/core/user/components/user-profile-field/user-profile-field.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Component, Input, ViewChild, ViewContainerRef, ComponentFactoryResolver, ComponentRef, OnInit } from '@angular/core'; +import { Component, Input, ViewChild, ViewContainerRef, ComponentFactoryResolver, OnInit } from '@angular/core'; import { CoreLoggerProvider } from '../../../../providers/logger'; import { CoreUserProfileFieldDelegate } from '../../providers/user-profile-field-delegate'; import { CoreUtilsProvider } from '../../../../providers/utils/utils'; diff --git a/src/core/user/pages/about/about.html b/src/core/user/pages/about/about.html index f95e6f7c3..f56825db7 100644 --- a/src/core/user/pages/about/about.html +++ b/src/core/user/pages/about/about.html @@ -7,7 +7,7 @@ - +
{{ 'core.user.contact' | translate}} @@ -20,13 +20,13 @@

{{ 'core.user.phone1' | translate}}

- +

{{ 'core.user.phone2' | translate}}

- +

@@ -36,7 +36,8 @@ -

+ +

{{ 'core.user.city' | translate}}

@@ -52,7 +53,7 @@

{{ 'core.user.webpage' | translate}}

- +

diff --git a/src/core/user/pages/about/about.ts b/src/core/user/pages/about/about.ts index 603e8e43b..05c05926d 100644 --- a/src/core/user/pages/about/about.ts +++ b/src/core/user/pages/about/about.ts @@ -17,7 +17,6 @@ import { IonicPage, NavParams, Platform } from 'ionic-angular'; import { CoreUserProvider } from '../../providers/user'; import { CoreUserHelperProvider } from '../../providers/helper'; import { CoreDomUtilsProvider } from '../../../../providers/utils/dom'; -import { CoreCoursesProvider } from '../../../courses/providers/courses'; import { CoreEventsProvider } from '../../../../providers/events'; import { CoreSitesProvider } from '../../../../providers/sites'; @@ -41,7 +40,7 @@ export class CoreUserAboutPage { user: any = {}; title: string; - constructor(private navParams: NavParams, private userProvider: CoreUserProvider, private userHelper: CoreUserHelperProvider, + constructor(navParams: NavParams, private userProvider: CoreUserProvider, private userHelper: CoreUserHelperProvider, private domUtils: CoreDomUtilsProvider, private eventsProvider: CoreEventsProvider, private sitesProvider: CoreSitesProvider, private platform: Platform) { diff --git a/src/core/user/pages/profile/profile.html b/src/core/user/pages/profile/profile.html index efc7cba54..fda94e955 100644 --- a/src/core/user/pages/profile/profile.html +++ b/src/core/user/pages/profile/profile.html @@ -7,7 +7,7 @@ - +
@@ -51,7 +51,7 @@ -