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

Commit 8e4facb

Browse files
Version bump
1 parent 4c852e3 commit 8e4facb

File tree

5 files changed

+36
-17
lines changed

5 files changed

+36
-17
lines changed

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
language: node_js
2+
node_js:
3+
- "0.10"
4+
- "0.8"
5+
env:
6+
global:
7+
- secure: "JwyiLIEV6S7wzr9eUgQ/rP8BeeSY6ZabknHpUKSk4miA7d+/acFeuMAYu0d79BG8ndFIdG9EYbA7ZY1TH/metqDTrExzYLooa0XrAYg2x+cDSboII9albVn5bvdmmWIcgcmcZwKvi5JYLHWcA3Px84Aaf3YXN9V4lS1uLhl0eBI="
8+
- secure: "BVYlZy3vIt21bhrzKPgQzRlbwGCBrdBtRPRvX/qCGi1jYAoAtrT0bYllZpNqduPLouW3LaJDwOJx9zLDmZDwKDvPgTinpVwmkhZYRFl1kNweku3ZfeHR5ejOVYvdQEqVU4rOtTBLk6emItEPTuFtC9SPSYQZQtjnZAjHTg0jqLU="

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rxjs-jquery",
3-
"version": "1.1.5",
3+
"version": "1.1.6",
44
"main": "rx.jquery.js",
55
"dependencies": {
66
"rxjs": "*"

nuget/RxJS-Bridges-jQuery/RxJS-Bridges-jQuery.nuspec

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<id>RxJS-Bridges-jQuery</id>
55
<title>Reactive Extensions for JavaScript - Bridges to jQuery </title>
66
<!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
7-
<version>1.1.4</version>
7+
<version>1.1.6</version>
88
<authors>Microsoft Corporation</authors>
99
<description>This project provides Reactive Extensions for JavaScript (RxJS) bindings for jQuery to abstract over the event binding, Ajax and Deferreds.</description>
1010
<projectUrl>https://github.com/Reactive-Extensions/rxjs-jquery</projectUrl>
@@ -15,8 +15,9 @@
1515
<tags>Rx RxJS Reactive Extensions Observable</tags>
1616
<dependencies>
1717
<!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
18-
<dependency id="RxJS-Main" version="2.1" />
19-
<dependency id="RxJS-Binding" version="2.1" />
18+
<dependency id="RxJS-Main" version="2.2" />
19+
<dependency id="RxJS-Binding" version="2.2" />
20+
<dependency id="RxJS-Lite" version="2.2" />
2021
<dependency id="jQuery" />
2122
</dependencies>
2223
</metadata>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "rx-jquery",
33
"title": "Reactive Extensions for JavaScript bindings for jQuery",
44
"description": "Library for composing asynchronous and event-based operations in JavaScript extending the jQuery library",
5-
"version": "1.1.5",
5+
"version": "1.1.6",
66
"homepage": "https://github.com/Reactive-Extensions/RxJS-jQuery",
77
"author": {
88
"name": "MS Open Tech",

readme.md

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
[![Build Status](https://travis-ci.org/Reactive-Extensions/rxjs-jquery.png)](https://travis-ci.org/Reactive-Extensions/rxjs-jquery)
2+
[![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/)
3+
[![NPM version](https://badge.fury.io/js/rx-jquery.png)](http://badge.fury.io/js/rx-jquery)
4+
15
RxJS-jQuery <sup>1.1</sup> - jQuery Bindings for the Reactive Extensions for JavaScript
26
==========================================================
37
## OVERVIEW
@@ -38,9 +42,7 @@ Let's walk through a simple yet powerful example of the Reactive Extensions for
3842
We'll start out with a basic skeleton for our application with script references to jQuery, RxJS, RxJS Time-based methods, and the RxJS Bindings for jQuery, along with a textbox for input and a list for our results.
3943

4044
<script type="text/javascript" src="jquery.js"></script>
41-
<script type="text/javascript" src="rx.js"></script>
42-
<script type="text/javascript" src="rx.binding.js"></script>
43-
<script type="text/javascript" src="rx.time.js"></script>
45+
<script type="text/javascript" src="rx.lite.js"></script>
4446
<script type="text/javascript" src="rx-jquery.js"><script>
4547
<script type="text/javascript">
4648
$(function () {
@@ -189,17 +191,25 @@ We've only scratched the surface of this library in this simple example.
189191
* [`$.Callbacks`](http://api.jquery.com/category/callbacks-object/)
190192
* `Callbacks.toObservable`
191193

192-
## LICENSE
194+
## Contributing ##
195+
196+
There are lots of ways to [contribute](https://github.com/Reactive-Extensions/rxjs-jquery/wiki/Contributions) to the project, and we appreciate our [contributors](https://github.com/Reactive-Extensions/rxjs-jquery/wiki/Contributors).
197+
198+
You can contribute by reviewing and sending feedback on code checkins, suggesting and trying out new features as they are implemented, submit bugs and help us verify fixes as they are checked in, as well as submit code fixes or code contributions of your own. Note that all code submissions will be rigorously reviewed and tested by the Rx Team, and only those that meet an extremely high bar for both quality and design/roadmap appropriateness will be merged into the source.
199+
200+
## License ##
201+
202+
Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
203+
Microsoft Open Technologies would like to thank its contributors.
193204

194-
Copyright 2013 Microsoft Corporation
205+
Licensed under the Apache License, Version 2.0 (the "License"); you
206+
may not use this file except in compliance with the License. You may
207+
obtain a copy of the License at
195208

196-
Licensed under the Apache License, Version 2.0 (the "License");
197-
you may not use this file except in compliance with the License.
198-
You may obtain a copy of the License at
199-
[http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
209+
http://www.apache.org/licenses/LICENSE-2.0
200210

201211
Unless required by applicable law or agreed to in writing, software
202212
distributed under the License is distributed on an "AS IS" BASIS,
203-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
204-
See the License for the specific language governing permissions and
205-
limitations under the License.
213+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
214+
implied. See the License for the specific language governing permissions
215+
and limitations under the License.

0 commit comments

Comments
 (0)