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

Commit

Permalink
version bump to 2.2.5 and fix issue #66
Browse files Browse the repository at this point in the history
  • Loading branch information
mattpodwysocki committed Nov 17, 2013
1 parent 3fbdb02 commit 869e0d9
Show file tree
Hide file tree
Showing 16 changed files with 55 additions and 24 deletions.
5 changes: 5 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,10 @@ module.exports = function (grunt) {
createNuGetPackage.call(this, 'nuget/RxJS-JoinPatterns/RxJS-JoinPatterns.nuspec');
});

grunt.registerTask('nuget-lite', 'Register NuGet-Lite', function () {
createNuGetPackage.call(this, 'nuget/RxJS-Lite/RxJS-Lite.nuspec');
});

grunt.registerTask('nuget-main', 'Register NuGet-Main', function () {
createNuGetPackage.call(this, 'nuget/RxJS-Main/RxJS-Main.nuspec');
});
Expand All @@ -922,6 +926,7 @@ module.exports = function (grunt) {
'nuget-coincidence',
'nuget-experimental',
'nuget-joinpatterns',
'nuget-lite',
'nuget-main',
'nuget-testing',
'nuget-time',
Expand Down
6 changes: 5 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
{
"name": "rxjs",
"version": "2.2.4",
"version": "2.2.5",
"main": [
"rx.js",
"rx.compat.js",
"rx.aggregates.js",
"rx.async.js",
"rx.async.compat.js",
"rx.binding.js",
"rx.coincidence.js",
"rx.experimental.js",
"rx.lite.js",
"rx.lite.compat.js",
"rx.joinpatterns.js",
"rx.testing.js",
"rx.time.js",
Expand Down
2 changes: 1 addition & 1 deletion nuget/RxJS-Aggregates/RxJS-Aggregates.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<id>RxJS-Aggregates</id>
<title>Reactive Extensions for JavaScript - Aggregation Operations</title>
<!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
<version>2.2.3</version>
<version>2.2.5</version>
<authors>Microsoft Corporation</authors>
<description>Reactive Extensions for JavaScript library with aggregation event processing query operations.</description>
<projectUrl>http://rx.codeplex.com</projectUrl>
Expand Down
2 changes: 1 addition & 1 deletion nuget/RxJS-All/RxJS-All.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<id>RxJS-All</id>
<title>Reactive Extensions for JavaScript - All Libraries</title>
<!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
<version>2.1.21</version>
<version>2.2.5</version>
<authors>Microsoft Corporation</authors>
<description>Reactive Extensions for JavaScript libraries.</description>
<projectUrl>http://rx.codeplex.com</projectUrl>
Expand Down
2 changes: 1 addition & 1 deletion nuget/RxJS-Async/RxJS-Async.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<id>RxJS-Async</id>
<title>Reactive Extensions for JavaScript - Async-Based Operations</title>
<!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
<version>2.2.3</version>
<version>2.2.5</version>
<authors>Microsoft Corporation</authors>
<description>Reactive Extensions for JavaScript library with async-based event processing query operations.</description>
<projectUrl>http://go.microsoft.com/fwlink/?LinkID=179929</projectUrl>
Expand Down
2 changes: 1 addition & 1 deletion nuget/RxJS-Binding/RxJS-Binding.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>RxJS-Binding</id>
<title>Reactive Extensions for JavaScript - Binding</title>
<version>2.2.3</version>
<version>2.2.5</version>
<authors>Microsoft Corporation</authors>
<description>Reactive Extensions for JavaScript library with binding operationrs.</description>
<projectUrl>http://rx.codeplex.com</projectUrl>
Expand Down
2 changes: 1 addition & 1 deletion nuget/RxJS-Coincidence/RxJS-Coincidence.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<id>RxJS-Coincidence</id>
<title>Reactive Extensions for JavaScript - Coincidence</title>
<!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
<version>2.2.3</version>
<version>2.2.5</version>
<authors>Microsoft Corporation</authors>
<description>Reactive Extensions for JavaScript library with reactive coincidence join event processing query operations.</description>
<projectUrl>http://rx.codeplex.com</projectUrl>
Expand Down
2 changes: 1 addition & 1 deletion nuget/RxJS-Experimental/RxJS-Experimental.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<id>RxJS-Experimental</id>
<title>Reactive Extensions for JavaScript - Experimental</title>
<!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
<version>2.2.3</version>
<version>2.2.5</version>
<authors>Microsoft Corporation</authors>
<description>Reactive Extensions for JavaScript library with experimental operators.</description>
<projectUrl>http://rx.codeplex.com</projectUrl>
Expand Down
2 changes: 1 addition & 1 deletion nuget/RxJS-JoinPatterns/RxJS-JoinPatterns.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<id>RxJS-JoinPatterns</id>
<title>Reactive Extensions for JavaScript - Join Patterns</title>
<!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
<version>2.2.3</version>
<version>2.2.5</version>
<authors>Microsoft Corporation</authors>
<description>Reactive Extensions for JavaScript library with join patterns event processing query operations.</description>
<projectUrl>http://rx.codeplex.com</projectUrl>
Expand Down
23 changes: 23 additions & 0 deletions nuget/RxJS-Lite/RxJS-Main.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0"?>
<package>
<metadata>
<id>RxJS-Main</id>
<title>Reactive Extensions for JavaScript - Lite Library</title>
<!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
<version>2.2.5</version>
<authors>Microsoft Corporation</authors>
<description>Reactive Extensions for JavaScript main library used to express complex event processing queries over observable sequences.</description>
<projectUrl>http://rx.codeplex.com</projectUrl>
<iconUrl>http://go.microsoft.com/fwlink/?LinkId=261274</iconUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</licenseUrl>
<language>en-US</language>
<tags>Rx RxJS Reactive Extensions Observable</tags>
</metadata>
<files>
<file src="..\..\rx.lite.js" target="content\Scripts\rx.lite.js" />
<file src="..\..\rx.lite.min.js" target="content\Scripts\rx.lite.min.js" />
<file src="..\..\rx.lite.compat.js" target="content\Scripts\rx.lite.compat.js" />
<file src="..\..\rx.lite.compat.min.js" target="content\Scripts\rx.lite.compat.min.js" />
</files>
</package>
6 changes: 3 additions & 3 deletions nuget/RxJS-Main/RxJS-Main.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<id>RxJS-Main</id>
<title>Reactive Extensions for JavaScript - Main Library</title>
<!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
<version>2.2.3</version>
<version>2.2.5</version>
<authors>Microsoft Corporation</authors>
<description>Reactive Extensions for JavaScript main library used to express complex event processing queries over observable sequences.</description>
<projectUrl>http://rx.codeplex.com</projectUrl>
Expand All @@ -16,8 +16,8 @@
</metadata>
<files>
<file src="..\..\rx.js" target="content\Scripts\rx.js" />
<file src="..\..\rx.min.js" target="content\Scripts\x.min.js" />
<file src="..\..\rx.min.js" target="content\Scripts\rx.min.js" />
<file src="..\..\rx.compat.js" target="content\Scripts\rx.compat.js" />
<file src="..\..\rx.compat.min.js" target="content\Scripts\x.compat.min.js" />
<file src="..\..\rx.compat.min.js" target="content\Scripts\rx.compat.min.js" />
</files>
</package>
2 changes: 1 addition & 1 deletion nuget/RxJS-Testing/RxJS-Testing.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<id>RxJS-Testing</id>
<title>Reactive Extensions for JavaScript - Test Library</title>
<!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
<version>2.2.3</version>
<version>2.2.5</version>
<authors>Microsoft Corporation</authors>
<description>Reactive Extensions for JavaScript test library, used to write unit tests for complex event processing queries.</description>
<projectUrl>http://rx.codeplex.com</projectUrl>
Expand Down
2 changes: 1 addition & 1 deletion nuget/RxJS-Time/RxJS-Time.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<id>RxJS-Time</id>
<title>Reactive Extensions for JavaScript - Time-Based Operations</title>
<!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
<version>2.2.3</version>
<version>2.2.5</version>
<authors>Microsoft Corporation</authors>
<description>Reactive Extensions for JavaScript library with time-based event processing query operations.</description>
<projectUrl>http://go.microsoft.com/fwlink/?LinkID=179929</projectUrl>
Expand Down
2 changes: 1 addition & 1 deletion nuget/RxJS-VirtualTime/RxJS-VirtualTime.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<id>RxJS-VirtualTime</id>
<title>Reactive Extensions for JavaScript - Virtual Time-Based Schedulers</title>
<!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
<version>2.2.3</version>
<version>2.2.5</version>
<authors>Microsoft Corporation</authors>
<description>Reactive Extensions for JavaScript library with virtual time based schedulers.</description>
<projectUrl>http://go.microsoft.com/fwlink/?LinkID=179929</projectUrl>
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "rx",
"title": "Reactive Extensions for JavaScript (RxJS)",
"description": "Library for composing asynchronous and event-based operations in JavaScript",
"version": "2.2.4",
"homepage": "http://rx.codeplex.com",
"version": "2.2.5",
"homepage": "https://github.com/Reactive-Extensions/RxJS",
"author": {
"name": "Cloud Programmability Team",
"url": "https://github.com/Reactive-Extensions/RxJS/blob/master/authors.txt"
Expand Down
15 changes: 7 additions & 8 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,11 @@ This set of libraries include:
- **rx.coincidence.js** - reactive coincidence join event processing query operations
- **rx.experimental.js** - experimental operators including imperative operators and forkJoin
- **rx.joinpatterns.js** - join patterns event processing query operations
- **rx.testing.js** - used to write unit tests for complex event processing queries.
- **rx.time.js** - time-based event processing query operations.
- **rx.virtualtime.js** - virtual-time-based schedulers.
- **rx.lite.js** - lite version with event bindings, creation, time and standard query operators
- **rx.lite.compat.js** - lite version with event bindings, creation, time and standard query operators with compatibility back to IE6
- **rx.testing.js** - used to write unit tests for complex event processing queries
- **rx.time.js** - time-based event processing query operations
- **rx.virtualtime.js** - virtual-time-based schedulers

## Why RxJS? ##

Expand All @@ -92,10 +94,7 @@ To give you an idea about rich composition, we can create an autocompletion serv
First, we'll reference the JavaScript files, including jQuery, although RxJS has no dependencies on jQuery...

<script src="http://code.jquery.com/jquery-1.9.1.js"></script>
<script src="rx.js"></script>
<script src="rx.async.js"></script>
<script src="rx.binding.js"></script>
<script src="rx.time.js"></script>
<script src="rx.lite.js"></script>

Next, we'll get the user input from an input, listening to the keyup event by using the `Rx.Observable.fromEvent` method.

Expand Down Expand Up @@ -189,7 +188,7 @@ You can find the documentation [here](https://github.com/Reactive-Extensions/RxJ
- [Your Mouse is a Database](http://queue.acm.org/detail.cfm?id=2169076)

- Tutorials
- [Learn RxJS](http://jhusain.github.io/learnrx/)
- [Learn RxJS](http://reactive-extensions.github.io/learnrx/)
- [RxJS Koans](https://github.com/mattpodwysocki/RxJSKoans)
- [Rx Workshop](http://rxworkshop.codeplex.com/)

Expand Down

0 comments on commit 869e0d9

Please sign in to comment.