Merge branch 'release/1.5.1'

Author: crucialfelix

CHANGELOG.md

@@ -1,11 +1,26 @@
 # Change Log
 
+## [1.5.1](https://github.com/crucialfelix/django-ajax-selects/tree/1.5.1) (2016-10-13)
+[Full Changelog](https://github.com/crucialfelix/django-ajax-selects/compare/1.5.0...1.5.1)
+
+**Implemented enhancements:**
+
+- Prefer document.createElement to document.write [\#182](https://github.com/crucialfelix/django-ajax-selects/issues/182)
+
+**Fixed bugs:**
+
+- fix: add related for multiple select [\#184](https://github.com/crucialfelix/django-ajax-selects/pull/184) ([crucialfelix](https://github.com/crucialfelix))
+
 ## [1.5.0](https://github.com/crucialfelix/django-ajax-selects/tree/1.5.0) (2016-09-05)
 [Full Changelog](https://github.com/crucialfelix/django-ajax-selects/compare/1.4.3...1.5.0)
 
 - Added Support for Django 1.10
 - Dropped Django 1.5
 
+**Fixed bugs:**
+
+- Initial fields are duplicated when new row added. [\#94](https://github.com/crucialfelix/django-ajax-selects/issues/94)
+
 **Closed issues:**
 
 - ValueError in Django 1.10 [\#177](https://github.com/crucialfelix/django-ajax-selects/issues/177)

ajax_select/__init__.py

@@ -1,5 +1,5 @@
 """JQuery-Ajax Autocomplete fields for Django Forms."""
-__version__ = "1.4.3"
+__version__ = "1.5.1"
 __author__ = "crucialfelix"
 __contact__ = "[email protected]"
 __homepage__ = "https://github.com/crucialfelix/django-ajax-selects/"

ajax_select/static/ajax_select/js/ajax_select.js

@@ -1,6 +1,6 @@
+window.addEventListener('load', function() {
 
-(function($) {
-  'use strict';
+  var $ = window.jQuery;
 
   $.fn.autocompleteselect = function(options) {
     return this.each(function() {
@@ -184,22 +184,24 @@
   /* Called by the popup create object when it closes.
    * For the popup this is opener.dismissAddRelatedObjectPopup
    * Django implements this in RelatedObjectLookups.js
+   * In django >= 1.10 we can rely on input.trigger('change')
+   * and avoid this hijacking.
    */
   var djangoDismissAddRelatedObjectPopup = window.dismissAddRelatedObjectPopup || window.dismissAddAnotherPopup;
   window.dismissAddRelatedObjectPopup = function(win, newId, newRepr) {
-    // This may be called for ajax-select inputs or for other inputs.
-    // Call the original which sets the input (just the pk)
-    // calls input.trigger('changed') if >= 1.10
-    // and closes the window.
-    if (djangoDismissAddRelatedObjectPopup) {
-      djangoDismissAddRelatedObjectPopup(win, newId, newRepr);
-    } else {
+    // Iff this is an ajax-select input then close the window and
+    // trigger didAddPopup
+    var name = window.windowname_to_id(win.name);
+    var input = $('#' + name);
+    if (input.data('ajax-select')) {
       win.close();
+      // newRepr is django's repr of object
+      // not the Lookup's formatting of it.
+      input.trigger('didAddPopup', [newId, newRepr]);
+    } else {
+      // Call the normal django set and close function.
+      djangoDismissAddRelatedObjectPopup(win, newId, newRepr);
     }
-    var name = window.windowname_to_id(win.name);
-    // newRepr is django's repr of object
-    // not the Lookup's formatting of it.
-    $('#' + name).trigger('didAddPopup', [newId, newRepr]);
   }
   // Django renamed this function in 1.8
   window.dismissAddAnotherPopup = window.dismissAddRelatedObjectPopup;
@@ -243,4 +245,4 @@
       });
   });
 
-})(window.jQuery);
+}, {once: true});

ajax_select/static/ajax_select/js/bootstrap.js

@@ -1,7 +1,32 @@
-// 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" />');
-}
+(function(w) {
+  /**
+   * load jquery and jquery-ui if needed
+   */
+
+  function not(thing) {
+    return typeof thing === 'undefined';
+  }
+
+  function loadJS(src) {
+    var script = document.createElement('script');
+    script.src = src;
+    document.head.appendChild(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);

docs/source/Outside-of-Admin.rst

@@ -5,7 +5,7 @@ ajax_selects does not need to be in a Django admin.
 
 When placing your form on the page be sure to include the static assets:
 
-    {{ form.meta }}
+    {{ form.media }}
 
 This includes the javascript and css files.
 

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name='django-ajax-selects',
-    version='1.5.0',
+    version='1.5.1',
     description='Edit ForeignKey, ManyToManyField and CharField in Django Admin using jQuery UI AutoComplete.',
     author='Chris Sattinger',
     author_email='[email protected]',