Changeset 3880:e6d1f6d9d7df for plugins/tags

Timestamp:

09/18/18 20:22:10 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Use let and const rather than var (ES2015/ES6), use template string where is more efficient

Location:

plugins/tags/js

Files:

• ckeditor-tags-plugin.js (modified) (1 diff)
• legacy-post.js (modified) (4 diffs)
• post.js (modified) (2 diffs)
• posts_actions.js (modified) (1 diff)

plugins/tags/js/ckeditor-tags-plugin.js

@@ -8 +8 @@
         exec: function(editor) {
           if (editor.getSelection().getNative().toString().replace(/\s*/, '') != '') {
-            var str = editor.getSelection().getNative().toString().replace(/\s*/, '');
-            var url = dotclear.msg.tag_url;
+            const str = editor.getSelection().getNative().toString().replace(/\s*/, '');
+            const url = dotclear.msg.tag_url;
             window.dc_tag_editor.addMeta(str);
-            var link = '<a href="' + $.stripBaseURL(url + '/' + str) + '">' + str + '</a>';
-            var element = CKEDITOR.dom.element.createFromHtml(link);
+            const link = `<a href="${$.stripBaseURL(url + '/' + str)}">${str}</a>`;
+            const element = CKEDITOR.dom.element.createFromHtml(link);
             editor.insertElement(element);
           }

plugins/tags/js/legacy-post.js

@@ -35 +35 @@
 };
 jsToolBar.prototype.elements.tag.fn.markdown = function() {
-  var url = this.elements.tag.url;
+  const url = this.elements.tag.url;
   this.encloseSelection('', '', function(str) {
     if (str == '') {
@@ -50 +50 @@
 };
 jsToolBar.prototype.elements.tag.fn.xhtml = function() {
-  var url = this.elements.tag.url;
+  const url = this.elements.tag.url;
   this.encloseSelection('', '', function(str) {
     if (str == '') {
@@ -65 +65 @@
 };
 jsToolBar.prototype.elements.tag.fn.wysiwyg = function() {
-  var t = this.getSelectedText();
+  const t = this.getSelectedText();
 
   if (t == '') {
@@ -75 +75 @@
   }
 
-  var n = this.getSelectedNode();
-  var a = document.createElement('a');
+  const n = this.getSelectedNode();
+  const a = document.createElement('a');
   a.href = this.stripBaseURL(this.elements.tag.url + '/' + t);
   a.appendChild(n);

plugins/tags/js/post.js

@@ -4 +4 @@
 $(function() {
   $('#edit-entry').onetabload(function() {
-    var tags_edit = $('#tags-edit');
-    var post_id = $('#id');
-    var meta_field = null;
-    var mEdit = null;
+    const tags_edit = $('#tags-edit');
+    let post_id = $('#id');
+    let meta_field = null;
+    let mEdit = null;
 
     if (tags_edit.length > 0) {
@@ -34 +34 @@
       matchContains: true,
       parse: function(xml) {
-        var results = [];
+        let results = [];
         $(xml).find('meta').each(function() {
           results[results.length] = {

plugins/tags/js/posts_actions.js

@@ -3 +3 @@
 
 $(function() {
-     var tag_field = $('#new_tags');
+  const tag_field = $('#new_tags');
 
-     tag_field.after('<div id="tags_list"></div>');
-     tag_field.hide();
+  tag_field.after('<div id="tags_list"></div>');
+  tag_field.hide();
 
-     var target = $('#tags_list');
-     var mEdit = new metaEditor(target,tag_field,'tag',editor_tags_options);
-     mEdit.meta_url = 'plugin.php?p=tags&m=tag_posts&amp;tag=';
+  const target = $('#tags_list');
+  let mEdit = new metaEditor(target, tag_field, 'tag', editor_tags_options);
+  mEdit.meta_url = 'plugin.php?p=tags&m=tag_posts&amp;tag=';
 
-     mEdit.meta_dialog = $('<input type="text" />');
-     mEdit.meta_dialog.attr('title',mEdit.text_add_meta.replace(/%s/,mEdit.meta_type));
-     mEdit.meta_dialog.attr('id','post_meta_input');
-     mEdit.meta_dialog.css('width','90%');
+  mEdit.meta_dialog = $('<input type="text" />');
+  mEdit.meta_dialog.attr('title', mEdit.text_add_meta.replace(/%s/, mEdit.meta_type));
+  mEdit.meta_dialog.attr('id', 'post_meta_input');
+  mEdit.meta_dialog.css('width', '90%');
 
-     mEdit.addMetaDialog();
+  mEdit.addMetaDialog();
 
-     $('input[name="save_tags"]').click(function() {
-          tag_field.val($('#post_meta_input').val());
-     });
+  $('input[name="save_tags"]').click(function() {
+    tag_field.val($('#post_meta_input').val());
+  });
 
-     $('#post_meta_input').autocomplete(mEdit.service_uri, {
-          extraParams: {
-               'f':        'searchMeta',
-               'metaType': 'tag'
-          },
-          delay: 1000,
-          multiple: true,
-          matchSubset: false,
-          matchContains: true,
-          parse: function(xml) {
-               var results = [];
-               $(xml).find('meta').each(function(){
-                    results[results.length] = {
-                         data: {
-                              'id':      $(this).text(),
-                              'count':   $(this).attr('count'),
-                              'percent': $(this).attr('roundpercent')
-                         },
-                         result: $(this).text()
-                    };
-               });
-               return results;
-          },
-          formatItem: function(tag) {
-               return tag.id + ' <em>(' +
-               dotclear.msg.tags_autocomplete.
-                    replace('%p',tag.percent).
-                    replace('%e',tag.count + ' ' +
-                         (tag.count > 1 ?
-                         dotclear.msg.entries :
-                         dotclear.msg.entry)
-                    ) +
-               ')</em>';
-          },
-          formatResult: function(tag) {
-               return tag.result;
-          }
-     });
+  $('#post_meta_input').autocomplete(mEdit.service_uri, {
+    extraParams: {
+      'f': 'searchMeta',
+      'metaType': 'tag'
+    },
+    delay: 1000,
+    multiple: true,
+    matchSubset: false,
+    matchContains: true,
+    parse: function(xml) {
+      let results = [];
+      $(xml).find('meta').each(function() {
+        results[results.length] = {
+          data: {
+            'id': $(this).text(),
+            'count': $(this).attr('count'),
+            'percent': $(this).attr('roundpercent')
+          },
+          result: $(this).text()
+        };
+      });
+      return results;
+    },
+    formatItem: function(tag) {
+      return tag.id + ' <em>(' +
+        dotclear.msg.tags_autocomplete.
+      replace('%p', tag.percent).
+      replace('%e', tag.count + ' ' +
+          (tag.count > 1 ?
+            dotclear.msg.entries :
+            dotclear.msg.entry)
+        ) +
+        ')</em>';
+    },
+    formatResult: function(tag) {
+      return tag.result;
+    }
+  });
 });