Merge branch 'master' into translations

[bookstack] / resources / assets / js / directives.js

diff --git a/resources/assets/js/directives.js b/resources/assets/js/directives.js
index 933bbf5ff5e96c0ad9631a39f72d5f558e880b49..ef8bcd85c6c5ee8e80111a6303e1e7b2a3984d6d 100644 (file)
--- a/resources/assets/js/directives.js
+++ b/resources/assets/js/directives.js
@@ -1,105 +1,61 @@
 "use strict";
 "use strict";

-const DropZone = require('dropzone');
-const markdown = require('marked');
+import DropZone from "dropzone";
+import markdown from "marked";

 
 

-const toggleSwitchTemplate = require('./components/toggle-switch.html');
-const imagePickerTemplate = require('./components/image-picker.html');
-const dropZoneTemplate = require('./components/drop-zone.html');
-
-module.exports = function (ngApp, events) {
+export default function (ngApp, events) {

 
     /**
 
     /**

-     * Toggle Switches
-     * Has basic on/off functionality.
-     * Use string values of 'true' & 'false' to dictate the current state.
+     * Common tab controls using simple jQuery functions.

      */
      */

-    ngApp.directive('toggleSwitch', function () {
+    ngApp.directive('tabContainer', function() {

         return {
             restrict: 'A',
         return {
             restrict: 'A',

-            template: toggleSwitchTemplate,
-            scope: true,

             link: function (scope, element, attrs) {
             link: function (scope, element, attrs) {

-                scope.name = attrs.name;
-                scope.value = attrs.value;
-                scope.isActive = scope.value == true && scope.value != 'false';
-                scope.value = (scope.value == true && scope.value != 'false') ? 'true' : 'false';
-
-                scope.switch = function () {
-                    scope.isActive = !scope.isActive;
-                    scope.value = scope.isActive ? 'true' : 'false';
+                const $content = element.find('[tab-content]');
+                const $buttons = element.find('[tab-button]');
+
+                if (attrs.tabContainer) {
+                    let initial = attrs.tabContainer;
+                    $buttons.filter(`[tab-button="${initial}"]`).addClass('selected');
+                    $content.hide().filter(`[tab-content="${initial}"]`).show();
+                } else {
+                    $content.hide().first().show();
+                    $buttons.first().addClass('selected');

                 }
 
                 }
 

+                $buttons.click(function() {
+                    let clickedTab = $(this);
+                    $buttons.removeClass('selected');
+                    $content.hide();
+                    let name = clickedTab.addClass('selected').attr('tab-button');
+                    $content.filter(`[tab-content="${name}"]`).show();
+                });

             }
         };
     });
 
             }
         };
     });
 

-

     /**
     /**

-     * Image Picker
-     * Is a simple front-end interface that connects to an ImageManager if present.
+     * Sub form component to allow inner-form sections to act like their own forms.

      */
      */

-    ngApp.directive('imagePicker', ['$http', 'imageManagerService', function ($http, imageManagerService) {
+    ngApp.directive('subForm', function() {

         return {
         return {

-            restrict: 'E',
-            template: imagePickerTemplate,
-            scope: {
-                name: '@',
-                resizeHeight: '@',
-                resizeWidth: '@',
-                resizeCrop: '@',
-                showRemove: '=',
-                currentImage: '@',
-                currentId: '@',
-                defaultImage: '@',
-                imageClass: '@'
-            },
+            restrict: 'A',

             link: function (scope, element, attrs) {
             link: function (scope, element, attrs) {

-                let usingIds = typeof scope.currentId !== 'undefined' || scope.currentId === 'false';
-                scope.image = scope.currentImage;
-                scope.value = scope.currentImage || '';
-                if (usingIds) scope.value = scope.currentId;
-
-                function setImage(imageModel, imageUrl) {
-                    scope.image = imageUrl;
-                    scope.value = usingIds ? imageModel.id : imageUrl;
-                }
-
-                scope.reset = function () {
-                    setImage({id: 0}, scope.defaultImage);
-                };
-
-                scope.remove = function () {
-                    scope.image = 'none';
-                    scope.value = 'none';
-                };
-
-                scope.showImageManager = function () {
-                    imageManagerService.show((image) => {
-                        scope.updateImageFromModel(image);
-                    });
-                };
-
-                scope.updateImageFromModel = function (model) {
-                    let isResized = scope.resizeWidth && scope.resizeHeight;
-
-                    if (!isResized) {
-                        scope.$apply(() => {
-                            setImage(model, model.url);
-                        });
-                        return;
+                element.on('keypress', e => {
+                    if (e.keyCode === 13) {
+                        submitEvent(e);

                     }
                     }

+                });

 
 

-                    let cropped = scope.resizeCrop ? 'true' : 'false';
-                    let requestString = '/images/thumb/' + model.id + '/' + scope.resizeWidth + '/' + scope.resizeHeight + '/' + cropped;
-                    requestString = window.baseUrl(requestString);
-                    $http.get(requestString).then((response) => {
-                        setImage(model, response.data.url);
-                    });
-                };
+                element.find('button[type="submit"]').click(submitEvent);

 
 

+                function submitEvent(e) {
+                    e.preventDefault();
+                    if (attrs.subForm) scope.$eval(attrs.subForm);
+                }

             }
         };
             }
         };

-    }]);
+    });

 
     /**
      * DropZone
 
     /**
      * DropZone


@@ -108,22 +64,28 @@ module.exports = function (ngApp, events) {
     ngApp.directive('dropZone', [function () {
         return {
             restrict: 'E',
     ngApp.directive('dropZone', [function () {
         return {
             restrict: 'E',

-            template: dropZoneTemplate,
+            template: `
+            <div class="dropzone-container">
+                <div class="dz-message">{{message}}</div>
+            </div>
+            `,

             scope: {
                 uploadUrl: '@',
                 eventSuccess: '=',
                 eventError: '=',
             scope: {
                 uploadUrl: '@',
                 eventSuccess: '=',
                 eventError: '=',

-                uploadedTo: '@'
+                uploadedTo: '@',

             },
             link: function (scope, element, attrs) {
             },
             link: function (scope, element, attrs) {

-                var dropZone = new DropZone(element[0].querySelector('.dropzone-container'), {
+                scope.message = attrs.message;
+                if (attrs.placeholder) element[0].querySelector('.dz-message').textContent = attrs.placeholder;
+                let dropZone = new DropZone(element[0].querySelector('.dropzone-container'), {

                     url: scope.uploadUrl,
                     init: function () {
                     url: scope.uploadUrl,
                     init: function () {

-                        var dz = this;
+                        let dz = this;

                         dz.on('sending', function (file, xhr, data) {
                         dz.on('sending', function (file, xhr, data) {

-                            var token = window.document.querySelector('meta[name=token]').getAttribute('content');
+                            let token = window.document.querySelector('meta[name=token]').getAttribute('content');

                             data.append('_token', token);
                             data.append('_token', token);

-                            var uploadedTo = typeof scope.uploadedTo === 'undefined' ? 0 : scope.uploadedTo;
+                            let uploadedTo = typeof scope.uploadedTo === 'undefined' ? 0 : scope.uploadedTo;

                             data.append('uploaded_to', uploadedTo);
                         });
                         if (typeof scope.eventSuccess !== 'undefined') dz.on('success', scope.eventSuccess);
                             data.append('uploaded_to', uploadedTo);
                         });
                         if (typeof scope.eventSuccess !== 'undefined') dz.on('success', scope.eventSuccess);


@@ -140,7 +102,7 @@ module.exports = function (ngApp, events) {
                                 $(file.previewElement).find('[data-dz-errormessage]').text(message);
                             }
 
                                 $(file.previewElement).find('[data-dz-errormessage]').text(message);
                             }
 

-                            if (xhr.status === 413) setMessage('The server does not allow uploads of this size. Please try a smaller file.');
+                            if (xhr.status === 413) setMessage(trans('errors.server_upload_limit'));

                             if (errorMessage.file) setMessage(errorMessage.file[0]);
 
                         });
                             if (errorMessage.file) setMessage(errorMessage.file[0]);
 
                         });


@@ -199,7 +161,7 @@ module.exports = function (ngApp, events) {
 
                 function tinyMceSetup(editor) {
                     editor.on('ExecCommand change NodeChange ObjectResized', (e) => {
 
                 function tinyMceSetup(editor) {
                     editor.on('ExecCommand change NodeChange ObjectResized', (e) => {

-                        var content = editor.getContent();
+                        let content = editor.getContent();

                         $timeout(() => {
                             scope.mceModel = content;
                         });
                         $timeout(() => {
                             scope.mceModel = content;
                         });


@@ -227,9 +189,9 @@ module.exports = function (ngApp, events) {
                 // Custom tinyMCE plugins
                 tinymce.PluginManager.add('customhr', function (editor) {
                     editor.addCommand('InsertHorizontalRule', function () {
                 // Custom tinyMCE plugins
                 tinymce.PluginManager.add('customhr', function (editor) {
                     editor.addCommand('InsertHorizontalRule', function () {

-                        var hrElem = document.createElement('hr');
-                        var cNode = editor.selection.getNode();
-                        var parentNode = cNode.parentNode;
+                        let hrElem = document.createElement('hr');
+                        let cNode = editor.selection.getNode();
+                        let parentNode = cNode.parentNode;

                         parentNode.insertBefore(hrElem, cNode);
                     });
 
                         parentNode.insertBefore(hrElem, cNode);
                     });
 


@@ -299,15 +261,21 @@ module.exports = function (ngApp, events) {
             link: function (scope, element, attrs) {
 
                 // Elements
             link: function (scope, element, attrs) {
 
                 // Elements

-                const input = element.find('[markdown-input] textarea').first();
-                const display = element.find('.markdown-display').first();
-                const insertImage = element.find('button[data-action="insertImage"]');
-                const insertEntityLink = element.find('button[data-action="insertEntityLink"]')
+                const $input = element.find('[markdown-input] textarea').first();
+                const $display = element.find('.markdown-display').first();
+                const $insertImage = element.find('button[data-action="insertImage"]');
+                const $insertEntityLink = element.find('button[data-action="insertEntityLink"]');
+
+                // Prevent markdown display link click redirect
+                $display.on('click', 'a', function(event) {
+                    event.preventDefault();
+                    window.open(this.getAttribute('href'));
+                });

 
                 let currentCaretPos = 0;
 
 
                 let currentCaretPos = 0;
 

-                input.blur(event => {
-                    currentCaretPos = input[0].selectionStart;
+                $input.blur(event => {
+                    currentCaretPos = $input[0].selectionStart;

                 });
 
                 // Scroll sync
                 });
 
                 // Scroll sync


@@ -317,10 +285,10 @@ module.exports = function (ngApp, events) {
                     displayHeight;
 
                 function setScrollHeights() {
                     displayHeight;
 
                 function setScrollHeights() {

-                    inputScrollHeight = input[0].scrollHeight;
-                    inputHeight = input.height();
-                    displayScrollHeight = display[0].scrollHeight;
-                    displayHeight = display.height();
+                    inputScrollHeight = $input[0].scrollHeight;
+                    inputHeight = $input.height();
+                    displayScrollHeight = $display[0].scrollHeight;
+                    displayHeight = $display.height();

                 }
 
                 setTimeout(() => {
                 }
 
                 setTimeout(() => {


@@ -329,29 +297,29 @@ module.exports = function (ngApp, events) {
                 window.addEventListener('resize', setScrollHeights);
                 let scrollDebounceTime = 800;
                 let lastScroll = 0;
                 window.addEventListener('resize', setScrollHeights);
                 let scrollDebounceTime = 800;
                 let lastScroll = 0;

-                input.on('scroll', event => {
+                $input.on('scroll', event => {

                     let now = Date.now();
                     if (now - lastScroll > scrollDebounceTime) {
                         setScrollHeights()
                     }
                     let now = Date.now();
                     if (now - lastScroll > scrollDebounceTime) {
                         setScrollHeights()
                     }

-                    let scrollPercent = (input.scrollTop() / (inputScrollHeight - inputHeight));
+                    let scrollPercent = ($input.scrollTop() / (inputScrollHeight - inputHeight));

                     let displayScrollY = (displayScrollHeight - displayHeight) * scrollPercent;
                     let displayScrollY = (displayScrollHeight - displayHeight) * scrollPercent;

-                    display.scrollTop(displayScrollY);
+                    $display.scrollTop(displayScrollY);

                     lastScroll = now;
                 });
 
                 // Editor key-presses
                     lastScroll = now;
                 });
 
                 // Editor key-presses

-                input.keydown(event => {
+                $input.keydown(event => {

                     // Insert image shortcut
                     if (event.which === 73 && event.ctrlKey && event.shiftKey) {
                         event.preventDefault();
                     // Insert image shortcut
                     if (event.which === 73 && event.ctrlKey && event.shiftKey) {
                         event.preventDefault();

-                        let caretPos = input[0].selectionStart;
-                        let currentContent = input.val();
+                        let caretPos = $input[0].selectionStart;
+                        let currentContent = $input.val();

                         const mdImageText = "![](http://)";
                         const mdImageText = "![](http://)";

-                        input.val(currentContent.substring(0, caretPos) + mdImageText + currentContent.substring(caretPos));
-                        input.focus();
-                        input[0].selectionStart = caretPos + ("![](".length);
-                        input[0].selectionEnd = caretPos + ('![](http://'.length);
+                        $input.val(currentContent.substring(0, caretPos) + mdImageText + currentContent.substring(caretPos));
+                        $input.focus();
+                        $input[0].selectionStart = caretPos + ("![](".length);
+                        $input[0].selectionEnd = caretPos + ('![](http://'.length);

                         return;
                     }
 
                         return;
                     }
 


@@ -366,48 +334,48 @@ module.exports = function (ngApp, events) {
                 });
 
                 // Insert image from image manager
                 });
 
                 // Insert image from image manager

-                insertImage.click(event => {
+                $insertImage.click(event => {

                     window.ImageManager.showExternal(image => {
                         let caretPos = currentCaretPos;
                     window.ImageManager.showExternal(image => {
                         let caretPos = currentCaretPos;

-                        let currentContent = input.val();
+                        let currentContent = $input.val();

                         let mdImageText = "![" + image.name + "](" + image.thumbs.display + ")";
                         let mdImageText = "![" + image.name + "](" + image.thumbs.display + ")";

-                        input.val(currentContent.substring(0, caretPos) + mdImageText + currentContent.substring(caretPos));
-                        input.change();
+                        $input.val(currentContent.substring(0, caretPos) + mdImageText + currentContent.substring(caretPos));
+                        $input.change();

                     });
                 });
 
                 function showLinkSelector() {
                     window.showEntityLinkSelector((entity) => {
                         let selectionStart = currentCaretPos;
                     });
                 });
 
                 function showLinkSelector() {
                     window.showEntityLinkSelector((entity) => {
                         let selectionStart = currentCaretPos;

-                        let selectionEnd = input[0].selectionEnd;
+                        let selectionEnd = $input[0].selectionEnd;

                         let textSelected = (selectionEnd !== selectionStart);
                         let textSelected = (selectionEnd !== selectionStart);

-                        let currentContent = input.val();
+                        let currentContent = $input.val();

 
                         if (textSelected) {
                             let selectedText = currentContent.substring(selectionStart, selectionEnd);
                             let linkText = `[${selectedText}](${entity.link})`;
 
                         if (textSelected) {
                             let selectedText = currentContent.substring(selectionStart, selectionEnd);
                             let linkText = `[${selectedText}](${entity.link})`;

-                            input.val(currentContent.substring(0, selectionStart) + linkText + currentContent.substring(selectionEnd));
+                            $input.val(currentContent.substring(0, selectionStart) + linkText + currentContent.substring(selectionEnd));

                         } else {
                             let linkText = ` [${entity.name}](${entity.link}) `;
                         } else {
                             let linkText = ` [${entity.name}](${entity.link}) `;

-                            input.val(currentContent.substring(0, selectionStart) + linkText + currentContent.substring(selectionStart))
+                            $input.val(currentContent.substring(0, selectionStart) + linkText + currentContent.substring(selectionStart))

                         }
                         }

-                        input.change();
+                        $input.change();

                     });
                 }
                     });
                 }

-                insertEntityLink.click(showLinkSelector);
+                $insertEntityLink.click(showLinkSelector);

 
                 // Upload and insert image on paste
                 function editorPaste(e) {
                     e = e.originalEvent;
                     if (!e.clipboardData) return
 
                 // Upload and insert image on paste
                 function editorPaste(e) {
                     e = e.originalEvent;
                     if (!e.clipboardData) return

-                    var items = e.clipboardData.items;
+                    let items = e.clipboardData.items;

                     if (!items) return;
                     if (!items) return;

-                    for (var i = 0; i < items.length; i++) {
+                    for (let i = 0; i < items.length; i++) {

                         uploadImage(items[i].getAsFile());
                     }
                 }
 
                         uploadImage(items[i].getAsFile());
                     }
                 }
 

-                input.on('paste', editorPaste);
+                $input.on('paste', editorPaste);

 
                 // Handle image drop, Uploads images to BookStack.
                 function handleImageDrop(event) {
 
                 // Handle image drop, Uploads images to BookStack.
                 function handleImageDrop(event) {


@@ -419,17 +387,17 @@ module.exports = function (ngApp, events) {
                     }
                 }
 
                     }
                 }
 

-                input.on('drop', handleImageDrop);
+                $input.on('drop', handleImageDrop);

 
                 // Handle image upload and add image into markdown content
                 function uploadImage(file) {
                     if (file.type.indexOf('image') !== 0) return;
 
                 // Handle image upload and add image into markdown content
                 function uploadImage(file) {
                     if (file.type.indexOf('image') !== 0) return;

-                    var formData = new FormData();
-                    var ext = 'png';
-                    var xhr = new XMLHttpRequest();
+                    let formData = new FormData();
+                    let ext = 'png';
+                    let xhr = new XMLHttpRequest();

 
                     if (file.name) {
 
                     if (file.name) {

-                        var fileNameMatches = file.name.match(/\.(.+)$/);
+                        let fileNameMatches = file.name.match(/\.(.+)$/);

                         if (fileNameMatches) {
                             ext = fileNameMatches[1];
                         }
                         if (fileNameMatches) {
                             ext = fileNameMatches[1];
                         }


@@ -437,17 +405,17 @@ module.exports = function (ngApp, events) {
 
                     // Insert image into markdown
                     let id = "image-" + Math.random().toString(16).slice(2);
 
                     // Insert image into markdown
                     let id = "image-" + Math.random().toString(16).slice(2);

-                    let selectStart = input[0].selectionStart;
-                    let selectEnd = input[0].selectionEnd;
-                    let content = input[0].value;
+                    let selectStart = $input[0].selectionStart;
+                    let selectEnd = $input[0].selectionEnd;
+                    let content = $input[0].value;

                     let selectText = content.substring(selectStart, selectEnd);
                     let placeholderImage = window.baseUrl(`/loading.gif#upload${id}`);
                     let innerContent = ((selectEnd > selectStart) ? `![${selectText}]` : '![]') + `(${placeholderImage})`;
                     let selectText = content.substring(selectStart, selectEnd);
                     let placeholderImage = window.baseUrl(`/loading.gif#upload${id}`);
                     let innerContent = ((selectEnd > selectStart) ? `![${selectText}]` : '![]') + `(${placeholderImage})`;

-                    input[0].value = content.substring(0, selectStart) +  innerContent + content.substring(selectEnd);
+                    $input[0].value = content.substring(0, selectStart) +  innerContent + content.substring(selectEnd);

 
 

-                    input.focus();
-                    input[0].selectionStart = selectStart;
-                    input[0].selectionEnd = selectStart;
+                    $input.focus();
+                    $input[0].selectionStart = selectStart;
+                    $input[0].selectionEnd = selectStart;

 
                     let remoteFilename = "image-" + Date.now() + "." + ext;
                     formData.append('file', file, remoteFilename);
 
                     let remoteFilename = "image-" + Date.now() + "." + ext;
                     formData.append('file', file, remoteFilename);


@@ -455,20 +423,20 @@ module.exports = function (ngApp, events) {
 
                     xhr.open('POST', window.baseUrl('/images/gallery/upload'));
                     xhr.onload = function () {
 
                     xhr.open('POST', window.baseUrl('/images/gallery/upload'));
                     xhr.onload = function () {

-                        let selectStart = input[0].selectionStart;
+                        let selectStart = $input[0].selectionStart;

                         if (xhr.status === 200 || xhr.status === 201) {
                         if (xhr.status === 200 || xhr.status === 201) {

-                            var result = JSON.parse(xhr.responseText);
-                            input[0].value = input[0].value.replace(placeholderImage, result.thumbs.display);
-                            input.change();
+                            let result = JSON.parse(xhr.responseText);
+                            $input[0].value = $input[0].value.replace(placeholderImage, result.thumbs.display);
+                            $input.change();

                         } else {
                         } else {

-                            console.log('An error occurred uploading the image');
+                            console.log(trans('errors.image_upload_error'));

                             console.log(xhr.responseText);
                             console.log(xhr.responseText);

-                            input[0].value = input[0].value.replace(innerContent, '');
-                            input.change();
+                            $input[0].value = $input[0].value.replace(innerContent, '');
+                            $input.change();

                         }
                         }

-                        input.focus();
-                        input[0].selectionStart = selectStart;
-                        input[0].selectionEnd = selectStart;
+                        $input.focus();
+                        $input[0].selectionStart = selectStart;
+                        $input[0].selectionEnd = selectStart;

                     };
                     xhr.send(formData);
                 }
                     };
                     xhr.send(formData);
                 }


@@ -488,8 +456,8 @@ module.exports = function (ngApp, events) {
             link: function (scope, elem, attrs) {
 
                 // Get common elements
             link: function (scope, elem, attrs) {
 
                 // Get common elements

-                const $buttons = elem.find('[tab-button]');
-                const $content = elem.find('[tab-content]');
+                const $buttons = elem.find('[toolbox-tab-button]');
+                const $content = elem.find('[toolbox-tab-content]');

                 const $toggle = elem.find('[toolbox-toggle]');
 
                 // Handle toolbox toggle click
                 const $toggle = elem.find('[toolbox-toggle]');
 
                 // Handle toolbox toggle click


@@ -501,17 +469,17 @@ module.exports = function (ngApp, events) {
                 function setActive(tabName, openToolbox) {
                     $buttons.removeClass('active');
                     $content.hide();
                 function setActive(tabName, openToolbox) {
                     $buttons.removeClass('active');
                     $content.hide();

-                    $buttons.filter(`[tab-button="${tabName}"]`).addClass('active');
-                    $content.filter(`[tab-content="${tabName}"]`).show();
+                    $buttons.filter(`[toolbox-tab-button="${tabName}"]`).addClass('active');
+                    $content.filter(`[toolbox-tab-content="${tabName}"]`).show();

                     if (openToolbox) elem.addClass('open');
                 }
 
                 // Set the first tab content active on load
                     if (openToolbox) elem.addClass('open');
                 }
 
                 // Set the first tab content active on load

-                setActive($content.first().attr('tab-content'), false);
+                setActive($content.first().attr('toolbox-tab-content'), false);

 
                 // Handle tab button click
                 $buttons.click(function (e) {
 
                 // Handle tab button click
                 $buttons.click(function (e) {

-                    let name = $(this).attr('tab-button');
+                    let name = $(this).attr('toolbox-tab-button');

                     setActive(name, true);
                 });
             }
                     setActive(name, true);
                 });
             }


@@ -549,7 +517,7 @@ module.exports = function (ngApp, events) {
                     let val = $input.val();
                     let url = $input.attr('autosuggest');
                     let type = $input.attr('autosuggest-type');
                     let val = $input.val();
                     let url = $input.attr('autosuggest');
                     let type = $input.attr('autosuggest-type');

-                    
+

                     // Add name param to request if for a value
                     if (type.toLowerCase() === 'value') {
                         let $nameInput = $input.closest('tr').find('[autosuggest-type="name"]').first();
                     // Add name param to request if for a value
                     if (type.toLowerCase() === 'value') {
                         let $nameInput = $input.closest('tr').find('[autosuggest-type="name"]').first();


@@ -606,8 +574,7 @@ module.exports = function (ngApp, events) {
                     }
                     // Enter or tab key
                     else if ((event.keyCode === 13 || event.keyCode === 9) && !event.shiftKey) {
                     }
                     // Enter or tab key
                     else if ((event.keyCode === 13 || event.keyCode === 9) && !event.shiftKey) {

-                        let text = suggestionElems[active].textContent;
-                        currentInput[0].value = text;
+                        currentInput[0].value = suggestionElems[active].textContent;

                         currentInput.focus();
                         $suggestionBox.hide();
                         isShowing = false;
                         currentInput.focus();
                         $suggestionBox.hide();
                         isShowing = false;


@@ -658,14 +625,13 @@ module.exports = function (ngApp, events) {
                     // Build suggestions
                     $suggestionBox[0].innerHTML = '';
                     for (let i = 0; i < suggestions.length; i++) {
                     // Build suggestions
                     $suggestionBox[0].innerHTML = '';
                     for (let i = 0; i < suggestions.length; i++) {

-                        var suggestion = document.createElement('li');
+                        let suggestion = document.createElement('li');

                         suggestion.textContent = suggestions[i];
                         suggestion.onclick = suggestionClick;
                         if (i === 0) {
                         suggestion.textContent = suggestions[i];
                         suggestion.onclick = suggestionClick;
                         if (i === 0) {

-                            suggestion.className = 'active'
+                            suggestion.className = 'active';

                             active = 0;
                         }
                             active = 0;
                         }

-                        ;

                         $suggestionBox[0].appendChild(suggestion);
                     }
 
                         $suggestionBox[0].appendChild(suggestion);
                     }
 


@@ -674,12 +640,11 @@ module.exports = function (ngApp, events) {
 
                 // Suggestion click event
                 function suggestionClick(event) {
 
                 // Suggestion click event
                 function suggestionClick(event) {

-                    let text = this.textContent;
-                    currentInput[0].value = text;
+                    currentInput[0].value = this.textContent;

                     currentInput.focus();
                     $suggestionBox.hide();
                     isShowing = false;
                     currentInput.focus();
                     $suggestionBox.hide();
                     isShowing = false;

-                };
+                }

 
                 // Get suggestions & cache
                 function getSuggestions(input, url) {
 
                 // Get suggestions & cache
                 function getSuggestions(input, url) {


@@ -705,7 +670,7 @@ module.exports = function (ngApp, events) {
 
     ngApp.directive('entityLinkSelector', [function($http) {
         return {
 
     ngApp.directive('entityLinkSelector', [function($http) {
         return {

-            restict: 'A',
+            restrict: 'A',

             link: function(scope, element, attrs) {
 
                 const selectButton = element.find('.entity-link-selector-confirm');
             link: function(scope, element, attrs) {
 
                 const selectButton = element.find('.entity-link-selector-confirm');


@@ -769,7 +734,7 @@ module.exports = function (ngApp, events) {
                 const input = element.find('[entity-selector-input]').first();
 
                 // Detect double click events
                 const input = element.find('[entity-selector-input]').first();
 
                 // Detect double click events

-                var lastClick = 0;
+                let lastClick = 0;

                 function isDoubleClick() {
                     let now = Date.now();
                     let answer = now - lastClick < 300;
                 function isDoubleClick() {
                     let now = Date.now();
                     let answer = now - lastClick < 300;


@@ -850,17 +815,3 @@ module.exports = function (ngApp, events) {
         };
     }]);
 };
         };
     }]);
 };

-
-
-
-
-
-
-
-
-
-
-
-
-
-