Merge f3bc636 into a314c08

.travis.yml

@@ -9,7 +9,8 @@ env:
   - DJANGO='Django>=1.4,<1.5'
   - DJANGO='Django>=1.5,<1.6'
   - DJANGO='Django>=1.6,<1.7'
-#  - DJANGO='Django>=1.7,<1.8'
+  - DJANGO='Django>=1.7,<1.8'
+  - DJANGO='Django>=1.8,<1.9'
 #  - DJANGO='https://github.com/django/django/tarball/stable/1.8.x'
 
 install:

parsley/static/parsley/js/parsley.django-admin.js

@@ -1,14 +1,44 @@
 /*
- * Parsley.js - django admin helper
-*/
+ * Django admin helper for Parsley.js.
+ *
+ * This calls `parsley` for all forms, and sets up event listeners
+ * to handle success and errors on field validation.
+ *
+ * It supports [django-grappelli](https://github.com/sehmaschine/django-grappelli).
+ */
 
-!function ($) {
+(function ($) {
   'use strict';
 
   $( window ).on( 'load', function () {
-    $( 'form' ).each( function () {
+    var is_grappelli = $('#grp-container').length;
+    var form_selector = is_grappelli ? '.grp-change-form form' : '.change-form form';
+    var row_selector = is_grappelli ? '.grp-row' : '.form-row';
+
+    $( form_selector ).each( function () {
       $( this ).parsley({
+          errorsWrapper: '<ul class="errorlist"></ul>',
+          errorsContainer: function (field) {
+            if (is_grappelli) {
+              // Grappelli appends the errors to the field (div).
+              // ".grp-tr .grp-td" handles inline forms.
+              return $("<div />").appendTo(
+                field.$element.closest(".grp-tr .grp-td, div")
+              );
+            }
+            return $("<div />").prependTo(
+              // "tr.form-row td" handles inline forms.
+              field.$element.closest("tr.form-row td, div.form-row")
+            );
+          }
+      }).subscribe('parsley:field:error', function (field) {
+          var container = field.$element.closest(row_selector);
+          console.log(container);
+          container.addClass("errors grp-errors");
+      }).subscribe('parsley:field:success', function (field) {
+          var container = field.$element.closest(row_selector);
+          container.removeClass("errors grp-errors");
       });
     } );
   } );
-}(window.jQuery || window.Zepto);
+})(window.jQuery || window.Zepto);

setup.py

@@ -123,7 +123,7 @@ def find_package_data(
         "Framework :: Django",
     ],
     zip_safe=False,
-    install_requires=["Django>=1.3,<=1.8"],
-    tests_require=["Django>=1.3,<=1.7", "six"],
+    install_requires=["Django>=1.3,<=1.8.999"],
+    tests_require=["Django>=1.3,<=1.8.999", "six"],
     test_suite='runtests.runtests',
 )