sync to upstream

1000hz · Nov 27, 2015 · 2fc2a16 · 2fc2a16
1 parent bc5c2f8
commit 2fc2a16
Show file tree

Hide file tree

Showing 33 changed files with 3 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Gruntfile.js b/Gruntfile.js
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/_config.yml b/_config.yml
diff --git a/bower.json b/bower.json
diff --git a/dist/validator.js b/dist/validator.js
@@ -215,17 +215,11 @@
 
   Validator.prototype.toggleSubmit = function () {
     if(!this.options.disable) return
-<<<<<<< HEAD
-    var $btn = $('button[type="submit"], [data-validator="submit"], input[type="submit"]')
-      .filter('[form="' + this.$element.attr('id') + '"]')
-      .add(this.$element.find('input[type="submit"], button[type="submit"], [data-validator="submit"]'))
-=======
 
     var $btn = $('button[type="submit"], input[type="submit"]')
       .filter('[form="' + this.$element.attr('id') + '"]')
       .add(this.$element.find('input[type="submit"], button[type="submit"]'))
 
->>>>>>> 1000hz/master
     $btn.toggleClass('disabled', this.isIncomplete() || this.hasErrors())
   }
 
@@ -260,7 +254,7 @@
         .html(originalContent)
     })
 
-    this.$element.find('input[type="submit"], button[type="submit"], [data-validator="submit"]').removeClass('disabled')
+    this.$element.find('input[type="submit"], button[type="submit"]').removeClass('disabled')
 
     this.$element.find('.has-error').removeClass('has-error')
 

diff --git a/dist/validator.min.js b/dist/validator.min.js
diff --git a/docs/LICENSE b/docs/LICENSE
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
diff --git a/docs/_includes/nav-main.html b/docs/_includes/nav-main.html
diff --git a/docs/_includes/nav-validator.html b/docs/_includes/nav-validator.html
diff --git a/docs/_includes/social-buttons.html b/docs/_includes/social-buttons.html
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
diff --git a/docs/assets/css/pygments-manni.css b/docs/assets/css/pygments-manni.css
diff --git a/docs/assets/ico/apple-touch-icon-144-precomposed.png b/docs/assets/ico/apple-touch-icon-144-precomposed.png
diff --git a/docs/assets/ico/favicon.png b/docs/assets/ico/favicon.png
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
diff --git a/docs/dist/validator.js b/docs/dist/validator.js
diff --git a/docs/dist/validator.min.js b/docs/dist/validator.min.js
diff --git a/docs/index.html b/docs/index.html
diff --git a/js/.jshintrc b/js/.jshintrc
diff --git a/js/tests/index.html b/js/tests/index.html
diff --git a/js/tests/unit/phantom.js b/js/tests/unit/phantom.js
diff --git a/js/tests/unit/validator.js b/js/tests/unit/validator.js
diff --git a/js/tests/vendor/jquery.js b/js/tests/vendor/jquery.js
diff --git a/js/tests/vendor/jquery.mockjax.js b/js/tests/vendor/jquery.mockjax.js
diff --git a/js/tests/vendor/qunit.css b/js/tests/vendor/qunit.css
diff --git a/js/tests/vendor/qunit.js b/js/tests/vendor/qunit.js
diff --git a/js/validator.js b/js/validator.js
@@ -235,17 +235,11 @@
 
   Validator.prototype.toggleSubmit = function () {
     if(!this.options.disable) return
-<<<<<<< HEAD
-    var $btn = $('button[type="submit"], [data-validator="submit"], input[type="submit"]')
-      .filter('[form="' + this.$element.attr('id') + '"]')
-      .add(this.$element.find('input[type="submit"], button[type="submit"], [data-validator="submit"]'))
-=======
 
     var $btn = $('button[type="submit"], input[type="submit"]')
       .filter('[form="' + this.$element.attr('id') + '"]')
       .add(this.$element.find('input[type="submit"], button[type="submit"]'))
 
->>>>>>> 1000hz/master
     $btn.toggleClass('disabled', this.isIncomplete() || this.hasErrors())
   }
 
@@ -280,7 +274,7 @@
         .html(originalContent)
     })
 
-    this.$element.find('input[type="submit"], button[type="submit"], [data-validator="submit"]').removeClass('disabled')
+    this.$element.find('input[type="submit"], button[type="submit"]').removeClass('disabled')
 
     this.$element.find('.has-error').removeClass('has-error')
 

diff --git a/package.json b/package.json