diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-09-23 21:27:38 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-09-23 21:27:38 -0400 |
| commit | 39c4bb7e8192d28d146f4ba694e0f60d674f208b (patch) | |
| tree | 4b899bd470a02adae31909c2b6afd2ff99d2e2f6 | |
| parent | 3edb78a4c658ccc8499afc99693a15a5625644c0 (diff) | |
| download | askbot-39c4bb7e8192d28d146f4ba694e0f60d674f208b.tar.gz askbot-39c4bb7e8192d28d146f4ba694e0f60d674f208b.tar.bz2 askbot-39c4bb7e8192d28d146f4ba694e0f60d674f208b.zip | |
fixed a syntax error in the settings.py templates
4 files changed, 4 insertions, 2 deletions
diff --git a/askbot/media/js/tinymce/plugins/askbot_attachment/editor_plugin.js b/askbot/media/js/tinymce/plugins/askbot_attachment/editor_plugin.js index bf49b33e..717a4716 100644 --- a/askbot/media/js/tinymce/plugins/askbot_attachment/editor_plugin.js +++ b/askbot/media/js/tinymce/plugins/askbot_attachment/editor_plugin.js @@ -18,6 +18,7 @@ tinyMCE.activeEditor.focus();
if (document.selection) {
+ //this branch is a work around the IE's "this" quirk
var sel = document.selection.createRange();
sel.pasteHTML(content);
} else {
diff --git a/askbot/media/js/tinymce/plugins/askbot_imageuploader/editor_plugin.js b/askbot/media/js/tinymce/plugins/askbot_imageuploader/editor_plugin.js index ac6722f2..7fa6b6be 100644 --- a/askbot/media/js/tinymce/plugins/askbot_imageuploader/editor_plugin.js +++ b/askbot/media/js/tinymce/plugins/askbot_imageuploader/editor_plugin.js @@ -18,6 +18,7 @@ tinyMCE.activeEditor.focus();
if (document.selection) {
+ //this branch is a work around the IE "this" quirk
var sel = document.selection.createRange();
sel.pasteHTML(content);
} else {
diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py index a257a9f0..8577281c 100644 --- a/askbot/setup_templates/settings.py +++ b/askbot/setup_templates/settings.py @@ -230,7 +230,7 @@ CSRF_COOKIE_NAME = 'askbot_csrf' #CSRF_COOKIE_DOMAIN = '' STATICFILES_DIRS = ( - ('default/media', os.path.join(ASKBOT_ROOT, 'media'), + ('default/media', os.path.join(ASKBOT_ROOT, 'media')), ) RECAPTCHA_USE_SSL = True diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache index 8ed69803..6a40969d 100644 --- a/askbot/setup_templates/settings.py.mustache +++ b/askbot/setup_templates/settings.py.mustache @@ -231,7 +231,7 @@ CSRF_COOKIE_NAME = '{{domain_name}}_csrf' STATIC_ROOT = os.path.join(PROJECT_ROOT, "static") STATICFILES_DIRS = ( - ('default/media', os.path.join(ASKBOT_ROOT, 'media'), + ('default/media', os.path.join(ASKBOT_ROOT, 'media')), ) RECAPTCHA_USE_SSL = True |