Complete merge of adubrov-master master/master

Author: Gary Sieling

jquery.highlighttextarea.js

@@ -67,7 +67,7 @@
      * Refresh highlight
      */
     Highlighter.prototype.highlight = function() {
-        var text = Utilities.htmlEntities(this.$el.val()),
+        var text = this.$el.val(),
             that = this;
         	that.spacer = '';
         	if (this.settings.wordsOnly ) {
@@ -291,7 +291,7 @@
         // the highlighter has the same size than the "inner" textarea and must have the same font properties
         Utilities.cloneCss(this.$el, this.$highlighter, [
             'font-size','font-family','font-style','font-weight','font-variant','font-stretch',
-            'line-height','vertical-align','word-spacing','text-align','letter-spacing', 'text-rendering'
+            'vertical-align','word-spacing','text-align','letter-spacing', 'text-rendering'
         ]);
 
         // now make the textarea transparent to see the highlighter through

jquery.highlighttextarea.min.js

@@ -11,10 +11,10 @@
     "jquery.highlighttextarea.js"
   ],
   "devDependencies": {
-    "grunt": "~0.4.5",
-    "grunt-contrib-uglify": "~0.4.0",
+    "grunt": "^0.4.5",
     "grunt-contrib-cssmin": "~0.9.0",
-    "grunt-contrib-jshint": "~0.10.0"
+    "grunt-contrib-jshint": "~0.10.0",
+    "grunt-contrib-uglify": "~0.4.0"
   },
   "keywords": [
     "textarea",

package.json

@@ -94,23 +94,29 @@
       $('#demo10').highlightTextarea({
           ranges: [{
               class: 'blue',
-              start: 1,
-              length: 4
+              start: 0,
+              length: 2
           }, {
               color: '#FFFF00',
-              ranges: [[12, 16]]
+              ranges: [[12, 15]]
           }],
           id: 'demo10-wrap',
           debug: true
       });
 
       $('#demo11').highlightTextarea({
           ranges: [{
-              class: 'blue',
-              start: 0,
-              length: 5
+              color: '#FFFF00',
+              ranges: [[0, 1], [10, 11], [21, 22], [24, 25]]
+          }],
+          debug: true
+      });
+
+      $('#demo12').highlightTextarea({
+          ranges: [{
+              color: '#FFFF00',
+              ranges: [[0, 5]]
           }],
-          id: 'demo11-wrap',
           debug: true
       });
 
@@ -354,7 +360,7 @@ <h3>Accents</h3>
   <article>
     <h3>Right to Left</h3>
 
-    <textarea id="demo11" cols="50" rows="5">
+    <textarea id="demo12" cols="50" rows="5">
 وقد انتباه المجتمع مع. أم لكل وبغطاء العناد. كل وحرمان العسكري للإتحاد الى. والكوري بريطانيا كما و, أم أحكم السفن مواقعها غير.
     </textarea>
   </article>