Merge pull request #140 from gearsdigital/feature/remove-hook-system

Feature/remove hook system (#134)

Author: lcdsantos

public/customoptions.css

@@ -1,16 +1,16 @@
-.selectric-customOptions .ico {
+.selectric-custom-options .ico {
   display: inline-block;
   vertical-align: middle;
   zoom: 1;
   *display: inline;
   height: 30px;
   width: 30px;
   margin: 0 6px 0 0;
-  background: url(img/browser-icons.png) no-repeat;
+  background: url(./img/browser-icons.png) no-repeat;
 }
 
-.selectric-customOptions .ico-chrome  { background-position: 0 0; }
-.selectric-customOptions .ico-firefox { background-position: -30px 0; }
-.selectric-customOptions .ico-ie      { background-position: -60px 0; }
-.selectric-customOptions .ico-opera   { background-position: -90px 0; }
-.selectric-customOptions .ico-safari  { background-position: -120px 0; }
+.selectric-custom-options .ico-chrome  { background-position: 0 0; }
+.selectric-custom-options .ico-firefox { background-position: -30px 0; }
+.selectric-custom-options .ico-ie      { background-position: -60px 0; }
+.selectric-custom-options .ico-opera   { background-position: -90px 0; }
+.selectric-custom-options .ico-safari  { background-position: -120px 0; }

public/index.html

@@ -437,17 +437,6 @@ <h2>Public methods</h2>
 Selectric.init();    // Reinitialize the plugin</code></pre>
     </div>
 
-    <div class="section">
-      <h2>Hooks</h2>
-
-      <p>Check <a href="plugins/jquery.selectric.placeholder.js">jquery.selectric.placeholder.js</a> source for a usage example</p>
-      <pre><code class="language-javascript">// Add a callback everytime '<i>callbackName</i>' is called
-$.fn.selectric.hooks.add('<i>callbackName</i>', '<i>hookName</i>', function(element, data) {});
-
-// Remove a callback
-$.fn.selectric.hooks.remove('<i>callbackName</i>', '<i>hookName</i>');</code></pre>
-    </div>
-
     <div class="section">
       <h2>Browser support</h2>
 

public/jquery.selectric.js

@@ -191,7 +191,7 @@
       },
 
       /**
-       * Calls the events and hooks registered with function name.
+       * Calls the events registered with function name.
        *
        * @param {string}    fn - The name of the function.
        * @param {number} scope - Scope that should be set on the function.
@@ -205,12 +205,6 @@
           func.apply(elm, args);
         }
 
-        if ( $.fn[pluginName].hooks[fn] ) {
-          $.each($.fn[pluginName].hooks[fn], function() {
-            this.apply(elm, args);
-          });
-        }
-
         $(elm).trigger(pluginName + '-' + this.toDash(fn), args);
       },
 
@@ -1060,38 +1054,6 @@
     });
   };
 
-  /**
-   * Hooks for the callbacks
-   *
-   * @type {object}
-   */
-  $.fn[pluginName].hooks = {
-    /**
-     * @param {string} callbackName - The callback name.
-     * @param {string}     hookName - The name of the hook to be attached.
-     * @param {function}         fn - Callback function.
-     */
-    add: function(callbackName, hookName, fn) {
-      if ( !this[callbackName] ) {
-        this[callbackName] = {};
-      }
-
-      this[callbackName][hookName] = fn;
-
-      return this;
-    },
-
-    /**
-     * @param {string} callbackName - The callback name.
-     * @param {string}     hookName - The name of the hook that will be removed.
-     */
-    remove: function(callbackName, hookName) {
-      delete this[callbackName][hookName];
-
-      return this;
-    }
-  };
-
   /**
    * Default plugin options
    *

src/jquery.selectric.js

@@ -174,7 +174,7 @@
       },
 
       /**
-       * Calls the events and hooks registered with function name.
+       * Calls the events registered with function name.
        *
        * @param {string}    fn - The name of the function.
        * @param {number} scope - Scope that should be set on the function.
@@ -188,12 +188,6 @@
           func.apply(elm, args);
         }
 
-        if ( $.fn[pluginName].hooks[fn] ) {
-          $.each($.fn[pluginName].hooks[fn], function() {
-            this.apply(elm, args);
-          });
-        }
-
         $(elm).trigger(pluginName + '-' + this.toDash(fn), args);
       },
 
@@ -1043,38 +1037,6 @@
     });
   };
 
-  /**
-   * Hooks for the callbacks
-   *
-   * @type {object}
-   */
-  $.fn[pluginName].hooks = {
-    /**
-     * @param {string} callbackName - The callback name.
-     * @param {string}     hookName - The name of the hook to be attached.
-     * @param {function}         fn - Callback function.
-     */
-    add: function(callbackName, hookName, fn) {
-      if ( !this[callbackName] ) {
-        this[callbackName] = {};
-      }
-
-      this[callbackName][hookName] = fn;
-
-      return this;
-    },
-
-    /**
-     * @param {string} callbackName - The callback name.
-     * @param {string}     hookName - The name of the hook that will be removed.
-     */
-    remove: function(callbackName, hookName) {
-      delete this[callbackName][hookName];
-
-      return this;
-    }
-  };
-
   /**
    * Default plugin options
    *

test/events.spec.js

@@ -122,68 +122,6 @@ describe('events', function() {
     expect(callbacks.refresh).toHaveBeenCalled();
   });
 
-  it('should trigger hooks callbacks', function() {
-    var hooks = jasmine.createSpyObj('hooks', [
-      'beforeInit',
-      'init',
-      'beforeOpen',
-      'open',
-      'beforeClose',
-      'close',
-      'beforeChange',
-      'change',
-      'refresh'
-    ]);
-
-    select.selectric('destroy');
-    $.fn.selectric.hooks.add('BeforeInit',   'test', hooks.beforeInit);
-    $.fn.selectric.hooks.add('BeforeInit',   'test2', hooks.beforeInit);
-    $.fn.selectric.hooks.add('BeforeInit',   'test3', hooks.beforeInit);
-    $.fn.selectric.hooks.remove('BeforeInit', 'test3');
-    $.fn.selectric.hooks.add('Init',         'test', hooks.init);
-    $.fn.selectric.hooks.add('BeforeOpen',   'test', hooks.beforeOpen);
-    $.fn.selectric.hooks.add('Open',         'test', hooks.open);
-    $.fn.selectric.hooks.add('BeforeClose',  'test', hooks.beforeClose);
-    $.fn.selectric.hooks.add('Close',        'test', hooks.close);
-    $.fn.selectric.hooks.add('BeforeChange', 'test', hooks.beforeChange);
-    $.fn.selectric.hooks.add('Change',       'test', hooks.change);
-    $.fn.selectric.hooks.add('Refresh',      'test', hooks.refresh);
-    select.selectric();
-
-    $('.selectric').click();
-    $('.selectric-items').find('li:eq(4)').click();
-    select.selectric('refresh');
-
-    expect(hooks.beforeInit).toHaveBeenCalledTimes(2);
-    expect(hooks.init).toHaveBeenCalled();
-    expect(hooks.beforeOpen).toHaveBeenCalled();
-    expect(hooks.open).toHaveBeenCalled();
-    expect(hooks.beforeClose).toHaveBeenCalled();
-    expect(hooks.close).toHaveBeenCalled();
-    expect(hooks.beforeChange).toHaveBeenCalled();
-    expect(hooks.change).toHaveBeenCalled();
-    expect(hooks.refresh).toHaveBeenCalled();
-  });
-
-  it('should allow to chain hooks', function() {
-    var hooks = jasmine.createSpyObj('hooks', [
-      'beforeInit'
-    ]);
-
-    select.selectric('destroy');
-    $.fn.selectric.hooks
-      .add('BeforeInit',   'test', hooks.beforeInit)
-      .add('BeforeInit',   'test2', hooks.beforeInit);
-    select.selectric();
-
-    $('.selectric').click();
-    $('.selectric-items').find('li:eq(4)').click();
-    select.selectric('refresh');
-
-    expect(hooks.beforeInit).toHaveBeenCalledTimes(2);
-
-  });
-
   it('should not bind events when select is disabled after init', function() {
     select.prop('disabled', true).selectric('refresh');
     $('.selectric').trigger('click');