Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix check_attributes for insertImage

  • Loading branch information...
commit 58047a828bb9ba67af6fe2f5a48687d63b8fc65c 1 parent f298603
@danirus authored
View
4 wysihtml5/static/admin/wysihtml5/js/advanced.js
@@ -180,7 +180,7 @@ var wysihtml5ParserRules = {
},
"a": {
"check_attributes": {
- "href": "url" // if you compiled master manually then change this from 'url' to 'href'
+ "href": "href" // if you compiled master manually then change this from 'url' to 'href'
},
"set_attributes": {
"rel": "nofollow",
@@ -191,7 +191,7 @@ var wysihtml5ParserRules = {
"check_attributes": {
"width": "numbers",
"alt": "alt",
- "src": "url", // if you compiled master manually then change this from 'url' to 'src'
+ "src": "src", // if you compiled master manually then change this from 'url' to 'src'
"height": "numbers"
},
"add_class": {
View
267 wysihtml5/static/admin/wysihtml5/js/wysihtml5-0.4.0pre.min.js
267 additions, 0 deletions not shown
View
5 wysihtml5/static/wysihtml5/css/stylesheet.css
@@ -13,4 +13,7 @@
.wysiwyg-text-align-right { text-align: right }
.wysiwyg-float-left { float: left }
-.wysiwyg-float-right { float: right }
+.wysiwyg-float-right { float: right }
+
+IMG.wysiwyg-float-left { margin: 10px 20px 10px 0 }
+IMG.wysiwyg-float-right { margin: 10px 0 20px 10px }
View
6 wysihtml5/widgets.py
@@ -117,13 +117,13 @@ class Media:
'all': (settings.STATIC_URL + "admin/wysihtml5/css/toolbar.css",)
}
js = (settings.STATIC_URL + "admin/wysihtml5/js/advanced.js",
- settings.STATIC_URL + "admin/wysihtml5/js/wysihtml5-0.3.0.min.js")
+ settings.STATIC_URL + "admin/wysihtml5/js/wysihtml5-0.4.0pre.min.js")
def __init__(self, attrs=None):
if not attrs:
- attrs = {"rows": 15}
+ attrs = {"rows": 25}
elif not attrs.get("rows", False):
- attrs.update({"rows": 15})
+ attrs.update({"rows": 25})
super(Wysihtml5AdminTextareaWidget, self).__init__(attrs=attrs)
def render(self, name, value, attrs=None):
Please sign in to comment.
Something went wrong with that request. Please try again.