Releases v1.4.2

CHANGE.md

@@ -429,3 +429,8 @@ v1.2.0 主要更新：
 - 修复Bug [＃66](https://github.com/pandao/editor.md/issues/66)；
 - 修复编辑器工具栏按钮`:hover` CSS3 transition无效的问题； 
 - 修改`README.md`；
+
+####v1.4.2
+
+- 改进和增强自定义工具栏功能，支持图标按钮右对齐[#69](https://github.com/pandao/editor.md/issues/69)；
+- 改进和增强HTML标签的解析过滤功能，支持过滤指定的属性等[#70](https://github.com/pandao/editor.md/issues/70)；

Gulpfile.js

@@ -11,11 +11,11 @@ var concat       = require("gulp-concat");
 var notify       = require("gulp-notify");
 var header       = require("gulp-header");
 var minifycss    = require("gulp-minify-css");
-var jsdoc        = require("gulp-jsdoc");
-var jsdoc2md     = require("gulp-jsdoc-to-markdown");
+//var jsdoc        = require("gulp-jsdoc");
+//var jsdoc2md     = require("gulp-jsdoc-to-markdown");
 var pkg          = require("./package.json");
 var dateFormat   = require("dateformatter").format;
-var replace      = require('gulp-replace');
+var replace      = require("gulp-replace");
 
 pkg.name         = "Editor.md";
 pkg.today        = dateFormat;
@@ -305,7 +305,7 @@ gulp.task("cm-addon", function() {
                 .pipe(gulp.dest(codeMirror.path.dist))
                 .pipe(notify({ message: "codemirror-addon.js task complete" }));
 }); 
-
+/*
 gulp.task("jsdoc", function(){
     return gulp.src(["./src/editormd.js", "README.md"])
                .pipe(jsdoc.parser())
@@ -323,7 +323,7 @@ gulp.task("jsdoc2md", function() {
             }))
             .pipe(gulp.dest("docs/markdown"));
 });
-
+*/
 gulp.task("watch", function() {
 	gulp.watch("scss/editormd.scss", ["scss"]);
 	gulp.watch("scss/editormd.preview.scss", ["scss", "scss2"]);

README.md

@@ -9,7 +9,7 @@
 ![](https://img.shields.io/github/issues/pandao/editor.md.svg)
 ![](https://img.shields.io/bower/v/editor.md.svg)
 
-**Editor.md** is the open source online markdown editor (component), based on CodeMirror & jQuery & Marked.
+**Editor.md** : The open source online markdown editor (component), based on CodeMirror & jQuery & Marked.
 
 ### Features
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "editor.md",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "homepage": "https://github.com/pandao/editor.md",
   "authors": [
     "Pandao <pandao@vip.qq.com>"

css/editormd.css

@@ -1,13 +1,13 @@
 /*
  * Editor.md
  *
- * @file        /editormd.css 
- * @version     v1.4.1 
+ * @file        editormd.css 
+ * @version     v1.4.2 
  * @description Open source online markdown editor.
  * @license     MIT License
  * @author      Pandao
  * {@link       https://github.com/pandao/editor.md}
- * @updateTime  2015-04-07
+ * @updateTime  2015-04-22
  */
 
 @charset "UTF-8";

css/editormd.logo.css

@@ -1,13 +1,13 @@
 /*
  * Editor.md
  *
- * @file        /editormd.logo.css 
- * @version     v1.4.1 
+ * @file        editormd.logo.css 
+ * @version     v1.4.2 
  * @description Open source online markdown editor.
  * @license     MIT License
  * @author      Pandao
  * {@link       https://github.com/pandao/editor.md}
- * @updateTime  2015-04-07
+ * @updateTime  2015-04-22
  */
 
 /*! prefixes.scss v0.1.0 | Author: Pandao | https://github.com/pandao/prefixes.scss | MIT license | Copyright (c) 2015 */

css/editormd.logo.min.css

@@ -1,2 +1,2 @@
-/*! Editor.md v1.4.1 | /editormd.logo.min.css | Open source online markdown editor. | MIT License | By: Pandao | https://github.com/pandao/editor.md | 2015-04-07 */
+/*! Editor.md v1.4.2 | editormd.logo.min.css | Open source online markdown editor. | MIT License | By: Pandao | https://github.com/pandao/editor.md | 2015-04-22 */
 /*! prefixes.scss v0.1.0 | Author: Pandao | https://github.com/pandao/prefixes.scss | MIT license | Copyright (c) 2015 */@font-face{font-family:editormd-logo;src:url(../fonts/editormd-logo.eot?-5y8q6h);src:url(.../fonts/editormd-logo.eot?#iefix-5y8q6h)format("embedded-opentype"),url(../fonts/editormd-logo.woff?-5y8q6h)format("woff"),url(../fonts/editormd-logo.ttf?-5y8q6h)format("truetype"),url(../fonts/editormd-logo.svg?-5y8q6h#icomoon)format("svg");font-weight:400;font-style:normal}.editormd-logo,.editormd-logo-1x,.editormd-logo-2x,.editormd-logo-3x,.editormd-logo-4x,.editormd-logo-5x,.editormd-logo-6x,.editormd-logo-7x,.editormd-logo-8x{font-family:editormd-logo;speak:none;font-style:normal;font-weight:400;font-variant:normal;text-transform:none;font-size:inherit;line-height:1;display:inline-block;text-rendering:auto;vertical-align:inherit;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.editormd-logo-1x:before,.editormd-logo-2x:before,.editormd-logo-3x:before,.editormd-logo-4x:before,.editormd-logo-5x:before,.editormd-logo-6x:before,.editormd-logo-7x:before,.editormd-logo-8x:before,.editormd-logo:before{content:"\e1987"}.editormd-logo-1x{font-size:1em}.editormd-logo-lg{font-size:1.2em}.editormd-logo-2x{font-size:2em}.editormd-logo-3x{font-size:3em}.editormd-logo-4x{font-size:4em}.editormd-logo-5x{font-size:5em}.editormd-logo-6x{font-size:6em}.editormd-logo-7x{font-size:7em}.editormd-logo-8x{font-size:8em}.editormd-logo-color{color:#2196F3}

css/editormd.preview.css

@@ -1,13 +1,13 @@
 /*
  * Editor.md
  *
- * @file        /editormd.preview.css 
- * @version     v1.4.1 
+ * @file        editormd.preview.css 
+ * @version     v1.4.2 
  * @description Open source online markdown editor.
  * @license     MIT License
  * @author      Pandao
  * {@link       https://github.com/pandao/editor.md}
- * @updateTime  2015-04-07
+ * @updateTime  2015-04-22
  */
 
 /*! prefixes.scss v0.1.0 | Author: Pandao | https://github.com/pandao/prefixes.scss | MIT license | Copyright (c) 2015 */

editormd.amd.js

@@ -2,12 +2,12 @@
  * Editor.md
  *
  * @file        editormd.amd.js 
- * @version     v1.4.1 
+ * @version     v1.4.2 
  * @description Open source online markdown editor.
  * @license     MIT License
  * @author      Pandao
  * {@link       https://github.com/pandao/editor.md}
- * @updateTime  2015-04-07
+ * @updateTime  2015-04-22
  */
 
 ;(function(factory) {
@@ -129,7 +129,7 @@
     };
     
     editormd.title        = editormd.$name = "Editor.md";
-    editormd.version      = "1.4.1";
+    editormd.version      = "1.4.2";
     editormd.homePage     = "https://pandao.github.io/editor.md/";
     editormd.classPrefix  = "editormd-";
     
@@ -1125,12 +1125,21 @@
                             : ((typeof settings.toolbarIcons === "string")  ? editormd.toolbarModes[settings.toolbarIcons] : settings.toolbarIcons);
             
             var toolbarMenu = toolbar.find("." + this.classPrefix + "menu"), menu = "";
+            var pullRight   = false;
             
             for (var i = 0, len = icons.length; i < len; i++)
             {
                 var name = icons[i];
 
-                if (name !== "|")
+                if (name === "||") 
+                { 
+                    pullRight = true;
+                } 
+                else if (name === "|")
+                {
+                    menu += "<li class=\"divider\" unselectable=\"on\">|</li>";
+                }
+                else
                 {
                     var isHeader = (/h(\d)/.test(name));
                     var index    = name;
@@ -1147,24 +1156,22 @@
                     iconTexts = (typeof iconTexts === "undefined") ? "" : iconTexts;
                     iconClass = (typeof iconClass === "undefined") ? "" : iconClass;
 
-                    menu += "<li>";
+                    var menuItem = pullRight ? "<li class=\"pull-right\">" : "<li>";
                     
                     if (typeof settings.toolbarCustomIcons[name] !== "undefined" && typeof settings.toolbarCustomIcons[name] !== "function")
                     {
-                        menu += settings.toolbarCustomIcons[name];
+                        menuItem += settings.toolbarCustomIcons[name];
                     }
                     else 
                     {
-                        menu += "<a href=\"javascript:;\" title=\"" + title + "\" unselectable=\"on\">" +
-                                "<i class=\"fa " + iconClass + "\" name=\""+name+"\" unselectable=\"on\">"+((isHeader) ? name.toUpperCase() : ( (iconClass === "") ? iconTexts : "") ) + "</i>" +
-                                "</a>";
+                        menuItem += "<a href=\"javascript:;\" title=\"" + title + "\" unselectable=\"on\">";
+                        menuItem += "<i class=\"fa " + iconClass + "\" name=\""+name+"\" unselectable=\"on\">"+((isHeader) ? name.toUpperCase() : ( (iconClass === "") ? iconTexts : "") ) + "</i>";
+                        menuItem += "</a>";
                     }
 
-                    menu += "</li>";
-                }
-                else
-                {
-                    menu += "<li class=\"divider\" unselectable=\"on\">|</li>";
+                    menuItem += "</li>";
+
+                    menu = pullRight ? menuItem + menu : menu + menuItem;
                 }
             }
 
@@ -3642,15 +3649,66 @@
     
     editormd.filterHTMLTags = function(html, filters) {
             
-        if (typeof filters === "string")
+        if (typeof filters !== "string") {
+            return html;
+        }
+
+        var expression = filters.split("|");
+        var filterTags = expression[0].split(",");
+        var attrs      = expression[1];
+
+        for (var i = 0, len = filterTags.length; i < len; i++)
+        {
+            var tag = filterTags[i];
+
+            html = html.replace(new RegExp("\<\s*" + tag + "\s*([^\>]*)\>([^\>]*)\<\s*\/" + tag + "\s*\>", "igm"), "");
+        }
+
+        if (typeof attrs !== "undefined")
         {
-            var filterTags = filters.split(",");
+            var htmlTagRegex = /\<(\w+)\s*([^\>]*)\>([^\>]*)\<\/(\w+)\>/ig;
 
-            for (var i = 0, len = filterTags.length; i < len; i++)
+            if (attrs === "*")
             {
-                var tag = filterTags[i];
+                html = html.replace(htmlTagRegex, function($1, $2, $3, $4, $5) {
+                    return "<" + $2 + ">" + $4 + "</" + $5 + ">";
+                });         
+            }
+            else if (attrs === "on*")
+            {
+                html = html.replace(htmlTagRegex, function($1, $2, $3, $4, $5) {
+                    var el = $("<" + $2 + ">" + $4 + "</" + $5 + ">");
+                    var _attrs = $($1)[0].attributes;
+                    var $attrs = {};
+                    
+                    $.each(_attrs, function(i, e) {
+                        $attrs[e.nodeName] = e.nodeValue;
+                    });
+                    
+                    $.each($attrs, function(i) {                
+                        if (i.indexOf("on") === 0) {
+                            delete $attrs[i];
+                        }
+                    });
+                    
+                    el.attr($attrs);
 
-                html = html.replace(new RegExp("\<\s*"+tag+"\s*([^\>]*)\>", "igm"), "").replace(new RegExp("\<\s*\/"+tag+"\s*\>", "igm"), "");
+                    return el[0].outerHTML;
+                });
+            }
+            else
+            {
+                html = html.replace(htmlTagRegex, function($1, $2, $3, $4) {
+                    var filterAttrs = attrs.split(",");
+                    var el = $($1);
+                    el.html($4);
+
+                    $.each(filterAttrs, function(i) {
+                        el.attr(filterAttrs[i], null);
+                    });
+
+                    return el[0].outerHTML;
+                });
             }
         }
         

editormd.js

@@ -2,12 +2,12 @@
  * Editor.md
  *
  * @file        editormd.js 
- * @version     v1.4.1 
+ * @version     v1.4.2 
  * @description Open source online markdown editor.
  * @license     MIT License
  * @author      Pandao
  * {@link       https://github.com/pandao/editor.md}
- * @updateTime  2015-04-07
+ * @updateTime  2015-04-22
  */
 
 ;(function(factory) {
@@ -59,7 +59,7 @@
     };
     
     editormd.title        = editormd.$name = "Editor.md";
-    editormd.version      = "1.4.1";
+    editormd.version      = "1.4.2";
     editormd.homePage     = "https://pandao.github.io/editor.md/";
     editormd.classPrefix  = "editormd-";
     
@@ -1055,12 +1055,21 @@
                             : ((typeof settings.toolbarIcons === "string")  ? editormd.toolbarModes[settings.toolbarIcons] : settings.toolbarIcons);
             
             var toolbarMenu = toolbar.find("." + this.classPrefix + "menu"), menu = "";
+            var pullRight   = false;
             
             for (var i = 0, len = icons.length; i < len; i++)
             {
                 var name = icons[i];
 
-                if (name !== "|")
+                if (name === "||") 
+                { 
+                    pullRight = true;
+                } 
+                else if (name === "|")
+                {
+                    menu += "<li class=\"divider\" unselectable=\"on\">|</li>";
+                }
+                else
                 {
                     var isHeader = (/h(\d)/.test(name));
                     var index    = name;
@@ -1077,24 +1086,22 @@
                     iconTexts = (typeof iconTexts === "undefined") ? "" : iconTexts;
                     iconClass = (typeof iconClass === "undefined") ? "" : iconClass;
 
-                    menu += "<li>";
+                    var menuItem = pullRight ? "<li class=\"pull-right\">" : "<li>";
                     
                     if (typeof settings.toolbarCustomIcons[name] !== "undefined" && typeof settings.toolbarCustomIcons[name] !== "function")
                     {
-                        menu += settings.toolbarCustomIcons[name];
+                        menuItem += settings.toolbarCustomIcons[name];
                     }
                     else 
                     {
-                        menu += "<a href=\"javascript:;\" title=\"" + title + "\" unselectable=\"on\">" +
-                                "<i class=\"fa " + iconClass + "\" name=\""+name+"\" unselectable=\"on\">"+((isHeader) ? name.toUpperCase() : ( (iconClass === "") ? iconTexts : "") ) + "</i>" +
-                                "</a>";
+                        menuItem += "<a href=\"javascript:;\" title=\"" + title + "\" unselectable=\"on\">";
+                        menuItem += "<i class=\"fa " + iconClass + "\" name=\""+name+"\" unselectable=\"on\">"+((isHeader) ? name.toUpperCase() : ( (iconClass === "") ? iconTexts : "") ) + "</i>";
+                        menuItem += "</a>";
                     }
 
-                    menu += "</li>";
-                }
-                else
-                {
-                    menu += "<li class=\"divider\" unselectable=\"on\">|</li>";
+                    menuItem += "</li>";
+
+                    menu = pullRight ? menuItem + menu : menu + menuItem;
                 }
             }
 
@@ -3572,15 +3579,66 @@
     
     editormd.filterHTMLTags = function(html, filters) {
             
-        if (typeof filters === "string")
+        if (typeof filters !== "string") {
+            return html;
+        }
+
+        var expression = filters.split("|");
+        var filterTags = expression[0].split(",");
+        var attrs      = expression[1];
+
+        for (var i = 0, len = filterTags.length; i < len; i++)
+        {
+            var tag = filterTags[i];
+
+            html = html.replace(new RegExp("\<\s*" + tag + "\s*([^\>]*)\>([^\>]*)\<\s*\/" + tag + "\s*\>", "igm"), "");
+        }
+
+        if (typeof attrs !== "undefined")
         {
-            var filterTags = filters.split(",");
+            var htmlTagRegex = /\<(\w+)\s*([^\>]*)\>([^\>]*)\<\/(\w+)\>/ig;
 
-            for (var i = 0, len = filterTags.length; i < len; i++)
+            if (attrs === "*")
             {
-                var tag = filterTags[i];
+                html = html.replace(htmlTagRegex, function($1, $2, $3, $4, $5) {
+                    return "<" + $2 + ">" + $4 + "</" + $5 + ">";
+                });         
+            }
+            else if (attrs === "on*")
+            {
+                html = html.replace(htmlTagRegex, function($1, $2, $3, $4, $5) {
+                    var el = $("<" + $2 + ">" + $4 + "</" + $5 + ">");
+                    var _attrs = $($1)[0].attributes;
+                    var $attrs = {};
+                    
+                    $.each(_attrs, function(i, e) {
+                        $attrs[e.nodeName] = e.nodeValue;
+                    });
+                    
+                    $.each($attrs, function(i) {                
+                        if (i.indexOf("on") === 0) {
+                            delete $attrs[i];
+                        }
+                    });
+                    
+                    el.attr($attrs);
 
-                html = html.replace(new RegExp("\<\s*"+tag+"\s*([^\>]*)\>", "igm"), "").replace(new RegExp("\<\s*\/"+tag+"\s*\>", "igm"), "");
+                    return el[0].outerHTML;
+                });
+            }
+            else
+            {
+                html = html.replace(htmlTagRegex, function($1, $2, $3, $4) {
+                    var filterAttrs = attrs.split(",");
+                    var el = $($1);
+                    el.html($4);
+
+                    $.each(filterAttrs, function(i) {
+                        el.attr(filterAttrs[i], null);
+                    });
+
+                    return el[0].outerHTML;
+                });
             }
         }
         

examples/custom-keyboard-shortcuts.html

@@ -73,6 +73,7 @@ var testEditor = editormd("test-editormd", {
                         var keyMap = {
                             "Ctrl-S": function(cm) {
                                 alert("Ctrl+S");
+                                //return false;
                             },
                             "Ctrl-A": function(cm) { // default Ctrl-A selectAll
                                 // custom

examples/custom-toolbar.html

@@ -23,7 +23,9 @@ $(function() {
         height: 640,
         path : '../lib/',
         toolbarIcons : function() {
-            return ["undo", "redo", "|", "bold", "hr", "|", "preview", "watch", "|", "fullscreen", "info", "testIcon", "testIcon2", "file", "faicon"]
+            // Or return editormd.toolbarModes[name]; // full, simple, mini
+            // Using "||" set icons align right.
+            return ["undo", "redo", "|", "bold", "hr", "|", "preview", "watch", "|", "fullscreen", "info", "testIcon", "testIcon2", "file", "faicon", "||", "watch", "fullscreen", "preview", "testIcon"]
         },
         toolbarIconsClass : {
             testIcon : "fa-gears"  // 指定一个FontAawsome的图标类
@@ -102,9 +104,11 @@ $(function() {
                     width: "90%",
                     height: 640,
                     path : '../lib/',
+                    watch : false,
                     toolbarIcons : function() {
                         // Or return editormd.toolbarModes[name]; // full, simple, mini
-                        return ["undo", "redo", "|", "bold", "hr", "|", "preview", "watch", "|", "fullscreen", "info", "testIcon", "testIcon2", "file", "faicon"]
+                        // Using "||" set icons align right.
+                        return ["undo", "redo", "|", "bold", "hr", "|", "preview", "watch", "|", "fullscreen", "info", "testIcon", "testIcon2", "file", "faicon", "||", "watch", "fullscreen", "preview", "testIcon", "file"]
                     },
                     // toolbarIcons : "full", // You can also use editormd.toolbarModes[name] default list, values: full, simple, mini.
                     toolbarIconsClass : {

examples/html-tags-decode.html

@@ -16,7 +16,10 @@
                 <p>Update: 可以通过设置`settings.htmlDecode = "style,script,iframe"`来实现过滤指定标签的解析，提高安全性；</p>
             </header>
             <div class="btns">
-                <button id="filter-btn">Filter style,script,iframe tags decode</button>
+                <button class="filter-btn" exp="true">Unfilter</button>
+                <button class="filter-btn" exp="style,script,iframe|*">Filter style,script,iframe|*</button>
+                <button class="filter-btn" exp="style,script,iframe|on*">Filter style,script,iframe|on*</button>
+                <button class="filter-btn" exp="style,script,iframe|onclick,title,onmouseover,onmouseout,style">Filter style,script,iframe|onclick,title,onmouseover,onmouseout,style</button>
             </div>
             <div id="test-editormd">
                 <textarea style="display:none;">####开启识别和解析HTML标签
@@ -24,8 +27,11 @@
 配置项：
 
     {
-        htmlDecode : true
-        //htmlDecode : "style,script,iframe,sub,sup" // filter html tags
+        htmlDecode : true // Decode all html tags & attributes
+        // Filter tags/attributes expression : tagName,tagName,...|attrName,attrName,...
+        htmlDecode : "style,script,iframe,sub,sup|on*"  // Filter tags, and all on* attributes
+        //htmlDecode : "style,script,iframe,sub,sup|*"    // Filter tags, and all attributes
+        //htmlDecode : "style,script,iframe,sub,sup,embed|onclick,title,onmouseover,onmouseout,style" // Filter tags, and your custom attributes
     }
 
 ####示例
@@ -56,6 +62,11 @@ alert("script");
 alert("script");
 &lt;/script&gt;
 
+#####Events
+
+&lt;div style="color:green;" onclick="alert(1233);" title="div xxxxx"&gt;Events&lt;/div&gt;
+&lt;div style="color:red;" contenteditable onclick="alert(1233);" onmouseover="alert(1233);" onmouseout="alert(1233);" title="div xxxxx"&gt;Events&lt;/div&gt;
+
 #####插入Flash
 
 &lt;embed src="http://player.youku.com/player.php/sid/XMzA0MzIwMDgw/v.swf" allowFullScreen="true" quality="high" width="480" height="400" align="middle" allowScriptAccess="always" type="application/x-shockwave-flash"&gt;&lt;/embed&gt;
@@ -78,16 +89,15 @@ alert("script");
                     width: "90%",
                     height: 720,
                     path : '../lib/',
-                    htmlDecode : true,
-                    //htmlDecode : "style,script,iframe,sub,sup",
-                    onload : function(){
-                        //$(".markdown-body style").remove();     
-                        //$(".markdown-body script").remove();
-                    }
+                    htmlDecode : true,   // Decode all html tags & attributes
+                    // Expression : tagName,tagName,...|attrName,attrName,...
+                    //htmlDecode : "style,script,iframe,sub,sup|on*"  // Filter tags, and all on* attributes
+                    //htmlDecode : "style,script,iframe,sub,sup|*"    // Filter tags, and all attributes
+                    //htmlDecode : "style,script,iframe,sub,sup,embed|onclick,title,onmouseover,onmouseout,style" // Filter tags, and your custom attributes
                 });
                 
-                $("#filter-btn").click(function(){
-                    testEditor.config("htmlDecode", "style,script,iframe");
+                $(".filter-btn").click(function(){
+                    testEditor.config("htmlDecode", $(this).attr("exp"));
                 });
             });
         </script>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "editor.md",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Open source online markdown editor.",
   "directories": {
     "doc": "docs",
@@ -30,8 +30,6 @@
     "gulp": "^3.8.10",
     "gulp-concat": "^2.4.2",
     "gulp-header": "^1.2.2",
-    "gulp-jsdoc": "^0.1.4",
-    "gulp-jsdoc-to-markdown": "^0.1.5",
     "gulp-jshint": "^1.9.0",
     "gulp-minify-css": "^0.4.4",
     "gulp-notify": "^2.1.0",

src/editormd.js

@@ -47,7 +47,7 @@
     };
     
     editormd.title        = editormd.$name = "Editor.md";
-    editormd.version      = "1.4.1";
+    editormd.version      = "1.4.2";
     editormd.homePage     = "https://pandao.github.io/editor.md/";
     editormd.classPrefix  = "editormd-";
     
@@ -1043,12 +1043,21 @@
                             : ((typeof settings.toolbarIcons === "string")  ? editormd.toolbarModes[settings.toolbarIcons] : settings.toolbarIcons);
             
             var toolbarMenu = toolbar.find("." + this.classPrefix + "menu"), menu = "";
+            var pullRight   = false;
             
             for (var i = 0, len = icons.length; i < len; i++)
             {
                 var name = icons[i];
 
-                if (name !== "|")
+                if (name === "||") 
+                { 
+                    pullRight = true;
+                } 
+                else if (name === "|")
+                {
+                    menu += "<li class=\"divider\" unselectable=\"on\">|</li>";
+                }
+                else
                 {
                     var isHeader = (/h(\d)/.test(name));
                     var index    = name;
@@ -1065,24 +1074,22 @@
                     iconTexts = (typeof iconTexts === "undefined") ? "" : iconTexts;
                     iconClass = (typeof iconClass === "undefined") ? "" : iconClass;
 
-                    menu += "<li>";
+                    var menuItem = pullRight ? "<li class=\"pull-right\">" : "<li>";
                     
                     if (typeof settings.toolbarCustomIcons[name] !== "undefined" && typeof settings.toolbarCustomIcons[name] !== "function")
                     {
-                        menu += settings.toolbarCustomIcons[name];
+                        menuItem += settings.toolbarCustomIcons[name];
                     }
                     else 
                     {
-                        menu += "<a href=\"javascript:;\" title=\"" + title + "\" unselectable=\"on\">" +
-                                "<i class=\"fa " + iconClass + "\" name=\""+name+"\" unselectable=\"on\">"+((isHeader) ? name.toUpperCase() : ( (iconClass === "") ? iconTexts : "") ) + "</i>" +
-                                "</a>";
+                        menuItem += "<a href=\"javascript:;\" title=\"" + title + "\" unselectable=\"on\">";
+                        menuItem += "<i class=\"fa " + iconClass + "\" name=\""+name+"\" unselectable=\"on\">"+((isHeader) ? name.toUpperCase() : ( (iconClass === "") ? iconTexts : "") ) + "</i>";
+                        menuItem += "</a>";
                     }
 
-                    menu += "</li>";
-                }
-                else
-                {
-                    menu += "<li class=\"divider\" unselectable=\"on\">|</li>";
+                    menuItem += "</li>";
+
+                    menu = pullRight ? menuItem + menu : menu + menuItem;
                 }
             }
 
@@ -3560,15 +3567,66 @@
     
     editormd.filterHTMLTags = function(html, filters) {
             
-        if (typeof filters === "string")
+        if (typeof filters !== "string") {
+            return html;
+        }
+
+        var expression = filters.split("|");
+        var filterTags = expression[0].split(",");
+        var attrs      = expression[1];
+
+        for (var i = 0, len = filterTags.length; i < len; i++)
+        {
+            var tag = filterTags[i];
+
+            html = html.replace(new RegExp("\<\s*" + tag + "\s*([^\>]*)\>([^\>]*)\<\s*\/" + tag + "\s*\>", "igm"), "");
+        }
+
+        if (typeof attrs !== "undefined")
         {
-            var filterTags = filters.split(",");
+            var htmlTagRegex = /\<(\w+)\s*([^\>]*)\>([^\>]*)\<\/(\w+)\>/ig;
 
-            for (var i = 0, len = filterTags.length; i < len; i++)
+            if (attrs === "*")
             {
-                var tag = filterTags[i];
+                html = html.replace(htmlTagRegex, function($1, $2, $3, $4, $5) {
+                    return "<" + $2 + ">" + $4 + "</" + $5 + ">";
+                });         
+            }
+            else if (attrs === "on*")
+            {
+                html = html.replace(htmlTagRegex, function($1, $2, $3, $4, $5) {
+                    var el = $("<" + $2 + ">" + $4 + "</" + $5 + ">");
+                    var _attrs = $($1)[0].attributes;
+                    var $attrs = {};
+                    
+                    $.each(_attrs, function(i, e) {
+                        $attrs[e.nodeName] = e.nodeValue;
+                    });
+                    
+                    $.each($attrs, function(i) {                
+                        if (i.indexOf("on") === 0) {
+                            delete $attrs[i];
+                        }
+                    });
+                    
+                    el.attr($attrs);
 
-                html = html.replace(new RegExp("\<\s*"+tag+"\s*([^\>]*)\>", "igm"), "").replace(new RegExp("\<\s*\/"+tag+"\s*\>", "igm"), "");
+                    return el[0].outerHTML;
+                });
+            }
+            else
+            {
+                html = html.replace(htmlTagRegex, function($1, $2, $3, $4) {
+                    var filterAttrs = attrs.split(",");
+                    var el = $($1);
+                    el.html($4);
+
+                    $.each(filterAttrs, function(i) {
+                        el.attr(filterAttrs[i], null);
+                    });
+
+                    return el[0].outerHTML;
+                });
             }
         }