Merge branch 'master' of github.com:froala/django-froala-editor

froala · Feb 23, 2015 · 7c25ef9 · 7c25ef9
2 parents 339114d + 597f51d
commit 7c25ef9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/froala_editor/widgets.py b/froala_editor/widgets.py
@@ -12,8 +12,8 @@ def __init__(self, *args, **kwargs):
             'font_size', 'font_family', 'colors', 'block_styles', 'video', 'tables', 'media_manager', 'lists',
             'file_upload'
         )))
-        self.theme = kwargs.pop('theme', None)
-        self.include_jquery = kwargs.pop('include_jquery', True)
+        self.theme = kwargs.pop('theme', getattr(settings, 'FROALA_EDITOR_THEME', None))
+        self.include_jquery = kwargs.pop('include_jquery', getattr(settings, 'FROALA_INCLUDE_JQUERY', True))
         self.image_upload = kwargs.pop('image_upload', True)
         self.file_upload = kwargs.pop('file_upload', True)
         super(FroalaEditor, self).__init__(*args, **kwargs)