[Python-modules-commits] [django-ajax-selects] 02/05: Remove upstream's bootstrap.js

[Brian May]

This is an automated email from the git hooks/post-receive script.

bam pushed a commit to branch master
in repository django-ajax-selects.

commit b86901aa48e055b19dbd4eb98cd01080c1d88df0
Author: Brian May <bam at debian.org>
Date:   Tue Dec 15 16:18:04 2015 +1100

    Remove upstream's bootstrap.js
    
    Contains privacy invading URLs, and I can't think of a better solution.
    
    I raised issues I was having with lintian on debian-devel:
    https://lists.debian.org/debian-devel/2015/11/msg00249.html
    
    Discussions are continuing this month:
    https://lists.debian.org/debian-devel/2015/12/msg00011.html
    
    And on debian-python:
    https://lists.debian.org/debian-python/2015/12/msg00009.html
---
 ajax_select/fields.py                          | 10 +---------
 ajax_select/static/ajax_select/js/bootstrap.js |  7 -------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/ajax_select/fields.py b/ajax_select/fields.py
index 5056426..d76921e 100644
--- a/ajax_select/fields.py
+++ b/ajax_select/fields.py
@@ -22,15 +22,7 @@ as_default_help = 'Enter text to search.'
 
 
 def _media(self):
-    # unless AJAX_SELECT_BOOTSTRAP == False
-    # then load jquery and jquery ui + default css
-    # where needed
-    js = ('ajax_select/js/bootstrap.js', 'ajax_select/js/ajax_select.js')
-    try:
-        if not settings.AJAX_SELECT_BOOTSTRAP:
-            js = ('ajax_select/js/ajax_select.js',)
-    except AttributeError:
-        pass
+    js = ('ajax_select/js/ajax_select.js', )
     return forms.Media(css={'all': ('ajax_select/css/ajax_select.css',)}, js=js)
 
 
diff --git a/ajax_select/static/ajax_select/js/bootstrap.js b/ajax_select/static/ajax_select/js/bootstrap.js
deleted file mode 100644
index f2f02d8..0000000
--- a/ajax_select/static/ajax_select/js/bootstrap.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// load jquery and jquery-ui if needed
-// into window.jQuery
-if (typeof window.jQuery === 'undefined') {
-  document.write('<script type="text/javascript"  src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"><\/script><script type="text/javascript"  src="//code.jquery.com/ui/1.10.3/jquery-ui.js"><\/script><link type="text/css" rel="stylesheet" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />');
-} else if(typeof window.jQuery.ui === 'undefined' || typeof window.jQuery.ui.autocomplete === 'undefined') {
-  document.write('<script type="text/javascript"  src="//code.jquery.com/ui/1.10.3/jquery-ui.js"><\/script><link type="text/css" rel="stylesheet" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />');
-}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-ajax-selects.git