From: Alan Date: Fri, 7 Jan 2022 08:26:49 +0000 (+0800) Subject: roojs-ui.js X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=762c7c6b61a22ac08ab3bd2d1f759f70e73bda6d roojs-ui.js roojs-ui-debug.js roojs-all.js roojs-debug.js --- diff --git a/roojs-debug.js b/roojs-debug.js index a5e751f0cd..f370891106 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -46313,7 +46313,6 @@ Roo.apply(Roo.htmleditor.FilterBlock.prototype, * @constructor * @method Serializer * @param {Object} settings Name/value settings object. - * @param {tinymce.html.Schema} schema Schema instance to use. */ @@ -46323,8 +46322,7 @@ Roo.htmleditor.TidySerializer = function(settings) this.writer = new Roo.htmleditor.TidyWriter(settings); - //settings.validate = !('validate' in settings) || settings.validate; - // self.schema = schema = schema || new Schema(); + }; Roo.htmleditor.TidySerializer.prototype = { @@ -46405,38 +46403,7 @@ Roo.htmleditor.TidySerializer.prototype = { var writer = this.writer; var attrs = node.attributes; // Sort attributes - /* - if (validate && attrs && attrs.length > 1) { - sortedAttrs = []; - sortedAttrs.map = {}; - elementRule = schema.getElementRule(node.name); - if (elementRule) { - for (i = 0, l = elementRule.attributesOrder.length; i < l; i++) { - attrName = elementRule.attributesOrder[i]; - if (attrName in attrs.map) { - attrValue = attrs.map[attrName]; - sortedAttrs.map[attrName] = attrValue; - sortedAttrs.push({ - name: attrName, - value: attrValue - }); - } - } - for (i = 0, l = attrs.length; i < l; i++) { - attrName = attrs[i].name; - if (!(attrName in sortedAttrs.map)) { - attrValue = attrs.map[attrName]; - sortedAttrs.map[attrName] = attrValue; - sortedAttrs.push({ - name: attrName, - value: attrValue - }); - } - } - attrs = sortedAttrs; - } - } - */ + writer.start(node.nodeName, attrs, isEmpty, node); if (isEmpty) { return; diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index 3b3124f13e..7e8e6b490f 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -21844,7 +21844,6 @@ Roo.apply(Roo.htmleditor.FilterBlock.prototype, * @constructor * @method Serializer * @param {Object} settings Name/value settings object. - * @param {tinymce.html.Schema} schema Schema instance to use. */ @@ -21854,8 +21853,7 @@ Roo.htmleditor.TidySerializer = function(settings) this.writer = new Roo.htmleditor.TidyWriter(settings); - //settings.validate = !('validate' in settings) || settings.validate; - // self.schema = schema = schema || new Schema(); + }; Roo.htmleditor.TidySerializer.prototype = { @@ -21936,38 +21934,7 @@ Roo.htmleditor.TidySerializer.prototype = { var writer = this.writer; var attrs = node.attributes; // Sort attributes - /* - if (validate && attrs && attrs.length > 1) { - sortedAttrs = []; - sortedAttrs.map = {}; - elementRule = schema.getElementRule(node.name); - if (elementRule) { - for (i = 0, l = elementRule.attributesOrder.length; i < l; i++) { - attrName = elementRule.attributesOrder[i]; - if (attrName in attrs.map) { - attrValue = attrs.map[attrName]; - sortedAttrs.map[attrName] = attrValue; - sortedAttrs.push({ - name: attrName, - value: attrValue - }); - } - } - for (i = 0, l = attrs.length; i < l; i++) { - attrName = attrs[i].name; - if (!(attrName in sortedAttrs.map)) { - attrValue = attrs.map[attrName]; - sortedAttrs.map[attrName] = attrValue; - sortedAttrs.push({ - name: attrName, - value: attrValue - }); - } - } - attrs = sortedAttrs; - } - } - */ + writer.start(node.nodeName, attrs, isEmpty, node); if (isEmpty) { return;