From aa0ae78dcb9d63f0e14111e2eaa508ea7bfd452c Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Mon, 30 Sep 2013 10:33:39 -0400 Subject: [PATCH] =?UTF-8?q?BUG-12342=20Adici=C3=B3n=20de=20segunda=20lista?= =?UTF-8?q?=20de=20verificaci=C3=B3n=20para=20eliminar=20c=C3=B3digo=20agr?= =?UTF-8?q?egado=20por=20IE=20al=20realizar=20la=20edici=C3=B3n=20de=20un?= =?UTF-8?q?=20formulario=20con=20la=20opci=C3=B3n=20de=20edici=C3=B3n=20de?= =?UTF-8?q?=20html=20activada?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gulliver/js/maborak/core/maborak.js | 2 +- gulliver/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js index bdc113495..34be3ee79 100644 --- a/gulliver/js/maborak/core/maborak.js +++ b/gulliver/js/maborak/core/maborak.js @@ -2004,7 +2004,7 @@ parent=parent.parent;} if(lastParent===parent){textNode=new tinymce.html.Node('#text',3);textNode.value='\u00a0';node.replace(textNode);}}}});} if(!settings.allow_html_in_named_anchor){self.addAttributeFilter('id,name',function(nodes,name){var i=nodes.length,sibling,prevSibling,parent,node;while(i--){node=nodes[i];if(node.name==='a'&&node.firstChild&&!node.attr('href')){parent=node.parent;sibling=node.lastChild;do{prevSibling=sibling.prev;parent.insert(sibling,node);sibling=prevSibling;}while(sibling);}}});}}})(tinymce);tinymce.html.Writer=function(settings){var html=[],indent,indentBefore,indentAfter,encode,htmlOutput;settings=settings||{};indent=settings.indent;indentBefore=tinymce.makeMap(settings.indent_before||'');indentAfter=tinymce.makeMap(settings.indent_after||'');encode=tinymce.html.Entities.getEncodeFunc(settings.entity_encoding||'raw',settings.entities);htmlOutput=settings.element_format=="html";return{start:function(name,attrs,empty){var i,l,attr,value;if(indent&&indentBefore[name]&&html.length>0){value=html[html.length-1];if(value.length>0&&value!=='\n') html.push('\n');} -html.push('<',name);if(attrs){for(i=0,l=attrs.length;i=0){attr.value=attr.value.substring(0,attr.value.indexOf(list[iList]));}} +html.push('<',name);if(attrs){for(i=0,l=attrs.length;i=0){attr.value=attr.value.substring(0,attr.value.indexOf(list[iList]));}} html.push(' ',attr.name,'="',encode(attr.value,true),'"');}} if(!empty||htmlOutput) html[html.length]='>';else diff --git a/gulliver/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js b/gulliver/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js index d4b6e0fc8..002fe0792 100644 --- a/gulliver/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js +++ b/gulliver/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js @@ -4384,7 +4384,7 @@ tinymce.html.Writer = function(settings) { for (i = 0, l = attrs.length; i < l; i++) { attr = attrs[i]; - var list = ['toStr', 'concat', 'get_by_key', 'expand', 'setParent', 'isset_key', 'toJSONString']; + var list = ['toStr', 'concat', 'get_by_key', 'expand', 'setParent', 'isset_key', 'toJSONString', 'tostr', 'concat', 'get_by_key', 'expand', 'setparent', 'isset_key', 'tojsonstring']; for(var iList = 0; iList < list.length; iList++) { if( attr.value.indexOf(list[iList]) >= 0 ) { attr.value = attr.value.substring(0, attr.value.indexOf(list[iList]));