Removed hooks reference and update plugins to use events.

Author: lcdsantos

.eslintrc

@@ -224,7 +224,17 @@
     "space-unary-ops": "error",
     "spaced-comment": [
       "error",
-      "always"
+      "always", {
+        "line": {
+          "markers": ["/"],
+          "exceptions": ["-", "+"]
+        },
+        "block": {
+          "markers": ["!"],
+          "exceptions": ["*"],
+          "balanced": true
+        }
+      }
     ],
     "strict": "off",
     "template-curly-spacing": "error",

README.md

@@ -303,18 +303,6 @@ $('select').on('eventname', function(element) {
   </tr>
 </table>
 
-##Hooks:
-
-Check [jquery.selectric.placeholder.js](plugins/jquery.selectric.placeholder.js) source for a usage example.
-
-```js
-// Add a callback everytime 'callbackName' is called
-$.fn.selectric.hooks.add('callbackName', 'hookName', function(element, data) {});
-
-// Remove a callback
-$.fn.selectric.hooks.remove('callbackName', 'hookName');
-```
-
 ##Public methods:
 
 ```js

gulpfile.js

@@ -6,6 +6,33 @@ var getPackageJson = function() {
   return JSON.parse(fs.readFileSync('./package.json', 'utf8'));
 };
 
+var banner = [
+  '/*!',
+  ' *         ,/',
+  ' *       ,\'/',
+  ' *     ,\' /',
+  ' *   ,\'  /_____,',
+  ' * .\'____    ,\'',
+  ' *      /  ,\'',
+  ' *     / ,\'',
+  ' *    /,\'',
+  ' *   /\'',
+  ' *',
+  ' * Selectric \u03DF v<%= pkg.version %> (<%= new Date().toString().substr(4, 11) %>) - http://lcdsantos.github.io/jQuery-Selectric/',
+  ' *',
+  ' * Copyright (c) <%= new Date().getFullYear() %> Leonardo Santos; MIT License',
+  ' *',
+  ' */\n\n'
+].join('\n');
+
+var bannerSmall = '/*! Selectric \u03DF v<%= pkg.version %> (<%= new Date().toJSON().slice(0,10) %>) - git.io/tjl9sQ - Copyright (c) <%= new Date().getFullYear() %> Leonardo Santos - MIT License */\n';
+
+var bannerCSS = [
+  '/*======================================',
+  '  Selectric v<%= pkg.version %>',
+  '======================================*/\n\n'
+].join('\n');
+
 
 /**
  * Bump version
@@ -23,36 +50,18 @@ gulp.task('bump', function() {
 
 
 /**
- * Javascript
+ * JavaScript
  */
 gulp.task('lint', function() {
-  return gulp.src(['./src/*.js'])
+  return gulp.src(['./src/**/*.js'])
     .pipe($.eslint('.eslintrc'))
     .pipe($.eslint.format());
 });
 
 gulp.task('js', ['lint'], function() {
   var pkg = getPackageJson();
-  var banner = [
-    '/*!',
-    ' *         ,/',
-    ' *       ,\'/',
-    ' *     ,\' /',
-    ' *   ,\'  /_____,',
-    ' * .\'____    ,\'',
-    ' *      /  ,\'',
-    ' *     / ,\'',
-    ' *    /,\'',
-    ' *   /\'',
-    ' *',
-    ' * Selectric \u03DF v<%= pkg.version %> (<%= new Date().toString().substr(4, 11) %>) - http://lcdsantos.github.io/jQuery-Selectric/',
-    ' *',
-    ' * Copyright (c) <%= new Date().getFullYear() %> Leonardo Santos; MIT License',
-    ' *',
-    ' */\n\n'
-  ].join('\n');
-
-  return gulp.src('src/jquery.selectric.js')
+
+  return gulp.src(['src/jquery.selectric.js'])
     .pipe($.header(banner, { pkg: pkg }))
     .pipe(gulp.dest('./public'))
     .pipe($.connect.reload());
@@ -61,14 +70,29 @@ gulp.task('js', ['lint'], function() {
 gulp.task('js-min', function() {
   var pkg = getPackageJson();
 
-  return gulp.src('src/jquery.selectric.js')
+  return gulp.src(['./src/jquery.selectric.js'])
     .pipe($.uglify())
-    .pipe($.header('/*! Selectric \u03DF v<%= pkg.version %> (<%= new Date().toJSON().slice(0,10) %>) - git.io/tjl9sQ - Copyright (c) <%= new Date().getFullYear() %> Leonardo Santos - MIT License */\n', { pkg: pkg }))
+    .pipe($.header(bannerSmall, { pkg: pkg }))
     .pipe($.rename({ suffix: '.min' }))
     .pipe(gulp.dest('./public'))
     .pipe($.connect.reload());
 });
 
+gulp.task('js-plugins', ['lint'], function() {
+  var pluginData = {
+    date: new Date().toJSON().slice(0, 10),
+    year: new Date().getFullYear()
+  };
+
+  return gulp.src(['*.js'], { cwd: './src/plugins/' })
+    .pipe($.template(pluginData))
+    .pipe(gulp.dest('./public/plugins/'))
+    .pipe($.uglify({ preserveComments: 'license' }))
+    .pipe($.rename({ suffix: '.min' }))
+    .pipe(gulp.dest('./public/plugins/'))
+    .pipe($.connect.reload());
+});
+
 
 /**
  * CSS
@@ -77,32 +101,28 @@ gulp.task('css', function() {
   var pkg = getPackageJson();
 
   return gulp.src('./src/selectric.scss')
-    .pipe($.sass({
-      outputStyle: 'expanded'
-    }))
-    .pipe($.autoprefixer({
-      browsers: ['last 2 versions', '> 1%', 'ie 8', 'ie 7']
-    }))
-    .pipe($.header([
-      '/*======================================',
-      '  Selectric v<%= pkg.version %>',
-      '======================================*/\n\n'
-    ].join('\n'), { pkg: pkg }))
+    .pipe($.sass({ outputStyle: 'expanded' }))
+    .pipe($.autoprefixer({ browsers: ['last 2 versions', '> 1%', 'ie 8', 'ie 7'] }))
+    .pipe($.header(bannerCSS, { pkg: pkg }))
     .pipe(gulp.dest('./public'))
     .pipe($.connect.reload());
 });
 
 gulp.task('themes-css', function() {
   return gulp.src('**/*.scss', { cwd: './src/themes/' })
-    .pipe($.sass({
-      outputStyle: 'expanded'
-    }))
-    .pipe($.autoprefixer({
-      browsers: ['last 2 versions', '> 1%', 'ie 8', 'ie 7']
-    }))
+    .pipe($.sass({ outputStyle: 'expanded' }))
+    .pipe($.autoprefixer({ browsers: ['last 2 versions', '> 1%', 'ie 8', 'ie 7'] }))
     .pipe(gulp.dest('./public/themes/'));
 });
 
+gulp.task('plugins-css', function() {
+  return gulp.src('**/*.scss', { cwd: './src/plugins/' })
+    .pipe($.sass({ outputStyle: 'expanded' }))
+    .pipe($.autoprefixer({ browsers: ['last 2 versions', '> 1%', 'ie 8', 'ie 7'] }))
+    .pipe(gulp.dest('./public/plugins/'));
+});
+
+
 /**
  * Live preview
  */
@@ -123,10 +143,12 @@ gulp.task('html', function() {
  * Watch
  */
 gulp.task('watch', ['serve'], function() {
-  gulp.watch(['*.js'],      { cwd: './src/' },        ['js', 'js-min']);
-  gulp.watch(['*.scss'],    { cwd: './src/' },        ['css']);
-  gulp.watch(['**/*.scss'], { cwd: './src/themes/' }, ['themes-css']);
-  gulp.watch(['*.html'],    { cwd: './public/' },     ['html']);
+  gulp.watch(['*.js'],      { cwd: './src/' },         ['js', 'js-min']);
+  gulp.watch(['*.js'],      { cwd: './src/plugins/' }, ['js-plugins']);
+  gulp.watch(['*.scss'],    { cwd: './src/' },         ['css']);
+  gulp.watch(['**/*.scss'], { cwd: './src/themes/' },  ['themes-css']);
+  gulp.watch(['**/*.scss'], { cwd: './src/plugins/' }, ['plugins-css']);
+  gulp.watch(['*.html'],    { cwd: './public/' },      ['html']);
 });
 
 
@@ -154,7 +176,7 @@ gulp.task('gh-pages', function() {
 /**
  * Default tasks
  */
-gulp.task('build', ['bump', 'js', 'js-min', 'css']);
+gulp.task('build',   ['bump', 'js', 'js-min', 'js-plugins', 'css', 'themes-css', 'plugins-css']);
 gulp.task('default', ['build', 'watch']);
 gulp.task('release', ['bump', 'build', 'zip']);
 gulp.task('publish', ['gh-pages']);

package.json

@@ -43,6 +43,7 @@
     "gulp-load-plugins": "^1.2.4",
     "gulp-rename": "^1.2.2",
     "gulp-sass": "^2.3.2",
+    "gulp-template": "^4.0.0",
     "gulp-uglify": "^2.0.0",
     "gulp-util": "^3.0.7",
     "gulp-zip": "^3.2.0",

public/plugins/jquery.selectric.addNew.css

@@ -3,14 +3,14 @@
   position: relative;
 }
 
-.selectric-scroll .createNew {
+.selectric-scroll .create-new {
   position: absolute;
   top: 0;
   width: 100%;
 }
 
-.selectric-scroll .createNew > input[type=text],
-.selectric-scroll .createNew > button {
+.selectric-scroll .create-new > input[type=text],
+.selectric-scroll .create-new > button {
   height: 24px;
   margin: 3px 1%;
   padding: 5px;
@@ -19,7 +19,7 @@
   font-weight: normal;
 }
 
-.selectric-scroll .createNew > input[type=text] {
+.selectric-scroll .create-new > input[type=text] {
   background: #fff;
   width: 76%;
   border: 1px solid #ddd;
@@ -28,7 +28,7 @@
   color: #444;
 }
 
-.selectric-scroll .createNew > button {
+.selectric-scroll .create-new > button {
   width: 20%;
   background: #c02126;
   border: 1px solid #981317;
@@ -42,6 +42,6 @@
   text-transform: uppercase;
 }
 
-.selectric-scroll .createNew + ul {
+.selectric-scroll .create-new + ul {
   margin-top: 30px;
 }

public/plugins/jquery.selectric.addNew.js

@@ -1,67 +1,84 @@
-/*! Selectric AddNew ϟ v0.1.0 (2014-01-14) - git.io/tjl9sQ - Copyright (c) 2015 David Shen (git.io/mhQmLQ) - Dual licensed: MIT/GPL */
-;(function($) {
+/*! Selectric AddNew ϟ v0.2.0 (2016-10-06) - git.io/tjl9sQ - Copyright (c) 2016 David Shen (git.io/mhQmLQ) - MIT License */
+(function(factory) {
+  /* global define */
+  if ( typeof define === 'function' && define.amd ) {
+    define(['jquery'], factory);
+  } else if ( typeof module === 'object' && module.exports ) {
+    // Node/CommonJS
+    module.exports = function( root, jQuery ) {
+      if ( jQuery === undefined ) {
+        if ( typeof window !== 'undefined' ) {
+          jQuery = require('jquery');
+        } else {
+          jQuery = require('jquery')(root);
+        }
+      }
+      factory(jQuery);
+      return jQuery;
+    };
+  } else {
+    // Browser globals
+    factory(jQuery);
+  }
+}(function($) {
   'use strict';
 
-  $(function() {
-    if (!$.fn.selectric) {
-      $.error('Selectric not initialized');
-    }
-
-    var hooks = $.fn.selectric.hooks;
+  if ( !$.fn.selectric ) {
+    $.error('Selectric not initialized');
+  }
 
-    hooks.add('BeforeInit', 'addNew', function(element, data) {
-      data.options = $.extend({
+  $.fn.selectricAddNew = function(opts) {
+    return this.each(function() {
+      var $this = $(this);
+      var data = $this.data('selectric');
+      var options = $.extend({
         createNewAutoSelect: true,
         createNewMarkup: '<input type="text" /><button>Create</button>',
-        allowCreateNew: false,
+        allowCreateNew: true,
         createNewCallback: $.noop,
-        createNewError: function(){
-          alert('Title required.');
+        createNewError: function() {
+          $.error('Title required.');
         }
-      }, data.options);
-    });
-
-    hooks.add('Init', 'addNew', function(element, data) {
-      var $original = $(element),
-          $wrapper = $original.closest('.' + data.classes.wrapper),
-          $itemsScroll = $wrapper.find('.' + data.classes.scroll),
-          $createNew = $('<div/>', { 'class': 'createNew', 'html': data.options.createNewMarkup });
+      }, opts);
+      var $original = data.$element;
+      var $itemsScroll = data.elements.itemsScroll;
+      var $createNew = $('<div/>', { 'class': 'create-new', 'html': options.createNewMarkup });
 
-      if ( data.options.allowCreateNew ){
+      if ( options.allowCreateNew ) {
         $itemsScroll.prepend($createNew);
 
-        var createNewInput = $createNew.find('input[type=text]'),
-            createNewButton = $createNew.find('button');
+        var createNewInput = $createNew.find('input[type=text]');
+        var createNewButton = $createNew.find('button');
 
-        createNewInput.add(createNewButton).on('click', function(e){
+        createNewInput.add(createNewButton).on('click', function(e) {
           e.preventDefault();
           e.stopPropagation();
         });
 
-        createNewButton.on('click', function(e){
-          if ( createNewInput.val() ){
+        createNewButton.on('click', function() {
+          if ( createNewInput.val() ) {
             var newValue = createNewInput.val();
 
             $original.append($('<option>', {
               value: newValue,
               text : newValue
             }));
 
-            if ( data.options.createNewAutoSelect ){
+            if ( options.createNewAutoSelect ) {
               $original.prop('selectedIndex', $original.children().length - 1);
             }
 
             data.refresh();
             data.open();
 
-            data.options.createNewCallback.call(element, newValue);
+            options.createNewCallback.call(data.element, newValue);
 
             createNewInput.add(createNewButton).off('click');
           } else {
-            data.options.createNewError.call(element);
+            options.createNewError.call(data.element);
           }
         });
       }
     });
-  });
-}(jQuery));
+  };
+}));