Remove function callback

1 files changed, 16 insertions, 54 deletions

diff --git a/jquery.once.js b/jquery.once.js
index dfde181..222aef4 100644
--- a/jquery.once.js
+++ b/jquery.once.js
@@ -1,7 +1,7 @@
 /*!
  * @file jQuery Once
  * @description Act on jQuery elements only once.
- * @version 2.0.0-alpha.5
+ * @version 2.0.0-alpha.6
  * @link http://github.com/robloach/jquery-once
  * @author Rob Loach (http://robloach.net)
  * @license MIT, GPL-2.0
@@ -23,32 +23,18 @@
   /**
    * Filters elements by whether they have not yet been processed.
    *
-   * @param {(string|function)} [id]
+   * @param {string} [id]
    *   (Optional) If this is a string, then it will be the data ID used
    *   to determine whether it has already been processed or not.
    *
-   *   If the id parameter is a function, it will be passed off to the fn
-   *   parameter and the id will become a unique identifier, represented as a
-   *   number.
-   *
-   *   When the id is neither a string or a function, it becomes a unique
-   *   identifier, depicted as a number. The element's data ID will then be
-   *   represented in the form of "jquery-once-#".
-   * @param {function} [fn]
-   *   (Optional) If given, this function will be called for each element that
-   *   has not yet been processed. The function's return value follows the same
-   *   logic as $.each(). Returning true will continue to the next matched
-   *   element in the set, while returning false will entirely break the
-   *   iteration.
+   *   When the id is not passed, it becomes a unique identifier, depicted as a
+   *   number. The element's data ID will then be represented in the form of
+   *   "jquery-once-#".
    * @returns jQuery element collection of elements that have now run once.
    *
    * @example
    * // Change the color to green only once.
-   * $('p').once('changecolor', function() {
-   *   // This function is called for every p element that hasn't been called
-   *   // with "changecolor" once() before.
-   *   $(this).css('color', 'green');
-   * });
+   * $('p').once('changecolor').css('color', 'green');
    *
    * @see removeOnce
    * @see findOnce
@@ -56,26 +42,21 @@
    * @public
    * @global
    */
-  $.fn.once = function (id, fn) {
+  $.fn.once = function (id) {
     if (typeof id !== 'string') {
-      // Generate a numeric ID if the id passed can't be used as a CSS class.
+      // Generate a numeric ID if the id passed is not a string.
       if (!(id in cache)) {
         cache[id] = ++uuid;
       }
-      // When the fn parameter is not passed, we interpret it from the id.
-      if (!fn) {
-        fn = id;
-      }
       id = cache[id];
     }
 
     // Filter the elements by which do not have the data yet.
     var name = 'jquery-once-' + id;
-    var elements = this.filter(function() {
+
+    return this.filter(function() {
       return $(this).data(name) !== true;
     }).data(name, true);
-
-    return $.isFunction(fn) ? elements.each(fn) : elements;
   };
 
   /**
@@ -86,19 +67,13 @@
    *   when filtering the elements. This only filters elements that have already
    *   been processed by the once function. The id should be the same id that
    *   was originally passed to the once() function.
-   * @param {function} [fn]
-   *   (Optional) If given, this function will be called for each element that
-   *   whose element's once data was removed. The function's return value
-   *   follows the same logic as $.each(). Returning true will continue to the
-   *   next matched element in the set, while returning false will entirely
-   *   break the iteration.
    *
    * @returns jQuery element collection of elements that now have their once
    *   data removed.
    *
    * @example
    * // Remove once data with the "changecolor" ID.
-   * $('p').removeOnce('changecolor', function() {
+   * $('p').removeOnce('changecolor').each(function() {
    *   // This function is called for all elements that had their once removed.
    * });
    *
@@ -107,14 +82,9 @@
    * @public
    * @global
    */
-  $.fn.removeOnce = function (id, fn) {
+  $.fn.removeOnce = function (id) {
     // Filter through the elements to find the once'd elements.
-    var elements = this.findOnce(id);
-
-    // Remove the once data from the elements.
-    elements.removeData('jquery-once-' + id);
-
-    return $.isFunction(fn) ? elements.each(fn) : elements;
+    return this.findOnce(id).removeData('jquery-once-' + id);
   };
 
   /**
@@ -125,18 +95,12 @@
    *   when filtering the elements. This only filters elements that have already
    *   been processed by the once function. The id should be the same id that
    *   was originally passed to the once() function.
-   * @param {function} [fn]
-   *   (Optional) If given, this function will be called for each element that
-   *   has not yet been processed. The function's return value follows the same
-   *   logic as $.each(). Returning true will continue to the next matched
-   *   element in the set, while returning false will entirely break the
-   *   iteration.
    *
    * @returns jQuery element collection of elements that have been run once.
    *
    * @example
    * // Find all elements that have the changecolor'ed once.
-   * $('p').findOnce('changecolor', function() {
+   * $('p').findOnce('changecolor').each(function() {
    *   // This function is called for all elements that has already once'd.
    * });
    *
@@ -145,13 +109,11 @@
    * @public
    * @global
    */
-  $.fn.findOnce = function (id, fn) {
+  $.fn.findOnce = function (id) {
     // Filter the elements by which do have the data.
     var name = 'jquery-once-' + id;
-    var elements = this.filter(function() {
+    return this.filter(function() {
       return $(this).data(name) === true;
     });
-
-    return $.isFunction(fn) ? elements.each(fn) : elements;
   };
 }));