Skip to content
This repository was archived by the owner on Jun 3, 2018. It is now read-only.

Commit 8ba3078

Browse files
committed
Prepare v1.3.5
1 parent 39b003d commit 8ba3078

File tree

9 files changed

+18
-9
lines changed

9 files changed

+18
-9
lines changed

Changes

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
Revision history for jQuery Timeout Plugin
22

3+
1.3.5 2014-09-14
4+
5+
- Fix `Timeout.reset()` handling of new delay.
6+
7+
- Fix `jQuery.timeoutWith()` context handling.
8+
9+
- Fix jshint warnings.
10+
311
1.3.4 2014-09-14
412

513
- Exclude bower.json from Bower ignores.

Gruntfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ module.exports = function(grunt) {
2525
src: ["src/jquery.timeout.js"],
2626
dest: "dist/jquery.timeout.js"
2727
},
28-
manifest: {
28+
plugin: {
2929
options: {
3030
process: true
3131
},
32-
src: ["src/timeout.jquery.json"],
32+
src: ["src/plugin.json"],
3333
dest: "timeout.jquery.json"
3434
},
3535
bower: {

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ Reset a pending Timeout object by restarting its timer. If the
5252
optional argument `newDelay` is specified, the corresponding Deferred
5353
object will be resolved after `newDelay` milliseconds. Otherwise, the
5454
original `delay` passed to `jQuery.timeout()` or
55-
`jQuery.timeoutWith()` is used. Note that calling `timeout.reset()`
56-
has no effect if the Deferred has already been resolved or rejected.
55+
`jQuery.timeoutWith()`, or the last delay specified via
56+
`timeout.reset()` is used. Note that calling `timeout.reset()` has no
57+
effect if the Deferred has already been resolved or rejected.
5758

5859

5960
## Examples

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "jquery-timeout",
33
"description": "Simple, yet elegant jQuery.Deferred wrapper for window.setTimeout() and window.clearTimeout().",
4-
"version": "1.3.4",
4+
"version": "1.3.5",
55
"main": "dist/jquery.timeout.js",
66
"license": "MIT",
77
"ignore": [

dist/jquery.timeout.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* jQuery Timeout Plugin v1.3.4
2+
* jQuery Timeout Plugin v1.3.5
33
* http://github.com/tkem/jquery-timeout/
44
*
55
* Copyright (c) 2011-2014 Thomas Kemmer.

dist/jquery.timeout.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jquery-timeout",
3-
"version": "1.3.4",
3+
"version": "1.3.5",
44
"title": "jQuery Timeout Plugin",
55
"description": "Simple, yet elegant jQuery.Deferred wrapper for window.setTimeout() and window.clearTimeout().",
66
"keywords": ["timeout", "deferred", "promise", "delay"],
File renamed without changes.

timeout.jquery.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "timeout",
3-
"version": "1.3.4",
3+
"version": "1.3.5",
44
"title": "jQuery Timeout Plugin",
55
"author": {
66
"name": "Thomas Kemmer",

0 commit comments

Comments
 (0)