Always apply jQuery.noConflict to our jQuery instance

matthiask · matthiask · commit b614a6a48d00 · 2015-09-04T20:45:22.000+02:00
People can easily access feincms.jQuery (or django.jQuery for that
matter).
diff --git a/docs/settings.rst b/docs/settings.rst
@@ -45,16 +45,6 @@ which is passed to the template mentioned above. Please refer to the templates
 directly to see all available variables.
 
 
-Admin media settings
-====================
-
-``FEINCMS_JQUERY_NO_CONFLICT``: Defaults to ``False``. Django admin's jQuery is
-not available as ``$`` or ``jQuery`` in the browser, but only as
-``django.jQuery``. FeinCMS' jQuery can be made available only as
-``feincms.jQuery`` by setting this variable to ``True``. Scripts should use
-``feincms.jQuery`` anyway.
-
-
 Settings for the tree editor
 ============================
 
diff --git a/feincms/admin/item_editor.py b/feincms/admin/item_editor.py
@@ -139,7 +139,6 @@ def get_extra_context(self, request):
                 self.model, '_feincms_templates', ()),
             'has_parent_attribute': hasattr(self.model, 'parent'),
             'content_types': self.get_content_type_map(request),
-            'FEINCMS_JQUERY_NO_CONFLICT': settings.FEINCMS_JQUERY_NO_CONFLICT,
             'FEINCMS_CONTENT_FIELDSET_NAME': FEINCMS_CONTENT_FIELDSET_NAME,
         }
 
diff --git a/feincms/default_settings.py b/feincms/default_settings.py
@@ -45,15 +45,6 @@
     }
 )
 
-# ------------------------------------------------------------------------
-# Admin media settings
-
-#: avoid jQuery conflicts -- scripts should use feincms.jQuery instead of $
-FEINCMS_JQUERY_NO_CONFLICT = getattr(
-    settings,
-    'FEINCMS_JQUERY_NO_CONFLICT',
-    False)
-
 # ------------------------------------------------------------------------
 # Settings for the page module
 
diff --git a/feincms/templates/admin/feincms/load-jquery.include b/feincms/templates/admin/feincms/load-jquery.include
@@ -8,11 +8,5 @@ or load more plugins or whatnot
 <script type="text/javascript" src="{% static 'feincms/jquery-ui-1.10.3.custom.min.js' %}"></script>
 
 <script type="text/javascript">
-    var feincms = {
-        {% if FEINCMS_JQUERY_NO_CONFLICT %}
-        "jQuery": jQuery.noConflict(true)
-        {% else %}
-        "jQuery": jQuery
-        {% endif %}
-    };
+var feincms = {jQuery: jQuery.noConflict(true)};
 </script>

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,6 @@ def get_extra_context(self, request):`
`139`	`139`	`self.model, '_feincms_templates', ()),`
`140`	`140`	`'has_parent_attribute': hasattr(self.model, 'parent'),`
`141`	`141`	`'content_types': self.get_content_type_map(request),`
`142`		`- 'FEINCMS_JQUERY_NO_CONFLICT': settings.FEINCMS_JQUERY_NO_CONFLICT,`
`143`	`142`	`'FEINCMS_CONTENT_FIELDSET_NAME': FEINCMS_CONTENT_FIELDSET_NAME,`
`144`	`143`	`}`
`145`	`144`
Original file line number	Diff line number	Diff line change
`@@ -45,15 +45,6 @@`
`45`	`45`	`}`
`46`	`46`	`)`
`47`	`47`
`48`		`-# ------------------------------------------------------------------------`
`49`		`-# Admin media settings`
`50`		`-`
`51`		`-#: avoid jQuery conflicts -- scripts should use feincms.jQuery instead of $`
`52`		`-FEINCMS_JQUERY_NO_CONFLICT = getattr(`
`53`		`- settings,`
`54`		`- 'FEINCMS_JQUERY_NO_CONFLICT',`
`55`		`- False)`
`56`		`-`
`57`	`48`	`# ------------------------------------------------------------------------`
`58`	`49`	`# Settings for the page module`
`59`	`50`