[MediaWiki-commits] [Gerrit] Fixed checkbox insert in IE - change (mediawiki...BlueSpiceExtensions)

[Robert Vogel (Code Review)]

Robert Vogel has submitted this change and it was merged.

Change subject: Fixed checkbox insert in IE
......................................................................


Fixed checkbox insert in IE

In IE, a construct like <span id="@@ID@@"><button /></span> causes tinymce
to forget the id attribute. So using <button></button> instead, which
works.

Change-Id: I546c016a962aaf781a9bdf1aa9e82c87c2f77ec5
---
M Checklist/resources/bluespice.checklist.js
M VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
2 files changed, 8 insertions(+), 3 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/Checklist/resources/bluespice.checklist.js 
b/Checklist/resources/bluespice.checklist.js
index a957b26..dad25e6 100644
--- a/Checklist/resources/bluespice.checklist.js
+++ b/Checklist/resources/bluespice.checklist.js
@@ -101,7 +101,8 @@
                } else {
                        innerText += BsChecklist.checkboxImage;
                }
-               innerText += '\');" />';
+               // Do not use short notation for closing tag (/>), as it breaks 
IE
+               innerText += '\');" ></button>';
                return innerText;
        },
 
@@ -131,7 +132,7 @@
 
        makeAndRegisterCheckboxSpecialTag: function(ed, checked) {
                var id = ed.plugins.bswikicode.getSpecialTagList().length;
-               ed.plugins.bswikicode.getSpecialTagList().push('<bs:checklist 
value="" />');
+               ed.plugins.bswikicode.pushSpecialTagList('<bs:checklist 
value="" />');
                var node = ed.dom.create(
                                'span',
                                {
@@ -149,7 +150,7 @@
 
        makeAndRegisterSelectboxSpecialTag: function(ed, listname, value) {
                var id = ed.plugins.bswikicode.getSpecialTagList().length;
-               ed.plugins.bswikicode.getSpecialTagList().push('<bs:checklist 
type="list" value="" list="'+listname+'"/>');
+               ed.plugins.bswikicode.pushSpecialTagList('<bs:checklist 
type="list" value="" list="'+listname+'"/>');
                var node = ed.dom.create(
                                'span',
                                {
diff --git a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js 
b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
index 04dc148..bdd9dd6 100644
--- a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
+++ b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
@@ -2334,6 +2334,10 @@
                return _specialtags;
        };
 
+       this.pushSpecialTagList = function( item ) {
+               _specialtags.push( item );
+       }
+
        this.getTemplateList = function() {
                return _templates;
        };

-- 
To view, visit https://gerrit.wikimedia.org/r/191857
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I546c016a962aaf781a9bdf1aa9e82c87c2f77ec5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Pigpen <reym...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits