Merge pull request #1030 from coresh/patch-1

Fixes issue of method 'setTooltip'
8 years ago · 5c6f897ce7
parent d415a15e93 6bd5d6e4d5
commit 5c6f897ce7
1 changed files with 5 additions and 3 deletions
--- a/modules/UI/util/UIUtil.js
+++ b/modules/UI/util/UIUtil.js
@ -131,10 +131,12 @@ const TOOLTIP_POSITIONS = {
     * @param position the position of the tooltip in relation to the element
     */
    setTooltip: function (element, key, position) {
-        element.setAttribute('data-tooltip', TOOLTIP_POSITIONS[position]);
-        element.setAttribute('data-i18n', '[content]' + key);
+        if (element !== null) {
+            element.setAttribute('data-tooltip', TOOLTIP_POSITIONS[position]);
+            element.setAttribute('data-i18n', '[content]' + key);

-        APP.translation.translateElement($(element));
+            APP.translation.translateElement($(element));
+        }      
    },

    /**