瀏覽代碼

Updates handling links on watermarks.

When link is missing disable clicking.
j8
damencho 8 年之前
父節點
當前提交
e4c4236386
共有 3 個文件被更改,包括 30 次插入9 次删除
  1. 17
    0
      modules/UI/util/UIUtil.js
  2. 6
    4
      modules/UI/videolayout/LargeVideo.js
  3. 7
    5
      modules/UI/welcome_page/WelcomePage.js

+ 17
- 0
modules/UI/util/UIUtil.js 查看文件

273
      */
273
      */
274
     parseCssInt(cssValue) {
274
     parseCssInt(cssValue) {
275
         return parseInt(cssValue) || 0;
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 查看文件

414
 
414
 
415
             leftWatermarkDiv.css({display: 'block'});
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
         if (interfaceConfig.SHOW_BRAND_WATERMARK) {
422
         if (interfaceConfig.SHOW_BRAND_WATERMARK) {
427
                 backgroundImage: 'url(images/rightwatermark.png)'
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
         if (interfaceConfig.SHOW_POWERED_BY) {
436
         if (interfaceConfig.SHOW_POWERED_BY) {

+ 7
- 5
modules/UI/welcome_page/WelcomePage.js 查看文件

2
 var animateTimeout, updateTimeout;
2
 var animateTimeout, updateTimeout;
3
 
3
 
4
 var RoomnameGenerator = require("../../util/RoomnameGenerator");
4
 var RoomnameGenerator = require("../../util/RoomnameGenerator");
5
+import UIUtil from "../util/UIUtil";
5
 
6
 
6
 function enter_room() {
7
 function enter_room() {
7
     var val = $("#enter_room_field").val();
8
     var val = $("#enter_room_field").val();
39
             $("#welcome_page_header div[class='watermark leftwatermark']");
40
             $("#welcome_page_header div[class='watermark leftwatermark']");
40
         if(leftWatermarkDiv && leftWatermarkDiv.length > 0) {
41
         if(leftWatermarkDiv && leftWatermarkDiv.length > 0) {
41
             leftWatermarkDiv.css({display: 'block'});
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
     if (interfaceConfig.SHOW_BRAND_WATERMARK) {
49
     if (interfaceConfig.SHOW_BRAND_WATERMARK) {
50
             $("#welcome_page_header div[class='watermark rightwatermark']");
51
             $("#welcome_page_header div[class='watermark rightwatermark']");
51
         if(rightWatermarkDiv && rightWatermarkDiv.length > 0) {
52
         if(rightWatermarkDiv && rightWatermarkDiv.length > 0) {
52
             rightWatermarkDiv.css({display: 'block'});
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
             rightWatermarkDiv.get(0).style.backgroundImage =
57
             rightWatermarkDiv.get(0).style.backgroundImage =
56
                 "url(images/rightwatermark.png)";
58
                 "url(images/rightwatermark.png)";
57
         }
59
         }

Loading…
取消
儲存