Make wordEnd more conspicuous as an option for .expander() calls

kswedberg · Oct 6, 2014 · fd638c7 · fd638c7
1 parent 1c486dc
commit fd638c7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 31 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -90,8 +90,7 @@ module.exports = function(grunt) {
           '<%= pkg.name %>.jquery.json',
           'package.json',
           'bower.json',
-          'src/jquery.<%= pkg.name %>.js',
-          '<%= pkg.name %>.js'
+          'jquery.<%= pkg.name %>.js'
         ],
         options: {
           release: 'patch'
@@ -108,6 +107,8 @@ module.exports = function(grunt) {
 
   });
 
+  grunt.registerTask('test', ['jshint', 'qunit']);
+
   grunt.registerTask('build', ['jshint', 'qunit', 'concat', 'version:same', 'bowerjson', 'uglify']);
 
   grunt.registerTask( 'bowerjson', 'update bower.json', function() {
@@ -134,33 +135,6 @@ module.exports = function(grunt) {
     grunt.log.writeln( 'File "' + comp + '" updated.' );
   });
 
-
-  grunt.registerMultiTask( 'setshell', 'Set grunt shell commands', function() {
-    var settings, cmd,
-        tgt = this.target,
-        cmdLabel = 'shell.' + tgt + '.command',
-        file = this.data.file,
-        append = this.data.cmdAppend || '';
-
-    if ( !grunt.file.exists(file) ) {
-      grunt.warn('File does not exist: ' + file);
-    }
-
-    settings = grunt.file.readJSON(file);
-    if (!settings[tgt]) {
-      grunt.warn('No ' + tgt + ' property found in ' + file);
-    }
-
-    cmd = settings[tgt] + append;
-    grunt.config(cmdLabel, cmd);
-    grunt.log.writeln( ('Setting ' + cmdLabel + ' to:').cyan );
-
-    grunt.log.writeln(cmd);
-
-  });
-
-  grunt.registerTask( 'deploy', ['setshell:rsync', 'shell:rsync']);
-
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-concat');

diff --git a/jquery.expander.js b/jquery.expander.js
@@ -38,6 +38,9 @@
 
       expandAfterSummary: false,
 
+      // Possible word endings to test against for when preserveWords: true
+      wordEnd: /(&(?:[^;]+;)?|[a-zA-Z\u00C0-\u0100]+|[^\u0000-\u007F]+)$/,
+
       // class names for summary element and detail element
       summaryClass: 'summary',
       detailClass: 'details',
@@ -88,7 +91,7 @@
 
     var opts = $.extend({}, $.expander.defaults, options),
         rSelfClose = /^<(?:area|br|col|embed|hr|img|input|link|meta|param).*>$/i,
-        rAmpWordEnd = opts.wordEnd || /(&(?:[^;]+;)?|[a-zA-Z\u00C0-\u0100]+|[^\u0000-\u007F]+)$/,
+        rAmpWordEnd = opts.wordEnd,
         rOpenCloseTag = /<\/?(\w+)[^>]*>/g,
         rOpenTag = /<(\w+)[^>]*>/g,
         rCloseTag = /<\/(\w+)>/g,
@@ -170,7 +173,7 @@
             }
           }
 
-          summaryText = backup(summaryText, o.preserveWords);
+          summaryText = backup(summaryText, o.preserveWords && allHtml.slice(summaryText.length).length);
 
           // separate open tags from close tags and clean up the lists
           summOpens = summaryText.match(rOpenTag) || [];