Skip to content

Commit

Permalink
Merge remote-tracking branch 'malsup/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Euan Goddard committed Jul 9, 2014
2 parents 453ff1d + 0f12213 commit 29d282b
Show file tree
Hide file tree
Showing 7 changed files with 367 additions and 94 deletions.
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,13 @@ The Form Plugin supports use of [XMLHttpRequest Level 2]("http://www.w3.org/TR/X

---

##CDN Support
`<script src="//oss.maxcdn.com/jquery.form/3.50.0/jquery.form.min.js"></script>`

##Copyright and License
The jQuery Form plugin is dual licensed under the MIT and GPL licenses:
Copyright 2006-2013 (c) M. Alsup

All versions, present and past, of the jQuery Form plugin are dual licensed under the MIT and GPL licenses:

* [MIT](http://malsup.github.com/mit-license.txt)
* [GPL](http://malsup.github.com/gpl-license-v2.txt)
Expand Down
15 changes: 15 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"name": "jquery-form",
"version": "3.51.0",
"main": "jquery.form.js",
"author": "M. Alsup",
"dependencies": {
"jquery": ">=1.5"
},
"ignore": [
"README.md",
"composer.json",
"form.jquery.json",
"package.json"
]
}
40 changes: 40 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"name": "malsup/form",
"description": "A simple way to AJAX-ify any form on your page; with file upload and progress support.",
"type": "component",
"homepage": "http://jquery.malsup.com/form/",
"keywords": [
"form",
"upload",
"ajax"
],
"support": {
"issues": "https://github.com/malsup/form/issues",
"wiki": "http://jquery.malsup.com/form/"
},
"authors": [
{
"name": "M. Alsup",
"homepage": "http://jquery.malsup.com"
}
],
"license": [
"MIT",
"GPL-2.0"
],
"require": {
"components/jquery": ">=1.5"
},
"extra": {
"component": {
"scripts": [
"jquery.form.js"
],
"shim": {
"deps": [
"jquery"
]
}
}
}
}
2 changes: 1 addition & 1 deletion form.jquery.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"upload",
"ajax"
],
"version": "3.26.0-2013.01.28",
"version": "3.51.0",
"author": {
"name": "M. Alsup",
"url": "http://jquery.malsup.com"
Expand Down
18 changes: 18 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/* buildfile for jquery.form plugin */
var gulp = require('gulp'),
concat = require('gulp-concat'),
jshint = require('gulp-jshint'),
uglify = require('gulp-uglify');

gulp.task('default', function() {
gulp.src(['jquery.form.js'])
.pipe(jshint())
.pipe(jshint.reporter('default'))
.pipe(uglify({ preserveComments: 'some' }))
.pipe(concat('jquery.form.min.js'))
.pipe(gulp.dest('.'));
});

gulp.task('watch', function () {
gulp.watch('jquery.form.js', ['default']);
});
Loading

0 comments on commit 29d282b

Please sign in to comment.