From 47f20a6774d64d7c3b3bfec1afa02351e650ff85 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Thu, 9 Aug 2018 12:08:10 +0200 Subject: [PATCH] MOBILE-2548 siteplugins: Allow passing JS variables to new pages --- .../core-siteplugins-module-index.html | 2 +- .../components/module-index/module-index.ts | 5 +++++ .../components/plugin-content/plugin-content.ts | 17 ++++++++++++++--- .../directives/call-ws-new-content.ts | 12 ++++++++++-- src/core/siteplugins/directives/new-content.ts | 12 ++++++++++-- .../pages/plugin-page/plugin-page.html | 2 +- .../pages/plugin-page/plugin-page.ts | 2 ++ 7 files changed, 43 insertions(+), 9 deletions(-) diff --git a/src/core/siteplugins/components/module-index/core-siteplugins-module-index.html b/src/core/siteplugins/components/module-index/core-siteplugins-module-index.html index 6e09aa864..3c57c372f 100644 --- a/src/core/siteplugins/components/module-index/core-siteplugins-module-index.html +++ b/src/core/siteplugins/components/module-index/core-siteplugins-module-index.html @@ -9,4 +9,4 @@ - + diff --git a/src/core/siteplugins/components/module-index/module-index.ts b/src/core/siteplugins/components/module-index/module-index.ts index aeb23afb2..5c2e034e5 100644 --- a/src/core/siteplugins/components/module-index/module-index.ts +++ b/src/core/siteplugins/components/module-index/module-index.ts @@ -46,6 +46,7 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C prefetchStatusIcon: string; prefetchText: string; size: string; + jsData: any; // Data to pass to the component. protected isDestroyed = false; protected statusObserver; @@ -70,6 +71,10 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C cmid: this.module.id }; this.initResult = handler.initResult; + this.jsData = { + module: this.module, + courseId: this.courseId + }; } // Get the data for the context menu. diff --git a/src/core/siteplugins/components/plugin-content/plugin-content.ts b/src/core/siteplugins/components/plugin-content/plugin-content.ts index 60f8eca1e..ce8a59c6a 100644 --- a/src/core/siteplugins/components/plugin-content/plugin-content.ts +++ b/src/core/siteplugins/components/plugin-content/plugin-content.ts @@ -110,14 +110,21 @@ export class CoreSitePluginsPluginContentComponent implements OnInit, DoCheck { * @param {any} args New params. * @param {string} [component] New component. If not provided, current component * @param {string} [method] New method. If not provided, current method + * @param {any} [jsData] JS variables to pass to the new view so they can be used in the template or JS. + * If true is supplied instead of an object, all initial variables from current page will be copied. */ - openContent(title: string, args: any, component?: string, method?: string): void { + openContent(title: string, args: any, component?: string, method?: string, jsData?: any): void { + if (jsData === true) { + jsData = this.data; + } + this.navCtrl.push('CoreSitePluginsPluginPage', { title: title, component: component || this.component, method: method || this.method, args: args, - initResult: this.initResult + initResult: this.initResult, + jsData: jsData }); } @@ -144,12 +151,16 @@ export class CoreSitePluginsPluginContentComponent implements OnInit, DoCheck { * @param {any} args New params. * @param {string} [component] New component. If not provided, current component * @param {string} [method] New method. If not provided, current method + * @param {string} [jsData] JS variables to pass to the new view so they can be used in the template or JS. */ - updateContent(args: any, component?: string, method?: string): void { + updateContent(args: any, component?: string, method?: string, jsData?: any): void { this.component = component || this.component; this.method = method || this.method; this.args = args; this.dataLoaded = false; + if (jsData) { + Object.assign(this.data, jsData); + } this.fetchContent(); } diff --git a/src/core/siteplugins/directives/call-ws-new-content.ts b/src/core/siteplugins/directives/call-ws-new-content.ts index 9117b831e..08b4a213e 100644 --- a/src/core/siteplugins/directives/call-ws-new-content.ts +++ b/src/core/siteplugins/directives/call-ws-new-content.ts @@ -59,6 +59,8 @@ export class CoreSitePluginsCallWSNewContentDirective extends CoreSitePluginsCal @Input() title: string; // The title to display with the new content. Only if samePage=false. @Input() samePage: boolean | string; // Whether to display the content in same page or open a new one. Defaults to new page. @Input() useOtherData: any[]; // Whether to include other data in the args. @see CoreSitePluginsProvider.loadOtherDataInArgs. + @Input() jsData: any; // JS variables to pass to the new page so they can be used in the template or JS. + // If true is supplied instead of an object, all initial variables from current page will be copied. constructor(element: ElementRef, translate: TranslateService, domUtils: CoreDomUtilsProvider, sitePluginsProvider: CoreSitePluginsProvider, @Optional() parentContent: CoreSitePluginsPluginContentComponent, @@ -84,15 +86,21 @@ export class CoreSitePluginsCallWSNewContentDirective extends CoreSitePluginsCal if (this.utils.isTrueOrOne(this.samePage)) { // Update the parent content (if it exists). if (this.parentContent) { - this.parentContent.updateContent(args, this.component, this.method); + this.parentContent.updateContent(args, this.component, this.method, this.jsData); } } else { + let jsData = this.jsData; + if (jsData === true && this.parentContent) { + jsData = this.parentContent.data; + } + this.navCtrl.push('CoreSitePluginsPluginPage', { title: this.title, component: this.component || (this.parentContent && this.parentContent.component), method: this.method || (this.parentContent && this.parentContent.method), args: args, - initResult: this.parentContent && this.parentContent.initResult + initResult: this.parentContent && this.parentContent.initResult, + jsData: jsData }); } } diff --git a/src/core/siteplugins/directives/new-content.ts b/src/core/siteplugins/directives/new-content.ts index edb7d5f3e..3bbd9504d 100644 --- a/src/core/siteplugins/directives/new-content.ts +++ b/src/core/siteplugins/directives/new-content.ts @@ -51,6 +51,8 @@ export class CoreSitePluginsNewContentDirective implements OnInit { @Input() useOtherData: any[]; // Whether to include other data in the args. @see CoreSitePluginsProvider.loadOtherDataInArgs. @Input() form: string; // ID or name to identify a form. The form will be obtained from document.forms. // If supplied and form is found, the form data will be retrieved and sent to the new content. + @Input() jsData: any; // JS variables to pass to the new page so they can be used in the template or JS. + // If true is supplied instead of an object, all initial variables from current page will be copied. protected element: HTMLElement; @@ -81,15 +83,21 @@ export class CoreSitePluginsNewContentDirective implements OnInit { if (this.utils.isTrueOrOne(this.samePage)) { // Update the parent content (if it exists). if (this.parentContent) { - this.parentContent.updateContent(args, this.component, this.method); + this.parentContent.updateContent(args, this.component, this.method, this.jsData); } } else { + let jsData = this.jsData; + if (jsData === true) { + jsData = this.parentContent && this.parentContent.data || {}; + } + this.navCtrl.push('CoreSitePluginsPluginPage', { title: this.title, component: this.component || (this.parentContent && this.parentContent.component), method: this.method || (this.parentContent && this.parentContent.method), args: args, - initResult: this.parentContent && this.parentContent.initResult + initResult: this.parentContent && this.parentContent.initResult, + jsData: jsData }); } }); diff --git a/src/core/siteplugins/pages/plugin-page/plugin-page.html b/src/core/siteplugins/pages/plugin-page/plugin-page.html index f93ce1351..6d2933b40 100644 --- a/src/core/siteplugins/pages/plugin-page/plugin-page.html +++ b/src/core/siteplugins/pages/plugin-page/plugin-page.html @@ -11,5 +11,5 @@ - + diff --git a/src/core/siteplugins/pages/plugin-page/plugin-page.ts b/src/core/siteplugins/pages/plugin-page/plugin-page.ts index 32f5db12e..73e66b050 100644 --- a/src/core/siteplugins/pages/plugin-page/plugin-page.ts +++ b/src/core/siteplugins/pages/plugin-page/plugin-page.ts @@ -33,6 +33,7 @@ export class CoreSitePluginsPluginPage { method: string; args: any; initResult: any; + jsData: any; // JS variables to pass to the plugin so they can be used in the template or JS. constructor(params: NavParams) { this.title = params.get('title'); @@ -40,6 +41,7 @@ export class CoreSitePluginsPluginPage { this.method = params.get('method'); this.args = params.get('args'); this.initResult = params.get('initResult'); + this.jsData = params.get('jsData'); } /**