Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/208166
Change subject: Allow View's to enhance existing server side render views ...................................................................... Allow View's to enhance existing server side render views Do not render the template when the enhance option is given. Bug: T97648 Change-Id: I3455df3d7c0e66183ef01abe819eeac7f949cc41 --- M javascripts/PageList.js M resources/mobile.view/View.js 2 files changed, 6 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/66/208166/1 diff --git a/javascripts/PageList.js b/javascripts/PageList.js index 7a1b2c7..ed54b39 100644 --- a/javascripts/PageList.js +++ b/javascripts/PageList.js @@ -28,14 +28,9 @@ * } * } * ] - * @cfg {Boolean} defaults.enhance Whether to enhance views already in DOM. - * When enabled, the template is disabled so that it is not rendered in the DOM. - * Use in conjunction with View::defaults.$el to associate the PageList with an existing - * already rendered element in the DOM. */ defaults: { - pages: [], - enhance: false + pages: [] }, /** * Render page images for the existing page list. Assumes no page images have been loaded. @@ -76,17 +71,6 @@ } ); }, delay ); } - }, - /** - * @inheritdoc - */ - initialize: function ( options ) { - // FIXME: Find more elegant standard way to allow enhancement of views already in DOM - if ( options.enhance ) { - this.template = false; - } - - View.prototype.initialize.apply( this, arguments ); }, /** * @inheritdoc diff --git a/resources/mobile.view/View.js b/resources/mobile.view/View.js index dd343e9..8f340af 100644 --- a/resources/mobile.view/View.js +++ b/resources/mobile.view/View.js @@ -133,6 +133,10 @@ * * @cfg {Object} defaults Default options hash. * @cfg {jQuery.Object|String} [defaults.el] jQuery selector to use for rendering. + * @cfg {Boolean} defaults.enhance Whether to enhance views already in DOM. + * When enabled, the template is disabled so that it is not rendered in the DOM. + * Use in conjunction with View::defaults.$el to associate the PageList with an existing + * already rendered element in the DOM. */ defaults: {}, @@ -214,7 +218,7 @@ } // FIXME: don't pass optionsClone in the next version (see mobile.startup.init.js) this.preRender( optionsClone ); - if ( this.template ) { + if ( this.template && !data.enhance ) { html = this.template.render( this.options, this.templatePartials ); if ( this.isTemplateMode ) { this.$el = $( html ); -- To view, visit https://gerrit.wikimedia.org/r/208166 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3455df3d7c0e66183ef01abe819eeac7f949cc41 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits