Fixed jQuery interface build step

All seems to be working for now!

Author: nfrasser

gulpfile.js

@@ -108,7 +108,7 @@ gulp.task('build-interfaces', ['babel-amd'], function () {
 	var interface, interfaces = [
 		'string',
 		'element',
-		// ['element', 'jquery'] // jQuery interface requires both element and jquery
+		['element', 'jquery'] // jQuery interface requires both element and jquery
 	];
 
 	var files = {js: null, amd: null};
@@ -122,8 +122,8 @@ gulp.task('build-interfaces', ['babel-amd'], function () {
 			files.js = [];
 			files.amd = [];
 			for (var j = 0; j < interface.length; j++) {
-				files.js.push('src/linkify-' + interface[i] + '.js');
-				files.amd.push('build/amd/linkify-' + interface[i] + '.js');
+				files.js.push('src/linkify-' + interface[j] + '.js');
+				files.amd.push('build/amd/linkify-' + interface[j] + '.js');
 			}
 
 			// The last dependency is the name of the interface
@@ -140,16 +140,16 @@ gulp.task('build-interfaces', ['babel-amd'], function () {
 			modules: 'ignore',
 			format: babelformat
 		}))
-		.pipe(wrap({src: 'templates/linkify-' + interface + '.js'}))
 		.pipe(concat('linkify-' + interface + '.js'))
+		.pipe(wrap({src: 'templates/linkify-' + interface + '.js'}))
 		.pipe(gulp.dest('build'));
 
 		streams.push(stream);
 
 		// AMD interface
 		stream = gulp.src(files.amd)
-		.pipe(wrap({src: 'templates/linkify-' + interface + '.amd.js'}))
 		.pipe(concat('linkify-' + interface + '.amd.js'))
+		.pipe(wrap({src: 'templates/linkify-' + interface + '.amd.js'}))
 		.pipe(gulp.dest('build'));
 
 		streams.push(stream);

src/linkify-element.js

@@ -85,7 +85,7 @@ function linkifyElementHelper(element, opts, doc) {
 		case TXT_NODE:
 
 			let
-			str = childElement.nodeValue,
+			str = childElement.nodeValue.replace(/^\s+|\s+$/g, ''), // trim
 			tokens = tokenize(str);
 			children.push(...tokensToNodes(tokens, opts, doc));
 

templates/linkify-jquery.amd.js

@@ -0,0 +1,6 @@
+<%= contents %>
+require(['jquery', 'linkify-jquery'], function ($, apply) {
+	if (typeof $.fn.linkify !== 'function') {
+		apply($);
+	}
+});

templates/linkify-jquery.js

@@ -0,0 +1,6 @@
+;(function (jQuery, linkify) {
+"use strict";
+var tokenize = linkify.tokenize, options = linkify.options;
+<%= contents %>
+window.linkifyElement = linkifyElement;
+})(window.jQuery, window.linkify);

test/index.html

@@ -8,14 +8,22 @@
 </body>
 <script src="http://code.jquery.com/jquery-2.1.3.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.15/require.js" data-main="build/amd/linkify"></script>
-<script src="build/linkify-string.amd.js"></script>
-<script src="build/linkify-element.amd.js"></script>
+<script>
+	/* global define */
+	define('jquery', ['exports', 'module'], function (exports, module) {
+		module.exports = window.jQuery;
+	});
+</script>
+<script src="build/linkify.amd.js"></script>
 <script src="build/linkify-plugin-hashtag.amd.js"></script>
-<p id="yolo" data-linkify="this" data-linkify-tagname="span">
+<script src="build/linkify-string.amd.js"></script>
+<script src="build/linkify-jquery.amd.js"></script>
+<p id="yolo" data-linkify="this" data-linkify-tagname="b">
 	You let's get all up in the
 	http://element.co/?wat=this and the #swag
 </p>
 <script>
+	/* global require */
 	require(['linkify'], function (linkify) {
 		console.log(linkify.find('google.com'));
 	});