if indexOf('data-') == -1, bypass html5 rewrite

turnermm · May 5, 2019 · cb40da9 · cb40da9
1 parent c015f21
commit cb40da9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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