Merge pull request Reactive-Extensions#509 from chicoxyzzy/rename_con…

…tains_to_includes deprecate 'contains' operator in favour of `includes` operator
wasphub · Jan 20, 2015 · 6924b84 · 6924b84
2 parents 9dba472 + 4b6406c
commit 6924b84
Show file tree

Hide file tree

Showing 27 changed files with 129 additions and 83 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -178,7 +178,7 @@ var browsers = [{
               'src/core/linq/observable/some.js',  // where
               'src/core/linq/observable/isempty.js', // any, select
               'src/core/linq/observable/every.js', // where, any
-              'src/core/linq/observable/contains.js', // where, any
+              'src/core/linq/observable/includes.js', // where, any
               'src/core/linq/observable/count.js', // where, aggregate
               'src/core/linq/observable/indexof.js',
               'src/core/linq/observable/sum.js', // select, aggregate
@@ -465,7 +465,7 @@ var browsers = [{
               'src/core/linq/observable/some.js',  // where
               'src/core/linq/observable/isempty.js', // any, select
               'src/core/linq/observable/every.js', // where, any
-              'src/core/linq/observable/contains.js', // where, any
+              'src/core/linq/observable/includes.js', // where, any
               'src/core/linq/observable/count.js', // where, aggregate
               'src/core/linq/observable/indexof.js',
               'src/core/linq/observable/sum.js', // select, aggregate
@@ -1298,7 +1298,7 @@ var browsers = [{
               'src/core/linq/observable/some.js',  // where
               'src/core/linq/observable/isempty.js', // any, select
               'src/core/linq/observable/every.js', // where, any
-              'src/core/linq/observable/contains.js', // where, any
+              'src/core/linq/observable/includes.js', // where, any
               'src/core/linq/observable/count.js', // where, aggregate
               'src/core/linq/observable/indexof.js',
               'src/core/linq/observable/sum.js', // select, aggregate

diff --git a/dist/rx.aggregates.js b/dist/rx.aggregates.js
@@ -234,12 +234,12 @@
   };
 
   /**
-   * Determines whether an observable sequence contains a specified element with an optional equality comparer.
+   * Determines whether an observable sequence includes a specified element with an optional equality comparer.
    * @param searchElement The value to locate in the source sequence.
    * @param {Number} [fromIndex] An equality comparer to compare elements.
-   * @returns {Observable} An observable sequence containing a single element determining whether the source sequence contains an element that has the specified value from the given index.
+   * @returns {Observable} An observable sequence containing a single element determining whether the source sequence includes an element that has the specified value from the given index.
    */
-  observableProto.contains = function (searchElement, fromIndex) {
+  observableProto.includes = function (searchElement, fromIndex) {
     var source = this;
     function comparer(a, b) {
       return (a === 0 && b === 0) || (a === b || (isNaN(a) && isNaN(b)));
@@ -267,6 +267,13 @@
     }, this);
   };
 
+  /**
+   * @deprecated use #includes instead.
+   */
+  observableProto.contains = function (searchElement, fromIndex) {
+    //deprecate('contains', 'includes');
+    observableProto.includes(searchElement, fromIndex);
+  };
   /**
    * Returns an observable sequence containing a value that represents how many elements in the specified observable sequence satisfy a condition if provided, else the count of items.
    * @example

diff --git a/dist/rx.aggregates.map b/dist/rx.aggregates.map
diff --git a/dist/rx.aggregates.min.js b/dist/rx.aggregates.min.js