Merge branch '2.75' into 2.76

includes/DefaultSettings.php

@@ -1,7 +1,7 @@
-<?php 
+<?php
 /**
  * This file stores default settings for Kaltura html5 client library "mwEmbed"
- * 
+ *
  * DO NOT MODIFY THIS FILE. Instead modify LocalSettings.php in the parent mwEmbd directory.
  *
  */
@@ -113,35 +113,35 @@
 	),
 );
 /***
- * External module config: 
+ * External module config:
  */
 $wgExternalPlayersSupportedTypes = array('YouTube');
 
 /*********************************************************
- * Default Kaltura Configuration: 
- * TODO move kaltura configuration to KalturaSupport module ( part of New ResourceLoader update ) 
+ * Default Kaltura Configuration:
+ * TODO move kaltura configuration to KalturaSupport module ( part of New ResourceLoader update )
  ********************************************************/
 
 //Embedded services
 //To enable service re routing for entryResult calls
 $wgEnableKalturaEmbedServicesRouting = true;
 
-// To include signed headers with user IPs for IP restriction lookups, input a salt string for 
-// $wgKalturaRemoteAddressSalt configuration option. 
+// To include signed headers with user IPs for IP restriction lookups, input a salt string for
+// $wgKalturaRemoteAddressSalt configuration option.
 $wgKalturaRemoteAddressSalt = false;
 
 // If we should check for onPage resources per the external resources plugin
 $wgKalturaEnableEmbedUiConfJs = false;
 
-// Enables the result cache while in debug mode 
-// This enables fast player rendering while scripts remain unminifed. 
+// Enables the result cache while in debug mode
+// This enables fast player rendering while scripts remain unminifed.
 // ( normally $wgEnableScriptDebug disables result cache )
 $wgKalturaForceResultCache = false;
 
 // For force ip testing geo restrictions
 $wgKalturaForceIP = false;
 
-// To test sites with referre restrictions: 
+// To test sites with referre restrictions:
 $wgKalturaForceReferer = false;
 
 // The default Kaltura service url:
@@ -151,7 +151,7 @@
 	$wgKalturaServiceUrl =  'https://cdnapisec.kaltura.com';
 }
 
-// Default Kaltura CDN url: 
+// Default Kaltura CDN url:
 $wgKalturaCDNUrl = 'http://cdnbakmi.kaltura.com';
 // if https use cdnsecakmi
 if( $wgHTTPProtocol == 'https' ){
@@ -173,14 +173,14 @@
 // Default CDN Asset Path
 $wgCDNAssetPath = $wgHTTPProtocol . '://' . $_SERVER['HTTP_HOST'];
 
-// Default api request timeout in seconds 
+// Default api request timeout in seconds
 $wgKalturaServiceTimeout = 20;
 
-// If the iframe will accept 3rd party domain remote service requests 
-// should be left "off" in production. 
+// If the iframe will accept 3rd party domain remote service requests
+// should be left "off" in production.
 $wgKalturaAllowIframeRemoteService = false;
 
-// Default expire time for ui conf api queries in seconds 
+// Default expire time for ui conf api queries in seconds
 $wgKalturaUiConfCacheTime = 60*10; // 10 min
 
 // Cache errors for 30 seconds to avoid overloading apaches in CDN setups
@@ -193,14 +193,14 @@
 
 $wgKalturaUseManifestUrls = true;
 
-// The admin secret should be set to an integration admin secret key for testing 
+// The admin secret should be set to an integration admin secret key for testing
 // api actions that require admin rights, like granting a ks for preview / play:
 $wgKalturaAdminSecret = null;
 
-// By default do allow custom resource includes. 
+// By default do allow custom resource includes.
 $wgAllowCustomResourceIncludes = true;
 
-// An array of partner ids for which apple adaptive should be disabled. 
+// An array of partner ids for which apple adaptive should be disabled.
 $wgKalturaPartnerDisableAppleAdaptive = array();
 
 // By default use apple adaptive if we have the ability
@@ -217,7 +217,7 @@
 // If google anlytics should be enabled, set to the ua string
 $wgKalturaGoogleAnalyticsUA = false;
 
-// for additional script includes. 
+// for additional script includes.
 $wgAdditionalDocsScriptInclude = false;
 
 //Remote web inspector URL such as: weinre, fireBug

modules/QnA/resources/css/qna-announcements.css

@@ -109,6 +109,7 @@
     position: absolute;
     top: 7px;
     right: 74px;
+    cursor: default;
 }
 
 .qnaInterface .controlBarBtn{
@@ -124,7 +125,7 @@
 
 .qnaInterface .controlBarBtn:hover {
     border-radius: 14px;
-    border: 4px solid #7fd9e8;
+    border: 3px solid #7fd9e8;
     background-color: #007b8e;
 }
 
@@ -133,13 +134,12 @@
     position: absolute;
     top: 7px;
     right: 14px;
-    z-index: 999999;
     cursor: pointer;
 }
 
 .qnaInterface .qnaSendButton:hover, .qnaInterface .qnaReplySendButton:hover{
-    top: 3px;
-    right: 10px;
+    top: 4px;
+    right: 11px;
 }
 
 .qnaInterface .qnaQuestionTextAreaTyping{

modules/QnA/resources/qna.tmpl.html

@@ -40,7 +40,7 @@
                 <div class="qna-no-messages-text" data-bind="text: getNoMessagesText()"></div>
             </div>
             <div data-bind='template: { foreach: myObservableArray(), as: "thread"}' class="qnaEntryList">
-                <div data-bind="if: entries()[0]().getType() === 'Announcement'">
+                <div data-bind="if: (entries()[0]().getType() === 'Announcement' && entries()[0]().cuePoint().metadata.State !== 'Deleted')">
                     <div class="qnaThread qnaAnnouncementThread"
                          data-bind='css: {  "qnaAnnouncement" : !isRead(), "qnaAnnouncementRead": isRead(), "qnaThreadLast":$index()===$parent.myObservableArray().length-1 },
                                     click: $parent.itemRead'>

modules/QnA/resources/qnaModule.js

@@ -187,7 +187,8 @@
                 var count = 0;
                 ko.utils.arrayForEach(_this.myObservableArray(), function (thread) {
                     for (var i = 0; i < thread().entries().length; i++) {
-                        if (thread().entries()[i]().getType() !== 'Question' && !thread().entries()[i]().isRead()) {
+                        var entry = thread().entries()[i]();
+                        if (entry.getType() !== 'Question' && !entry.isRead() && !(entry.getType() === 'Announcement' && entry.cuePoint().metadata.State === 'Deleted')) {
                             count++;
                         }
                     }

modules/QnA/resources/qnaService.js

@@ -249,6 +249,8 @@
             this.qnaPlugin = qnaPlugin;
             this.overrideModeratorName =  qnaPlugin.getConfig('overrideModeratorName') ? qnaPlugin.getConfig('overrideModeratorName') : false;
 
+            this.AddNotificationsDelayForQnaThreads();
+
             this.kPushServerNotification= mw.KPushServerNotification.getInstance(embedPlayer);
             if (embedPlayer.isLive()) {
                 //we first register to all notification before continue to get the existing cuepoints, so we don't get races and lost cue points
@@ -261,6 +263,19 @@
                 });
             }
         },
+        /**
+         * As we are getting *All* the qna cuePoints ever occurred, we will get old cuePoints and their delete update.
+         * The compromise was to set a delay on the observableArray *just on the start and then removing this delay instead of
+         * flickering announcement or changing the whole app to get a list of cuePoints.
+         */
+        AddNotificationsDelayForQnaThreads: function () {
+            var _this = this;
+
+            _this.QnaThreads.extend({ rateLimit: 500 });
+            setTimeout(function () {
+                _this.QnaThreads.extend({ rateLimit: 0 });
+            }, 500);
+        },
         getMetaDataProfile:function() {
             var _this=this;
 
@@ -612,7 +627,7 @@
                     });
                 });
 
-
+            // Register to Announcements (Public)
             var publicNotifications =  this.kPushServerNotification.createNotificationRequest(
                 _this.QandA_publicNotificationName,
                 {
@@ -622,7 +637,7 @@
                     _this.processQnA(cuePoints);
                 });
 
-
+            // Register to Questions (User Private)
             var userNotifications =  this.kPushServerNotification.createNotificationRequest(
                 _this.QandA_UserNotificationName,
                 {

modules/hotspots/readme.md

@@ -1,4 +1,4 @@
 # Hotspots sources
 Hotspots plugin is developed and maintained in repository [playkit-js-hotspots](https://github.com/kaltura/playkit-js-hotspots).
 
-This version was tagged in source repo as version [v0.5.1](https://github.com/kaltura/playkit-js-hotspots/releases/tag/v0.5.1)
+This version was tagged in source repo as version [v0.6.1](https://github.com/kaltura/playkit-js-hotspots/releases/tag/v0.6.1)