Merge pull request #34 from tomoconnor/fix_trim_issue_32

In django-admin, $ does not = jQuery. Changing $.trim() to jQuery.trim(...
klen · Oct 6, 2014 · 6aaa2da · 6aaa2da
2 parents 861805f + 4a6f8cb
commit 6aaa2da
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/django_markdown/static/django_markdown/sets/markdown/set.js b/django_markdown/static/django_markdown/sets/markdown/set.js
@@ -42,7 +42,7 @@ mySettings = {
 miu = {
 	markdownTitle: function(markItUp, achar) {
 		heading = '';
-		n = $.trim(markItUp.selection||markItUp.placeHolder).length;
+		n = jQuery.trim(markItUp.selection||markItUp.placeHolder).length;
 		// work around bug in python-markdown where header underlines must be at least 3 chars
 		if (n < 3) { n = 3; }
 		for(i = 0; i < n; i++) {

diff --git a/django_markdown/static/django_markdown/sets/markdownextra/set.js b/django_markdown/static/django_markdown/sets/markdownextra/set.js
@@ -78,7 +78,7 @@ mySettings = {
 miu = {
 	markdownextraTitle: function(markItUp, achar) {
 		heading = '';
-		n = $.trim(markItUp.selection||markItUp.placeHolder).length;
+		n = jQuery.trim(markItUp.selection||markItUp.placeHolder).length;
 		for(i = 0; i < n; i++) {
 			heading += achar;
 		}