[Python-modules-commits] [django-ajax-selects] 04/08: Update patch after new upstream import

[Brian May]

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

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

commit 60884981db01101c2b1dded4bcc40e86d27befd2
Author: Brian May <bam at debian.org>
Date:   Wed Jul 5 17:16:01 2017 +1000

    Update patch after new upstream import
---
 .../0001-Remove-upstream-s-bootstrap.js.patch      | 51 ++++++++++++++++------
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/debian/patches/0001-Remove-upstream-s-bootstrap.js.patch b/debian/patches/0001-Remove-upstream-s-bootstrap.js.patch
index 7d285e2..e060fbd 100644
--- a/debian/patches/0001-Remove-upstream-s-bootstrap.js.patch
+++ b/debian/patches/0001-Remove-upstream-s-bootstrap.js.patch
@@ -13,16 +13,16 @@ 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(-)
+ ajax_select/fields.py                          | 10 +--------
+ ajax_select/static/ajax_select/js/bootstrap.js | 30 --------------------------
+ 2 files changed, 1 insertion(+), 39 deletions(-)
  delete mode 100644 ajax_select/static/ajax_select/js/bootstrap.js
 
 diff --git a/ajax_select/fields.py b/ajax_select/fields.py
-index 15edda3..fc89fd4 100644
+index 2692c45..5ef6909 100644
 --- a/ajax_select/fields.py
 +++ b/ajax_select/fields.py
-@@ -22,15 +22,7 @@ as_default_help = 'Enter text to search.'
+@@ -23,15 +23,7 @@ as_default_help = 'Enter text to search.'
  
  
  def _media(self):
@@ -41,14 +41,37 @@ index 15edda3..fc89fd4 100644
  
 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
+index cb742ea..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" />');
--}
+@@ -1,30 +0,0 @@
+-(function(w) {
+-  /**
+-   * load jquery and jquery-ui if needed
+-   */
+-
+-  function not(thing) {
+-    return typeof thing === 'undefined';
+-  }
+-
+-  function loadJS(src) {
+-    document.write('<script type="text/javascript"  src="' + src + '"><\/script>');
+-  }
+-
+-  function loadCSS(href) {
+-    var script = document.createElement('link');
+-    script.href = href;
+-    script.type = 'text/css';
+-    script.rel = 'stylesheet';
+-    document.head.appendChild(script);
+-  }
+-
+-  if (not(w.jQuery)) {
+-    loadJS('//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js');
+-  }
+-
+-  if (not(w.jQuery) || not(w.jQuery.ui) || not(w.jQuery.ui.autocomplete)) {
+-    loadJS('//code.jquery.com/ui/1.10.3/jquery-ui.js');
+-    loadCSS('//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css');
+-  }
+-})(window);

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