From e4c4236386c3c416f03d89408b2acbb9d748fdc7 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Fri, 16 Sep 2016 14:05:39 -0500
Subject: [PATCH] Updates handling links on watermarks.

When link is missing disable clicking.
---
 modules/UI/util/UIUtil.js              | 17 +++++++++++++++++
 modules/UI/videolayout/LargeVideo.js   | 10 ++++++----
 modules/UI/welcome_page/WelcomePage.js | 12 +++++++-----
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/modules/UI/util/UIUtil.js b/modules/UI/util/UIUtil.js
index f3ce11eea..81e296f31 100644
--- a/modules/UI/util/UIUtil.js
+++ b/modules/UI/util/UIUtil.js
@@ -273,6 +273,23 @@ import KeyboardShortcut from '../../keyboardshortcut/keyboardshortcut';
      */
     parseCssInt(cssValue) {
         return parseInt(cssValue) || 0;
+    },
+
+    /**
+     * Adds href value to 'a' link jquery object. If link value is null,
+     * undefined or empty string, disables the link.
+     * @param {object} aLinkElement the jquery object
+     * @param {string} link the link value
+     */
+    setLinkHref(aLinkElement, link) {
+        if (link) {
+            aLinkElement.attr('href', link);
+        } else {
+            aLinkElement.css({
+                "pointer-events": "none",
+                "cursor": "default"
+            });
+        }
     }
 };
 
diff --git a/modules/UI/videolayout/LargeVideo.js b/modules/UI/videolayout/LargeVideo.js
index 899f35875..e5449dc02 100644
--- a/modules/UI/videolayout/LargeVideo.js
+++ b/modules/UI/videolayout/LargeVideo.js
@@ -414,8 +414,9 @@ export default class LargeVideoManager {
 
             leftWatermarkDiv.css({display: 'block'});
 
-            leftWatermarkDiv.parent().attr(
-                'href', interfaceConfig.JITSI_WATERMARK_LINK);
+            UIUtil.setLinkHref(
+                leftWatermarkDiv.parent(),
+                interfaceConfig.JITSI_WATERMARK_LINK);
         }
 
         if (interfaceConfig.SHOW_BRAND_WATERMARK) {
@@ -427,8 +428,9 @@ export default class LargeVideoManager {
                 backgroundImage: 'url(images/rightwatermark.png)'
             });
 
-            rightWatermarkDiv.parent().attr(
-                'href', interfaceConfig.BRAND_WATERMARK_LINK);
+            UIUtil.setLinkHref(
+                rightWatermarkDiv.parent(),
+                interfaceConfig.BRAND_WATERMARK_LINK);
         }
 
         if (interfaceConfig.SHOW_POWERED_BY) {
diff --git a/modules/UI/welcome_page/WelcomePage.js b/modules/UI/welcome_page/WelcomePage.js
index 81435baa7..6ea3cb08f 100644
--- a/modules/UI/welcome_page/WelcomePage.js
+++ b/modules/UI/welcome_page/WelcomePage.js
@@ -2,6 +2,7 @@
 var animateTimeout, updateTimeout;
 
 var RoomnameGenerator = require("../../util/RoomnameGenerator");
+import UIUtil from "../util/UIUtil";
 
 function enter_room() {
     var val = $("#enter_room_field").val();
@@ -39,10 +40,10 @@ function setupWelcomePage() {
             $("#welcome_page_header div[class='watermark leftwatermark']");
         if(leftWatermarkDiv && leftWatermarkDiv.length > 0) {
             leftWatermarkDiv.css({display: 'block'});
-            leftWatermarkDiv.parent().get(0).href =
-                interfaceConfig.JITSI_WATERMARK_LINK;
+            UIUtil.setLinkHref(
+                leftWatermarkDiv.parent(),
+                interfaceConfig.JITSI_WATERMARK_LINK);
         }
-
     }
 
     if (interfaceConfig.SHOW_BRAND_WATERMARK) {
@@ -50,8 +51,9 @@ function setupWelcomePage() {
             $("#welcome_page_header div[class='watermark rightwatermark']");
         if(rightWatermarkDiv && rightWatermarkDiv.length > 0) {
             rightWatermarkDiv.css({display: 'block'});
-            rightWatermarkDiv.parent().get(0).href =
-                interfaceConfig.BRAND_WATERMARK_LINK;
+            UIUtil.setLinkHref(
+                rightWatermarkDiv.parent(),
+                interfaceConfig.BRAND_WATERMARK_LINK);
             rightWatermarkDiv.get(0).style.backgroundImage =
                 "url(images/rightwatermark.png)";
         }