Merge branch 'hotfix/0.1.4' into develop

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "ellipsis",
   "description": "ellipsis text depending on number of lines or number of chars",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "main": "./dist/jquery.ellipsis.min.js",
   "authors": [
     "Mohamed Hassan"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery-ellipsis",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "ellipsis text depending on number of lines or number of chars",
   "private": false,
   "main": "./dist/jquery.ellipsis.min.js",

src/jquery.ellipsis.js

@@ -11,7 +11,7 @@
   'use strict';
   // define the plugin name and the default options
   const PLUGIN_NAME = 'ellipsis';
-  const VERSION     = '0.1.3';
+  const VERSION     = '0.1.4';
 
 
   /**
@@ -74,7 +74,8 @@
         result = this._excerptTillChar(this.options.count);
       } else if(this.options.type === 'lines') {
         charsNo = this._getTotalCharsInLines(this.options.count);
-        result = this._excerptTillChar(charsNo);
+        if(charsNo)
+          result = this._excerptTillChar(charsNo);
       }
 
 
@@ -122,7 +123,10 @@
       if(this.options.type === 'lines' && number >= 3)
         number -= 3;
 
-      return this.element.html(this.text.slice(0, number) + '...')
+      if(number >= this.text.length)
+        return null;
+
+      return this.element.html(this.text.slice(0, number) + '...');
     }
 
 
@@ -155,16 +159,27 @@
       height = linesNo * $charSpan.height();
 
 
+      if(count >= this.text.length){
+        $charSpan.remove();
+        return null;
+      }
+
       $charSpan.text(this.text.slice(0, count));
       $charSpan.css('max-width', this.element.width());
 
-      while($charSpan.height() <= height) {
-        $charSpan.text(this.text.slice(0, $charSpan.text().length + 1));
+      while($charSpan.height() <= height &&
+            this.text.length >= $charSpan.text().length + 1) {
+          $charSpan.text(this.text.slice(0, $charSpan.text().length + 1));
       }
 
       count = $charSpan.text().length;
+
       $charSpan.remove();
 
+      if(count >= this.text.length){
+        return null;
+      }
+
       if(count && typeof count === 'number') count --;
       return count;
     }

test/specs/test.spec.js

@@ -53,6 +53,39 @@ sunt in culpa qui officia deserunt mollit anim id est laborum.`
       $('#paragraph').ellipsis({type: 'lines', count: 3});
       expect($('#paragraph').height()).toEqual(expectedHeight);
     });
+
+
+    it('should not excerpt the text if it\'s less than 2 lines', () => {
+      let $p = $('#paragraph');
+      let expectedText = '';
+      let expectedHeight = 0;
+      $p.append('<span class="height-span">x</span>');
+      expectedHeight = $('.height-span').height();
+      $('.height-span').remove();
+
+      $('#paragraph').text(text.slice(0, 16));
+      expectedText = text.slice(0, 16)
+
+      $('#paragraph').ellipsis({type: 'lines', count: 2});
+      expect($('#paragraph').height()).toEqual(expectedHeight);
+      expect($('#paragraph').text()).toEqual(expectedText);
+    });
+
+    it('should not excerpt the text if text length less than dedicated lines count chars', () => {
+      let $p = $('#paragraph');
+      let expectedText = '';
+      let expectedHeight = 0;
+      $p.append('<span class="height-span">x</span>');
+      expectedHeight = $('.height-span').height() * 2;
+      $('.height-span').remove();
+
+      $('#paragraph').text(text.slice(0, 34));
+      expectedText = text.slice(0, 34)
+
+      $('#paragraph').ellipsis({type: 'lines', count: 2});
+      expect($('#paragraph').height()).toEqual(expectedHeight);
+      expect($('#paragraph').text()).toEqual(expectedText);
+    });
   });