X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-bootstrap-debug.js;h=9653688dee7aa84747a517941664be126813ebd3;hb=d34732becb6e498e2ae001759f5dc4dee7cf92e8;hp=9e4408ba209cdb6a47c1fcbcfbf99ddcaaad5d8f;hpb=c1f99594ad1f43184d6549be9abca23901063aec;p=roojs1 diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 9e4408ba20..9653688dee 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -12161,68 +12161,68 @@ Roo.form.VTypes = function(){ * The function used to validate email addresses * @param {String} value The email address */ - 'email' : function(v){ + email : function(v){ return email.test(v); }, /** * The error text to display when the email validation function returns false * @type String */ - 'emailText' : 'This field should be an e-mail address in the format "user@domain.com"', + emailText : 'This field should be an e-mail address in the format "user@domain.com"', /** * The keystroke filter mask to be applied on email input * @type RegExp */ - 'emailMask' : /[a-z0-9_\.\-@]/i, + emailMask : /[a-z0-9_\.\-@]/i, /** * The function used to validate URLs * @param {String} value The URL */ - 'url' : function(v){ + url : function(v){ return url.test(v); }, /** * The error text to display when the url validation function returns false * @type String */ - 'urlText' : 'This field should be a URL in the format "http:/'+'/www.domain.com"', + urlText : 'This field should be a URL in the format "http:/'+'/www.domain.com"', /** * The function used to validate alpha values * @param {String} value The value */ - 'alpha' : function(v){ + alpha : function(v){ return alpha.test(v); }, /** * The error text to display when the alpha validation function returns false * @type String */ - 'alphaText' : 'This field should only contain letters and _', + alphaText : 'This field should only contain letters and _', /** * The keystroke filter mask to be applied on alpha input * @type RegExp */ - 'alphaMask' : /[a-z_]/i, + alphaMask : /[a-z_]/i, /** * The function used to validate alphanumeric values * @param {String} value The value */ - 'alphanum' : function(v){ + alphanum : function(v){ return alphanum.test(v); }, /** * The error text to display when the alphanumeric validation function returns false * @type String */ - 'alphanumText' : 'This field should only contain letters, numbers and _', + alphanumText : 'This field should only contain letters, numbers and _', /** * The keystroke filter mask to be applied on alphanumeric input * @type RegExp */ - 'alphanumMask' : /[a-z0-9_]/i + alphanumMask : /[a-z0-9_]/i }; }();/* * - LGPL @@ -29312,12 +29312,40 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { if (this.enableBlocks) { new Roo.htmleditor.FilterBlock({ node : div }); } + + var html = div.innerHTML; + //?? tidy? if (this.autoClean) { + + new Roo.htmleditor.FilterAttributes({ + node : div, + attrib_white : [ + 'href', + 'src', + 'name', + 'align', + 'colspan', + 'rowspan', + 'data-display', + 'data-width', + 'start' , + 'style', + // youtube embed. + 'class', + 'allowfullscreen', + 'frameborder', + 'width', + 'height', + 'alt' + ], + attrib_clean : ['href', 'src' ] + }); + var tidy = new Roo.htmleditor.TidySerializer({ inner: true }); - var html = tidy.serialize(div); + html = tidy.serialize(div); }