Anonymous avatar Anonymous committed d6b7d2f Merge

merge from vorushin

Comments (0)

Files changed (3)

 tip (unreleased)
 ----------------
 
+- wrap jQuery usage in anonymous function, to be more robust against other
+  JS framework code on the page (including other jQuerys).  Thanks Mikhael
+  Korneev.
+
+- upgrade to MarkItUp! 1.1.7
+
 - add render_markup template filter
 
 - update to jQuery 1.4 and MarkItUp! 1.1.6

markitup/templates/markitup/editor.html

 <script type="text/javascript">
+(function($) {
 $(document).ready(function() {
   $("#{{ textarea_id }}").markItUp(mySettings);
   {% if AUTO_PREVIEW %}$('a[title="Preview"]').trigger('mouseup');{% endif %}
 });
+})(jQuery);
 </script>

markitup/widgets.py

         else: auto_preview = ''
 
         html += ('<script type="text/javascript">'
+                '(function($) { '
                  '$(document).ready(function() {'
                  '  $("#%(id)s").markItUp(mySettings);'
                  '  %(auto_preview)s '
                  '});'
+                 '})(jQuery);'
                  '</script>' % {'id': attrs['id'],
                                 'auto_preview': auto_preview })
         return mark_safe(html)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.