locomotivecms 3.0.0.rc2 → 3.0.0.rc3

data/vendor/assets/javascripts/locomotive/wysihtml5/parser_rules/advanced.js

@@ -115,19 +115,13 @@ var wysihtml5ParserRules = {
                 "align": "align_text"
             }
         },
-        "strike": {
-            "remove": 1
-        },
-        "form": {
-            "rename_tag": "div"
-        },
+        "strike": {},
+        "form": {},
         "rt": {
             "rename_tag": "span"
         },
         "code": {},
-        "acronym": {
-            "rename_tag": "span"
-        },
+        "acronym": {},
         "br": {
             "add_class": {
                 "clear": "clear_br"
@@ -148,9 +142,7 @@ var wysihtml5ParserRules = {
         "multicol": {
             "rename_tag": "div"
         },
-        "figure": {
-            "rename_tag": "div"
-        },
+        "figure": {},
         "xmp": {
             "rename_tag": "span"
         },
@@ -180,9 +172,7 @@ var wysihtml5ParserRules = {
         "dfn": {
             "rename_tag": "span"
         },
-        "iframe": {
-            "remove": 1
-        },
+        "iframe": { "check_attributes": { "class": "any" } },
         "figcaption": {
             "rename_tag": "div"
         },
@@ -190,7 +180,8 @@ var wysihtml5ParserRules = {
             "check_attributes": {
                 "target": "any",
                 "href": "any", // if you compiled master manually then change this from 'url' to 'href'
-                "title": "any"
+                "title": "any",
+                "class": "any"
             },
             "set_attributes": {
                 "rel": "nofollow"
@@ -201,7 +192,8 @@ var wysihtml5ParserRules = {
                 "width": "numbers",
                 "alt": "alt",
                 "src": "any", // if you compiled master manually then change this from 'url' to 'src'
-                "height": "numbers"
+                "height": "numbers",
+                "class": "any"
             },
             "add_class": {
                 "align": "align_img"
@@ -226,9 +218,7 @@ var wysihtml5ParserRules = {
         "sup": {
             "rename_tag": "span"
         },
-        "address": {
-            "rename_tag": "div"
-        },
+        "address": { "check_attributes": { "class": "any" } },
         "basefont": {
             "remove": 1
         },
@@ -272,12 +262,8 @@ var wysihtml5ParserRules = {
                 "align": "align_text"
             }
         },
-        "option": {
-            "rename_tag": "span"
-        },
-        "select": {
-            "rename_tag": "span"
-        },
+        "option": {},
+        "select": {},
         "i": {},
         "track": {
             "remove": 1
@@ -292,19 +278,15 @@ var wysihtml5ParserRules = {
             "rename_tag": "span",
             "set_class": "wysiwyg-font-size-larger"
         },
-        "button": {
-            "rename_tag": "span"
-        },
+        "button": {},
         "noscript": {
             "remove": 1
         },
         "svg": {
             "remove": 1
         },
-        "input": {
-            "remove": 1
-        },
-        "table": {},
+        "input": {},
+        "table": { "check_attributes": { "class": "alt" } },
         "keygen": {
             "remove": 1
         },
@@ -338,13 +320,9 @@ var wysihtml5ParserRules = {
         "base": {
             "remove": 1
         },
-        "video": {
-            "remove": 1
-        },
+        "video": {},
         "strong": {},
-        "canvas": {
-            "remove": 1
-        },
+        "canvas": {},
         "output": {
             "rename_tag": "span"
         },
@@ -395,9 +373,9 @@ var wysihtml5ParserRules = {
         "var": {
             "rename_tag": "span"
         },
-        "del": {
-            "remove": 1
-        },
+        // "del": {
+        //     "remove": 1
+        // },
         "blockquote": {
             "check_attributes": {
                 "cite": "url"
@@ -417,9 +395,7 @@ var wysihtml5ParserRules = {
                 "align": "align_text"
             }
         },
-        "textarea": {
-            "rename_tag": "span"
-        },
+        "textarea": {},
         "embed": {
             "remove": 1
         },
@@ -552,9 +528,7 @@ var wysihtml5ParserRules = {
         "frameset": {
             "remove": 1
         },
-        "optgroup": {
-            "rename_tag": "span"
-        },
+        "optgroup": {},
         "header": {
             "rename_tag": "div"
         }

data/vendor/assets/javascripts/locomotive/wysihtml5/parser_rules/advanced_unwrap.js

@@ -1,3 +1,4 @@
+console.log('[ADVANCED UNWRAP] wysihtml5ParserRules');
 /**
  * Full HTML5 compatibility rule set
  * These rules define which tags and CSS classes are supported and which tags should be specially treated.
@@ -74,8 +75,8 @@ var wysihtml5ParserRules = {
         "wysiwyg-text-align-left": 1,
         "wysiwyg-text-align-right": 1
     },
-    
-    
+
+
     "type_definitions": {
 
         "visible_content_object": {
@@ -83,7 +84,7 @@ var wysihtml5ParserRules = {
                 "has_visible_contet": 1
             }
         },
-        
+
         "alignment_object": {
             "classes": {
                 "wysiwyg-text-align-center": 1,
@@ -98,26 +99,26 @@ var wysihtml5ParserRules = {
                 "text-align": ["left", "right", "center"]
             }
         },
-        
+
         "valid_image_src": {
             "attrs": {
                 "src": /^[^data\:]/i
             }
         },
-        
+
         "text_color_object": {
           "styles": {
             "color": true,
             "background-color": true
           }
         },
-        
+
         "text_fontsize_object": {
           "styles": {
             "font-size": true
           }
         },
-        
+
         "text_formatting_object": {
             "classes": {
                 "wysiwyg-color-aqua": 1,
@@ -150,7 +151,7 @@ var wysihtml5ParserRules = {
     },
 
     "comments": 1, // if set allows comments to pass
-    
+
     /**
      * Tag list
      *
@@ -185,7 +186,7 @@ var wysihtml5ParserRules = {
      *                            - href:           allows something like "mailto:bert@foo.com", "http://google.com", "/foobar.jpg"
      *                            - alt:            strips unwanted characters. if the attribute is not set, then it gets set (to ensure valid and compatible HTML)
      *                            - numbers:  ensures that the attribute only contains numeric characters
-     *                            - any:            allows anything to pass 
+     *                            - any:            allows anything to pass
      */
     "tags": {
         "tr": {
@@ -349,7 +350,7 @@ var wysihtml5ParserRules = {
         "object": {
             "remove": 1
         },
-        
+
         "div": {
             "one_of_type": {
                 "visible_content_object": 1
@@ -363,7 +364,7 @@ var wysihtml5ParserRules = {
                 "align": "align_text"
             }
         },
-        
+
         "option": {
             "remove":1
         },
@@ -663,4 +664,4 @@ var wysihtml5ParserRules = {
             "rename_tag": "div"
         }
     }
-};
+};