diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
| commit | a2190ac74dd4d7080b12bab90e552d7aa81209ef (patch) | |
| tree | 8b31f38de9882d18df54cf8d9e0de74167a094eb /extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.js | |
| parent | 15e69f7b20b6596b9148030acce5b59993b95a45 (diff) | |
| parent | 257401d8b2cf661adf36c84b0e3fd1cf85e33c22 (diff) | |
Merge branch 'mw-1.26'
Diffstat (limited to 'extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.js')
| -rw-r--r-- | extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.js | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.js b/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.js index 907b0485..8ae977aa 100644 --- a/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.js +++ b/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.js @@ -115,7 +115,7 @@ $.wikiEditor.modules.dialogs = { * @param {String} name Dialog name (key in $.wikiEditor.modules.dialogs.modules) */ reallyCreate: function ( context, module, name ) { - var msg, dialogDiv, + var msg, dialogDiv, $content, configuration = module.dialog; // Add some stuff to configuration configuration.bgiframe = true; @@ -133,10 +133,17 @@ $.wikiEditor.modules.dialogs = { configuration.newButtons[mw.msg( msg )] = configuration.buttons[msg]; } configuration.buttons = configuration.newButtons; + if ( module.htmlTemplate ) { + $content = mw.template.get( 'jquery.wikiEditor.dialogs.config', module.htmlTemplate ).render(); + } else if ( module.html instanceof jQuery ) { + $content = module.html; + } else { + $content = $( $.parseHTML( module.html ) ); + } // Create the dialog <div> dialogDiv = $( '<div>' ) .attr( 'id', module.id ) - .html( module.html ) + .append( $content ) .data( 'context', context ) .appendTo( $( 'body' ) ) .each( module.init ) |