Changeset 3880:e6d1f6d9d7df for plugins/dcLegacyEditor/js/jsToolBar/jsToolBar.js

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

File:

• plugins/dcLegacyEditor/js/jsToolBar/jsToolBar.js (modified) (19 diffs)

plugins/dcLegacyEditor/js/jsToolBar/jsToolBar.js

@@ -24 +24 @@
  */
 
-var jsToolBar = function(textarea) {
+const jsToolBar = function(textarea) {
   if (!document.createElement) {
     return;
@@ -59 +59 @@
       this.handle = document.createElement('div');
       this.handle.className = 'jstHandle';
-      var dragStart = this.resizeDragStart;
-      var This = this;
+      const dragStart = this.resizeDragStart;
+      const This = this;
       this.handle.addEventListener('mousedown', function(event) {
         dragStart.call(This, event);
@@ -73 +73 @@
 };
 
-var jsButton = function(title, fn, scope, className, accesskey) {
+const jsButton = function(title, fn, scope, className, accesskey) {
   this.title = title || null;
   this.fn = fn || function() {};
@@ -83 +83 @@
   if (!this.scope) return null;
 
-  var button = document.createElement('button');
+  const button = document.createElement('button');
   button.setAttribute('type', 'button');
   if (this.className) button.className = this.className;
   button.title = this.title;
   if (this.accesskey) button.accessKey = this.accesskey;
-  var span = document.createElement('span');
+  const span = document.createElement('span');
   span.appendChild(document.createTextNode(this.title));
   button.appendChild(span);
@@ -96 +96 @@
   }
   if (typeof(this.fn) == 'function') {
-    var This = this;
+    const This = this;
     button.onclick = function() {
       try {
@@ -107 +107 @@
 };
 
-var jsSpace = function(id) {
+const jsSpace = function(id) {
   this.id = id || null;
   this.width = null;
 };
 jsSpace.prototype.draw = function() {
-  var span = document.createElement('span');
+  const span = document.createElement('span');
   if (this.id) span.id = this.id;
   span.appendChild(document.createTextNode(String.fromCharCode(160)));
@@ -121 +121 @@
 };
 
-var jsCombo = function(title, options, scope, fn, className) {
+const jsCombo = function(title, options, scope, fn, className) {
   this.title = title || null;
   this.options = options || null;
@@ -131 +131 @@
   if (!this.scope || !this.options) return null;
 
-  var select = document.createElement('select');
+  const select = document.createElement('select');
   if (this.className) select.className = this.className;
   select.title = this.title;
 
-  for (var o in this.options) {
+  for (let o in this.options) {
     //var opt = this.options[o];
-    var option = document.createElement('option');
+    const option = document.createElement('option');
     option.value = o;
     option.appendChild(document.createTextNode(this.options[o]));
@@ -143 +143 @@
   }
 
-  var This = this;
+  const This = this;
   select.onchange = function() {
     try {
@@ -177 +177 @@
 
   button: function(toolName) {
-    var tool = this.elements[toolName];
+    const tool = this.elements[toolName];
     if (typeof tool.fn[this.mode] != 'function') return null;
-    var b = new jsButton(tool.title, tool.fn[this.mode], this, 'jstb_' + toolName, tool.accesskey);
+    const b = new jsButton(tool.title, tool.fn[this.mode], this, 'jstb_' + toolName, tool.accesskey);
     if (tool.icon != undefined) {
       b.icon = tool.icon;
@@ -186 +186 @@
   },
   space: function(toolName) {
-    var tool = new jsSpace(toolName);
+    const tool = new jsSpace(toolName);
     if (this.elements[toolName].format != undefined && !this.elements[toolName].format[this.mode]) return null;
     if (this.elements[toolName].width !== undefined) {
@@ -194 +194 @@
   },
   combo: function(toolName) {
-    var tool = this.elements[toolName];
+    const tool = this.elements[toolName];
 
     if (tool[this.mode] != undefined) {
 
-      var length = tool[this.mode].list.length;
+      const length = tool[this.mode].list.length;
 
       if (typeof tool[this.mode].fn != 'function' || length == 0) {
         return null;
       } else {
-        var options = {};
-        for (var i = 0; i < length; i++) {
-          var opt = tool[this.mode].list[i];
+        let options = {};
+        for (let i = 0; i < length; i++) {
+          const opt = tool[this.mode].list[i];
           options[opt] = tool.options[opt];
         }
@@ -224 +224 @@
 
     // Draw toolbar elements
-    var b, tool, newTool;
-
-    for (var i in this.elements) {
+    let b;
+    let tool;
+    let newTool;
+
+    for (let i in this.elements) {
       b = this.elements[i];
 
-      var disabled =
+      const disabled =
         b.type == undefined || b.type == '' ||
         (b.disabled != undefined && b.disabled) ||
@@ -262 +264 @@
     suffix = suffix || '';
 
-    var start, end, sel, scrollPos, subst, res;
+    let start;
+    let end;
+    let sel;
+    let scrollPos;
+    let subst;
+    let res;
 
     if (typeof(document.selection) != "undefined") {
@@ -305 +312 @@
   stripBaseURL: function(url) {
     if (this.base_url != '') {
-      var pos = url.indexOf(this.base_url);
+      const pos = url.indexOf(this.base_url);
       if (pos == 0) {
         url = url.substr(this.base_url.length);
@@ -321 +328 @@
 };
 jsToolBar.prototype.resizeDragStart = function(event) {
-  var This = this;
+  const This = this;
   this.dragStartY = event.clientY;
   this.resizeSetStartH();
@@ -364 +371 @@
       else
         try {
-          this.singleTag('<' + opt + '>', '</' + opt + '>');
+          this.singleTag(`<${opt}>`, `</${opt}>`);
         } catch (e) {}
       this.toolNodes.blocks.value = 'nonebis';
@@ -688 +695 @@
     this.encloseSelection('', '', function(str) {
       if (str) {
-        return '<img src="' + src + '" alt="' + str + '" />';
+        return `<img src="${src}" alt="${str}" />`;
       } else {
-        return '<img src="' + src + '" alt="" />';
+        return `<img src="${src}" alt="" />`;
       }
     });
@@ -700 +707 @@
     this.encloseSelection('', '', function(str) {
       if (str) {
-        return '((' + src + '|' + str + '))';
+        return `((${src}|${str}))`;
       } else {
-        return '((' + src + '))';
+        return `((${src}))`;
       }
     });