Changeset 1494045

Timestamp:

09/11/2016 12:27:13 PM (9 years ago)

Author:

lopinopulos

Message:

Don't proofread html attributes

Location:

russian-texts-proofreader-glvrd/tags/1.2.2

Files:

• css/glvrd.css (modified) (2 diffs)
• images/loader.gif (added)
• js/glvrd-plugin.js (modified) (13 diffs)
• readme.txt (modified) (2 diffs)

russian-texts-proofreader-glvrd/tags/1.2.2/css/glvrd.css

@@ -37 +37 @@
     font-size: .8em;
     line-height: 1.4em;
+    height: 2.3em;
     overflow: hidden;
 }
@@ -74 +75 @@
 }
 
+#glvrd_section .stats-score.green {
+    color: #077213;
+}
+
+#glvrd_section .stats-score.orange {
+    color: #da570f;
+}
+
+#glvrd_section .stats-score.red {
+    color: #bb0002;
+}
+
 #glvrd_section .stats .stats-sections {
     margin-right: -1em;

russian-texts-proofreader-glvrd/tags/1.2.2/js/glvrd-plugin.js

@@ -1 +1 @@
 (function () {
+
     tinymce.create('tinymce.plugins.glvrd', {
 
@@ -6 +7 @@
         hoverHintCls  : 'glvrd-underline-hover',
 
+        myUrl            : undefined,
         isFirstLaunch    : true,
         delayedProofread : undefined,
@@ -19 +21 @@
         init : function (ed, url) {
             var me = this;
+            
+            me.url = url;
 
             ed.addButton('glvrd', {
@@ -46 +50 @@
                     jQuery(ed.getDoc()).find('.' + me.activeHintCls).toggleClass(me.activeHintCls).toggleClass(me.hintCls);
                     me.showTooltip(ed, html, target);
-
                 });
             });
@@ -63 +66 @@
             ed.on('SaveContent', function (e) {
                 e.content = me.removeMarkup(e.content);
+            });
+
+            ed.on('change', function (e) {
+                me.hideTooltip();
             });
 
@@ -92 +99 @@
             var me = this,
                 content = me.removeMarkup(editor.getContent({format : 'raw'})),
-                strippedContent = editor.getContent({format : 'text'})
+                strippedContent = editor.getContent({format : 'text'}),
+                textInAttributes = me.getHtmlAttributes(content);
+
+            jQuery('#glvrd_section .stats .stats-score').removeClass('green orange red')
+                                                        .html('<img src="' + me.url + '/../images/loader.gif" width="30"/>');
 
             window.glvrd.proofread(content, function (result) {
-                
                 if (result.status = 'ok') {
                     if (strippedContent !== this.getContent({format: 'text'})) {
@@ -104 +114 @@
 
                     jQuery('#glvrd_section .info').hide('fast').remove();
-                    $statsBlock.find('.stats-score').text(result.score);
+                    $statsBlock.find('.stats-score').addClass(me.getScoreColor(result.score)).text(result.score);
                     $statsBlock.find('.stats-stopwords').text(sprintf(me.pluralize(result.fragments.length, '%d стоп-слов', '%d стоп-слово', '%d стоп-слова'), result.fragments.length));
 
@@ -112 +122 @@
                     var wordQuantity = me.countWords(strippedContent);
                     $statsBlock.find('.stats-words').text(sprintf(me.pluralize(wordQuantity, '%d слов', '%d слово', '%d слово'), wordQuantity));
-                    var charQuantity = me.countChars(strippedContent, true);
-                    var charQuantityWithoutSpaces  = me.countChars(strippedContent, false);
-                    $statsBlock.find('.stats-chars').text(
-                        sprintf(me.pluralize(charQuantity, '%d знаков', '%d знак', '%d знака'), charQuantity) +
-                        ' (' + charQuantityWithoutSpaces + ' без пробелов) '
-                    );
+                    var charQuantity = me.countChars(strippedContent);
+                    $statsBlock.find('.stats-chars').text(sprintf(me.pluralize(charQuantity, '%d знаков', '%d знак', '%d знака'), charQuantity));
 
                     if (result.fragments.length) {
@@ -127 +133 @@
                         var tagOpen = '<span class="glvrd-underline" data-glvrd="true" data-description="' + fragment.hint.description + '" data-name="' + fragment.hint.name + '" >',
                             tagClose = '</span>',
-                            tagsLength = tagOpen.length + tagClose.length;
+                            tagsLength = tagOpen.length + tagClose.length,
+                            skip = textInAttributes.some(function(attributeContent) {
+                                return attributeContent.start <=fragment.start && fragment.end <= attributeContent.end;
+                            });
+
+                        if (skip) {
+                            return;
+                        }
 
                         content = content.substring(0, fragment.start + offset)
@@ -177 +190 @@
         },
 
+        hideTooltip: function() {
+            var me = this;
+
+            if (me.tooltip) {
+                me.tooltip.hide();
+            }
+        },
+
         countSentences : function (text) {
             if (text.length === 0) {
@@ -183 +204 @@
 
             var sentencesQuantity = text.match(/[^\s](\.|…|\!|\?)(?!\w)(?!\.\.)/g).length;
-            if (!/(\.|…|\!|\?)/g.test(text.slice(-1))) {
+            if (!(/(\.|…|\!|\?)/g).test(text.slice(-1))) {
                 sentencesQuantity++;
             }
@@ -197 +218 @@
         },
 
-        countChars : function (text, countSpaces) {
+        countChars : function (text) {
             if (text.length === 0) {
                 return 0;
             }
 
-            var regexp = countSpaces ? /[^А-Яа-яA-Za-z0-9-\s.,:()-]+/g : /[^А-Яа-яA-Za-z0-9-.,:()-]+/g;
-            return text.replace(regexp, "").length;
+            return text.replace(/[^А-Яа-яA-Za-z0-9-\s.,()-]+/g, "").length;
         },
 
@@ -227 +247 @@
                     return zeroWord;
             }
+        },
+
+        getHtmlAttributes: function(content) {
+            var regexp = /\w+=\s*["|']([\sА-Яа-яё,.!?]+)["|']/g,
+                chunks = [], 
+                attribute, attributeContent, globalStartPos, globalEndPos;
+
+            while ((result = regexp.exec(content))!== null) {
+                attribute = result[0];
+                attributeContent = result[1];
+                globalStartPos = result.index;
+
+                if (attributeContent.length > 0) {
+                    globalStartPos += attribute.indexOf(attributeContent);
+                    globalEndPos = globalStartPos + attributeContent.length;
+                    chunks.push({
+                        text: attributeContent,
+                        start: globalStartPos,
+                        end: globalEndPos
+                    });
+                }
+            }
+
+            return chunks;
+        },
+
+        getScoreColor: function(score) {
+            if (score < 5) {
+                return 'red';
+            }
+
+            if (score < 7.5) {
+                return 'orange';
+            }
+
+            return 'green';
         },
 

russian-texts-proofreader-glvrd/tags/1.2.2/readme.txt

@@ -4 +4 @@
 Donate link: https://paypal.me/NLopin
 Requires at least: 4.2
-Tested up to: 4.4
+Tested up to: 4.5
 Stable tag: 1.2.2
 License: GPLv2 or later
@@ -58 +58 @@
 == Changelog ==
 = 1.2.2 =
-* Добавлен счетчик знаков без пробелов
+* Главред больше не ломает HTML разметку в тех случаях, когда внутри тегов есть текст на русском языке
+* Цветные метки у оценок
 
 = 1.2.1 =