Ver código fonte

Updates handling links on watermarks.

When link is missing disable clicking.
j8
damencho 8 anos atrás
pai
commit
e4c4236386

+ 17
- 0
modules/UI/util/UIUtil.js Ver arquivo

@@ -273,6 +273,23 @@ import KeyboardShortcut from '../../keyboardshortcut/keyboardshortcut';
273 273
      */
274 274
     parseCssInt(cssValue) {
275 275
         return parseInt(cssValue) || 0;
276
+    },
277
+
278
+    /**
279
+     * Adds href value to 'a' link jquery object. If link value is null,
280
+     * undefined or empty string, disables the link.
281
+     * @param {object} aLinkElement the jquery object
282
+     * @param {string} link the link value
283
+     */
284
+    setLinkHref(aLinkElement, link) {
285
+        if (link) {
286
+            aLinkElement.attr('href', link);
287
+        } else {
288
+            aLinkElement.css({
289
+                "pointer-events": "none",
290
+                "cursor": "default"
291
+            });
292
+        }
276 293
     }
277 294
 };
278 295
 

+ 6
- 4
modules/UI/videolayout/LargeVideo.js Ver arquivo

@@ -414,8 +414,9 @@ export default class LargeVideoManager {
414 414
 
415 415
             leftWatermarkDiv.css({display: 'block'});
416 416
 
417
-            leftWatermarkDiv.parent().attr(
418
-                'href', interfaceConfig.JITSI_WATERMARK_LINK);
417
+            UIUtil.setLinkHref(
418
+                leftWatermarkDiv.parent(),
419
+                interfaceConfig.JITSI_WATERMARK_LINK);
419 420
         }
420 421
 
421 422
         if (interfaceConfig.SHOW_BRAND_WATERMARK) {
@@ -427,8 +428,9 @@ export default class LargeVideoManager {
427 428
                 backgroundImage: 'url(images/rightwatermark.png)'
428 429
             });
429 430
 
430
-            rightWatermarkDiv.parent().attr(
431
-                'href', interfaceConfig.BRAND_WATERMARK_LINK);
431
+            UIUtil.setLinkHref(
432
+                rightWatermarkDiv.parent(),
433
+                interfaceConfig.BRAND_WATERMARK_LINK);
432 434
         }
433 435
 
434 436
         if (interfaceConfig.SHOW_POWERED_BY) {

+ 7
- 5
modules/UI/welcome_page/WelcomePage.js Ver arquivo

@@ -2,6 +2,7 @@
2 2
 var animateTimeout, updateTimeout;
3 3
 
4 4
 var RoomnameGenerator = require("../../util/RoomnameGenerator");
5
+import UIUtil from "../util/UIUtil";
5 6
 
6 7
 function enter_room() {
7 8
     var val = $("#enter_room_field").val();
@@ -39,10 +40,10 @@ function setupWelcomePage() {
39 40
             $("#welcome_page_header div[class='watermark leftwatermark']");
40 41
         if(leftWatermarkDiv && leftWatermarkDiv.length > 0) {
41 42
             leftWatermarkDiv.css({display: 'block'});
42
-            leftWatermarkDiv.parent().get(0).href =
43
-                interfaceConfig.JITSI_WATERMARK_LINK;
43
+            UIUtil.setLinkHref(
44
+                leftWatermarkDiv.parent(),
45
+                interfaceConfig.JITSI_WATERMARK_LINK);
44 46
         }
45
-
46 47
     }
47 48
 
48 49
     if (interfaceConfig.SHOW_BRAND_WATERMARK) {
@@ -50,8 +51,9 @@ function setupWelcomePage() {
50 51
             $("#welcome_page_header div[class='watermark rightwatermark']");
51 52
         if(rightWatermarkDiv && rightWatermarkDiv.length > 0) {
52 53
             rightWatermarkDiv.css({display: 'block'});
53
-            rightWatermarkDiv.parent().get(0).href =
54
-                interfaceConfig.BRAND_WATERMARK_LINK;
54
+            UIUtil.setLinkHref(
55
+                rightWatermarkDiv.parent(),
56
+                interfaceConfig.BRAND_WATERMARK_LINK);
55 57
             rightWatermarkDiv.get(0).style.backgroundImage =
56 58
                 "url(images/rightwatermark.png)";
57 59
         }

Carregando…
Cancelar
Salvar