minor updates

miguelgrinberg · Nov 11, 2013 · be1a3e4 · be1a3e4
1 parent b50acac
commit be1a3e4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -44,11 +44,11 @@ The extension needs to be initialized in the usual way before it can be used:
     app = Flask(__name__)
     pagedown = PageDown(app)
 
-Finally, the template needs the support Javascript code added, by calling `pagedown.html_head()` from inside the `<head>` element of the page:
+Finally, the template needs the support Javascript code added, by calling `pagedown.include_pagedown()` somewhere in the page:
 
     <html>
     <head>
-    {{ pagedown.html_head() }}
+    {{ pagedown.include_pagedown() }}
     </head>
     <body>
         <form method="POST">

diff --git a/example/templates/index.html b/example/templates/index.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-{{ pagedown.html_head() }}
+{{ pagedown.include_pagedown() }}
 <style>
 .flask-pagedown-input {
 }

diff --git a/flask_pagedown/__init__.py b/flask_pagedown/__init__.py
@@ -2,12 +2,15 @@
 from flask import current_app
 
 class _pagedown(object):
-    def html_head(self):
+    def include_pagedown(self):
         return Markup('''
 <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/pagedown/1.0/Markdown.Converter.min.js"></script>
 <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/pagedown/1.0/Markdown.Sanitizer.min.js"></script>
 ''')
 
+    def html_head(self):
+        return self.include_pagedown()
+
 class PageDown(object):
     def __init__(self, app = None):
         if app is not None:

diff --git a/flask_pagedown/widgets.py b/flask_pagedown/widgets.py
@@ -7,7 +7,7 @@
 pagedown_post_html = '''
 </div>
 <script type="text/javascript">
-(function() {
+f = function() {
     if (typeof flask_pagedown_converter === "undefined")
         flask_pagedown_converter = Markdown.getSanitizingConverter().makeHtml;
     var textarea = document.getElementById("flask-pagedown-%s");
@@ -16,7 +16,13 @@
     textarea.parentNode.insertBefore(preview, textarea.nextSibling);
     textarea.onkeyup = function() { preview.innerHTML = flask_pagedown_converter(textarea.value); }
     textarea.onkeyup.call(textarea);
-})();
+}
+if (window.addEventListener)
+    window.addEventListener("load", f, false);
+else if (window.attachEvent)
+    window.attachEvent("onload", f);
+else
+    f();
 </script>
 '''
 

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
     name='Flask-PageDown',
-    version='0.1.1',
+    version='0.1.2',
     url='http://github.com/miguelgrinberg/flask-pagedown/',
     license='MIT',
     author='Miguel Grinberg',