Commit dc1f03a1 authored by Neil Fraser's avatar Neil Fraser

Merge pull request #231 from carlosperate/toolbox_nodes

Allow XML DOM nodes to be injected as toolbox in IE
parents b1b96e45 bda78da1
...@@ -64,12 +64,16 @@ Blockly.inject = function(container, opt_options) { ...@@ -64,12 +64,16 @@ Blockly.inject = function(container, opt_options) {
*/ */
Blockly.parseToolboxTree_ = function(tree) { Blockly.parseToolboxTree_ = function(tree) {
if (tree) { if (tree) {
if (typeof tree != 'string' && typeof XSLTProcessor == 'undefined') { if (typeof tree != 'string') {
// In this case the tree will not have been properly built by the if (typeof XSLTProcessor == 'undefined' && tree.outerHTML) {
// browser. The HTML will be contained in the element, but it will // In this case the tree will not have been properly built by the
// not have the proper DOM structure since the browser doesn't support // browser. The HTML will be contained in the element, but it will
// XSLTProcessor (XML -> HTML). This is the case in IE 9+. // not have the proper DOM structure since the browser doesn't support
tree = tree.outerHTML; // XSLTProcessor (XML -> HTML). This is the case in IE 9+.
tree = tree.outerHTML;
} else if (!(tree instanceof Element)) {
tree = null;
}
} }
if (typeof tree == 'string') { if (typeof tree == 'string') {
tree = Blockly.Xml.textToDom(tree); tree = Blockly.Xml.textToDom(tree);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment