From cb40da99b509f617b893c04f4aafbedb9c66c862 Mon Sep 17 00:00:00 2001 From: Myron Turner Date: Sun, 5 May 2019 09:38:41 -0500 Subject: [PATCH] if indexOf('data-') == -1, bypass html5 rewrite --- action/meta.php | 4 ++-- script.js | 3 +++ scripts/script-cmpr.js | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/action/meta.php b/action/meta.php index 3dd26ae0..bc1cd5d4 100644 --- a/action/meta.php +++ b/action/meta.php @@ -725,12 +725,12 @@ function set_session() { } if ($this->dokuwiki_priority && $this->in_dwpriority_group() ) { - if(isset($_COOKIE['FCKG_USE']) && $_COOKIE['FCKG_USE'] == 'other') { + if(isset($_COOKIE['FCKG_USE']) && $_COOKIE['FCKG_USE'] == 'other') { //if other go to ckeditor $expire = time() -60*60*24*30; setcookie('FCKG_USE','_false_', $expire, '/'); } else { - setcookie('FCKG_USE','_false_', $expire, '/'); + setcookie('FCKG_USE','_false_', $expire, '/'); //turn off ckeditor } } } diff --git a/script.js b/script.js index ec654a9e..8da9ebc3 100644 --- a/script.js +++ b/script.js @@ -77,11 +77,14 @@ var HTMLParser_Elements = new Array(); } ); /* remove html5 attributes */ + var pos = html.indexOf('data-'); + if(pos != -1) { html = html.replace(/(<\w+)([^>]+)>/gm,function(match,tag,atts){ atts = atts.replace(/data-[\w\-]+\s*=\s*(\"|\')\w+(\"|\')/,""); //alert(atts); return tag + atts+ '>'; }); + } stack.last = function(){ return this[ this.length - 1 ]; }; diff --git a/scripts/script-cmpr.js b/scripts/script-cmpr.js index aa57c705..a184f452 100644 --- a/scripts/script-cmpr.js +++ b/scripts/script-cmpr.js @@ -1 +1 @@ -var HTMLParser;var HTMLParserInstalled=true;var HTMLParser_Elements=new Array();(function(){var k=/^<(\w+)((?:\s+\w+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/,c=/^<\/(\w+)[^>]*>/,f=/(\w+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;var e=b("br,col,hr,img");var a=b("blockquote,center,del,div,dl,dt,hr,iframe,ins,li,ol,p,pre,table,tbody,td,tfoot,th,thead,tr,ul");var h=b("a,abbr,acronym,b,big,br,cite,code,del,em,font,h1,h2,h3,h4,h5,h6,i,img,ins,kbd,q,s,samp,small,span,strike,strong,sub,sup,tt,u,var");var d=b("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");var j=b("checked,disabled,ismap,noresize,nowrap,readonly,selected");var g=b("script,style");var l="http://"+location.host+DOKU_BASE+"/lib/plugins/ckgedit/fckeditor/userfiles/blink.jpg?nolink&33x34";HTMLParser=this.HTMLParser=function(n,v){var q,r,o,s=[],t=n;n=n.replace(/()/gm,function(w,z,y){var x=false;if(z.match(/msword/)){x=true;w=w.replace(/msword/,"")}if(y.length>2500000&&!x){jQuery("#dw__editform").append('');return"{{"+l+"}}"}return w});n=n.replace(/~~OPEN_HTML_BLOCK~~/gm,"~~START_HTML_BLOCK~~");n=n.replace(/~~END_HTML_BLOCK~~/gm,"~~CLOSE_HTML_BLOCK~~");if(n.match(/~~START_HTML_BLOCK~~/gm)){if(!JSINFO.htmlok){n=n.replace(/~~START_HTML_BLOCK~~|~~CLOSE_HTML_BLOCK~~/gm,"")}n=n.replace(/(

)*\s*~~START_HTML_BLOCK~~\s*(<\/p>)*([\s\S]+)~~CLOSE_HTML_BLOCK~~\s*(<\/p>)*/gm,function(w,y,A,z,x){z=z.replace(/<\/?div.*?>/gm,"");z=z.replace(//gm,"");z=z.replace(/<\/code>/gm,"");z=z.replace(/fckgL\d+\s*\<\/sup\>)\<\/a\>/gm,function(y,x,w){return(""+x)});n=n.replace(/(<\w+)([^>]+)>/gm,function(x,w,y){y=y.replace(/data-[\w\-]+\s*=\s*(\"|\')\w+(\"|\')/,"");return w+y+">"});s.last=function(){return this[this.length-1]};while(n){r=true;if(!s.last()||!g[s.last()]){if(n.indexOf("");if(q>=0){if(v.comment){v.comment(n.substring(4,q))}n=n.substring(q+3);r=false}}else{if(n.indexOf("]*>"),function(w,x){x=x.replace(//g,"$1").replace(//g,"$1");if(v.chars){v.chars(x)}return""});p("",s.last())}if(n==t){throw"Parse Error: "+n}t=n}p();function m(w,z,A,x){if(a[z]){while(s.last()&&h[s.last()]){p("",s.last())}}if(d[z]&&s.last()==z){p("",z)}x=e[z]||!!x;if(!x){s.push(z)}if(v.start){var y=[];A.replace(f,function(C,B){var D=arguments[2]?arguments[2]:arguments[3]?arguments[3]:arguments[4]?arguments[4]:j[B]?B:"";y.push({name:B,value:D,escaped:D.replace(/(^|[^\\])"/g,'$1\\"')})});if(v.start){v.start(z,y,x)}}}function p(w,y){if(!y){var z=0}else{for(var z=s.length-1;z>=0;z--){if(s[z]==y){break}}}if(z>=0){for(var x=s.length-1;x>=z;x--){if(v.end){v.end(s[x])}}s.length=z}}};function b(p){var o={},m=p.split(",");for(var n=0;n").attr("type","hidden").attr("name","mode").attr("value","dwiki").appendTo(jQuery(a));jQuery("").attr("type","hidden").attr("name","fck_preview_mode").attr("value","nil").appendTo(jQuery(a));a.submit()})}if(JSINFO.ckg_template.match(/bootstrap/)&&jQuery("div.editButtons").length>0){jQuery("div.editButtons input").each(function(a){if(jQuery(this).hasClass("btn-success")){jQuery(this).removeClass("btn-success")}if(jQuery(this).hasClass("btn-danger")){jQuery(this).removeClass("btn-danger")}})}});function ckg_edit_mediaman_insert(h,c,a,f){var k,d,n,j;var m=a.substring(1).split("&");k="detail";for(var g in m){var b=m[g];if(b.match(/^\d+$/)){d=b}else{if(b.match(/^\w+$/)){k=b}}}switch(f){case"2":j="medialeft";break;case"3":j="mediacenter";break;case"4":j="mediaright";break;default:j="";break}var e=CKEDITOR.instances.wiki__text._.filebrowserFn;var l=DOKU_BASE+"lib/exe/fetch.php?media="+c;CKEDITOR.tools.callFunction(e,l,function(){var o=this.getDialog();if(o.getName()=="image"){if(j!=null){o.getContentElement("info","cmbAlign").setValue(j)}if(k!=null){o.getContentElement("info","cmbLinkType").setValue(k)}if(d!=null){o.getContentElement("info","txtWidth").setValue(d);o.dontResetSize=true}}})}function ckg_edit_mediaman_insertlink(a,e,c,b){var d=CKEDITOR.instances.wiki__text._.filebrowserFn;CKEDITOR.tools.callFunction(d,e,function(){var f=this.getDialog();if(f.getName()=="link"){f.getContentElement("info","media").setValue(e)}})}function getCookie(a){var b=new RegExp(a+"=([^;]+)");var c=b.exec(document.cookie);return(c!=null)?decodeURIComponent(c[1]):null}; \ No newline at end of file +var HTMLParser;var HTMLParserInstalled=true;var HTMLParser_Elements=new Array();(function(){var k=/^<(\w+)((?:\s+\w+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/,c=/^<\/(\w+)[^>]*>/,f=/(\w+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;var e=b("br,col,hr,img");var a=b("blockquote,center,del,div,dl,dt,hr,iframe,ins,li,ol,p,pre,table,tbody,td,tfoot,th,thead,tr,ul");var h=b("a,abbr,acronym,b,big,br,cite,code,del,em,font,h1,h2,h3,h4,h5,h6,i,img,ins,kbd,q,s,samp,small,span,strike,strong,sub,sup,tt,u,var");var d=b("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");var j=b("checked,disabled,ismap,noresize,nowrap,readonly,selected");var g=b("script,style");var l="http://"+location.host+DOKU_BASE+"/lib/plugins/ckgedit/fckeditor/userfiles/blink.jpg?nolink&33x34";HTMLParser=this.HTMLParser=function(n,w){var q,r,o,t=[],u=n;n=n.replace(/()/gm,function(x,A,z){var y=false;if(A.match(/msword/)){y=true;x=x.replace(/msword/,"")}if(z.length>2500000&&!y){jQuery("#dw__editform").append('');return"{{"+l+"}}"}return x});n=n.replace(/~~OPEN_HTML_BLOCK~~/gm,"~~START_HTML_BLOCK~~");n=n.replace(/~~END_HTML_BLOCK~~/gm,"~~CLOSE_HTML_BLOCK~~");if(n.match(/~~START_HTML_BLOCK~~/gm)){if(!JSINFO.htmlok){n=n.replace(/~~START_HTML_BLOCK~~|~~CLOSE_HTML_BLOCK~~/gm,"")}n=n.replace(/(

)*\s*~~START_HTML_BLOCK~~\s*(<\/p>)*([\s\S]+)~~CLOSE_HTML_BLOCK~~\s*(<\/p>)*/gm,function(x,z,B,A,y){A=A.replace(/<\/?div.*?>/gm,"");A=A.replace(//gm,"");A=A.replace(/<\/code>/gm,"");A=A.replace(/fckgL\d+\s*\<\/sup\>)\<\/a\>/gm,function(z,y,x){return(""+y)});var s=n.indexOf("data-");if(s!=-1){n=n.replace(/(<\w+)([^>]+)>/gm,function(y,x,z){z=z.replace(/data-[\w\-]+\s*=\s*(\"|\')\w+(\"|\')/,"");return x+z+">"})}t.last=function(){return this[this.length-1]};while(n){r=true;if(!t.last()||!g[t.last()]){if(n.indexOf("");if(q>=0){if(w.comment){w.comment(n.substring(4,q))}n=n.substring(q+3);r=false}}else{if(n.indexOf("]*>"),function(x,y){y=y.replace(//g,"$1").replace(//g,"$1");if(w.chars){w.chars(y)}return""});p("",t.last())}if(n==u){throw"Parse Error: "+n}u=n}p();function m(x,A,B,y){if(a[A]){while(t.last()&&h[t.last()]){p("",t.last())}}if(d[A]&&t.last()==A){p("",A)}y=e[A]||!!y;if(!y){t.push(A)}if(w.start){var z=[];B.replace(f,function(D,C){var E=arguments[2]?arguments[2]:arguments[3]?arguments[3]:arguments[4]?arguments[4]:j[C]?C:"";z.push({name:C,value:E,escaped:E.replace(/(^|[^\\])"/g,'$1\\"')})});if(w.start){w.start(A,z,y)}}}function p(x,z){if(!z){var A=0}else{for(var A=t.length-1;A>=0;A--){if(t[A]==z){break}}}if(A>=0){for(var y=t.length-1;y>=A;y--){if(w.end){w.end(t[y])}}t.length=A}}};function b(p){var o={},m=p.split(",");for(var n=0;n").attr("type","hidden").attr("name","mode").attr("value","dwiki").appendTo(jQuery(a));jQuery("").attr("type","hidden").attr("name","fck_preview_mode").attr("value","nil").appendTo(jQuery(a));a.submit()})}if(JSINFO.ckg_template.match(/bootstrap/)&&jQuery("div.editButtons").length>0){jQuery("div.editButtons input").each(function(a){if(jQuery(this).hasClass("btn-success")){jQuery(this).removeClass("btn-success")}if(jQuery(this).hasClass("btn-danger")){jQuery(this).removeClass("btn-danger")}})}});function ckg_edit_mediaman_insert(h,c,a,f){var k,d,n,j;var m=a.substring(1).split("&");k="detail";for(var g in m){var b=m[g];if(b.match(/^\d+$/)){d=b}else{if(b.match(/^\w+$/)){k=b}}}switch(f){case"2":j="medialeft";break;case"3":j="mediacenter";break;case"4":j="mediaright";break;default:j="";break}var e=CKEDITOR.instances.wiki__text._.filebrowserFn;var l=DOKU_BASE+"lib/exe/fetch.php?media="+c;CKEDITOR.tools.callFunction(e,l,function(){var o=this.getDialog();if(o.getName()=="image"){if(j!=null){o.getContentElement("info","cmbAlign").setValue(j)}if(k!=null){o.getContentElement("info","cmbLinkType").setValue(k)}if(d!=null){o.getContentElement("info","txtWidth").setValue(d);o.dontResetSize=true}}})}function ckg_edit_mediaman_insertlink(a,e,c,b){var d=CKEDITOR.instances.wiki__text._.filebrowserFn;CKEDITOR.tools.callFunction(d,e,function(){var f=this.getDialog();if(f.getName()=="link"){f.getContentElement("info","media").setValue(e)}})}function getCookie(a){var b=new RegExp(a+"=([^;]+)");var c=b.exec(document.cookie);return(c!=null)?decodeURIComponent(c[1]):null}; \ No newline at end of file