merge from dev

MediaBrowser.WebDashboard/Api/DashboardService.cs

@@ -345,6 +345,9 @@ public async Task<object> Get(GetDashboardPackage request)
             DeleteFoldersByName(bowerPath, "grunt");
             DeleteFoldersByName(bowerPath, "rollups");
 
+            _fileSystem.DeleteDirectory(Path.Combine(bowerPath, "jquery", "external"), true);
+            _fileSystem.DeleteDirectory(Path.Combine(bowerPath, "jquery", "src"), true);
+
             DeleteCryptoFiles(Path.Combine(bowerPath, "cryptojslib", "components"));
 
             DeleteFoldersByName(Path.Combine(bowerPath, "jquery"), "src");

MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-apiclient/.bower.json

@@ -16,12 +16,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.0.21",
-  "_release": "1.0.21",
+  "version": "1.0.25",
+  "_release": "1.0.25",
   "_resolution": {
     "type": "version",
-    "tag": "1.0.21",
-    "commit": "e341b097c05c31ec012e04dfbd0455ae9dfc4929"
+    "tag": "1.0.25",
+    "commit": "f2e83b0e30527b5182ceb043d170ad7188368245"
   },
   "_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
   "_target": "~1.0.3",

MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js

@@ -1123,7 +1123,7 @@
             if (options.updateDateLastAccessed !== false) {
                 server.DateLastAccessed = new Date().getTime();
 
-                if (server.LastConnectionMode == ConnectionMode.Local) {
+                if (connectionMode == ConnectionMode.Local) {
                     server.DateLastLocalConnection = new Date().getTime();
                 }
             }
@@ -1466,6 +1466,17 @@
 
         self.getRegistrationInfo = function (feature, apiClient) {
 
+            if (isConnectUserSupporter()) {
+                return new Promise(function (resolve, reject) {
+
+                    resolve({
+                        Name: feature,
+                        IsRegistered: true,
+                        IsTrial: false
+                    });
+                });
+            }
+
             return self.getAvailableServers().then(function (servers) {
 
                 var matchedServers = servers.filter(function (s) {
@@ -1498,6 +1509,19 @@
             });
         };
 
+        function isConnectUserSupporter() {
+
+            if (self.isLoggedIntoConnect()) {
+
+                var connectUser = self.connectUser();
+
+                if (connectUser && connectUser.IsSupporter) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
         function updateDateLastLocalConnection(serverId) {
 
             var credentials = credentialProvider.credentials();

MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-apiclient/store.js

@@ -1,4 +1,4 @@
-(function (globalScope, localStorage, sessionStorage) {
+(function (globalScope) {
 
     function myStore(defaultObject) {
 
@@ -45,7 +45,7 @@
         };
     }
 
-    globalScope.appStorage = new myStore(localStorage);
-    globalScope.sessionStore = new myStore(sessionStorage);
+    globalScope.appStorage = new myStore(globalScope.localStorage);
+    globalScope.sessionStore = new myStore(globalScope.sessionStorage);
 
-})(window, window.localStorage, window.sessionStorage);
+})(this);

MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/visibleinviewport.js

@@ -0,0 +1,34 @@
+define([], function () {
+
+    /**
+   * Copyright 2012, Digital Fusion
+   * Licensed under the MIT license.
+   * http://teamdf.com/jquery-plugins/license/
+   *
+   * @author Sam Sehnert
+   * @desc A small plugin that checks whether elements are within
+   *       the user visible viewport of a web browser.
+   *       only accounts for vertical position, not horizontal.
+   */
+    function visibleInViewport(elem, partial, thresholdX, thresholdY) {
+
+        thresholdX = thresholdX || 0;
+        thresholdY = thresholdY || 0;
+
+        var vpWidth = window.innerWidth,
+            vpHeight = window.innerHeight;
+
+        // Use this native browser method, if available.
+        var rec = elem.getBoundingClientRect(),
+            tViz = rec.top >= 0 && rec.top < vpHeight + thresholdY,
+            bViz = rec.bottom > 0 && rec.bottom <= vpHeight + thresholdY,
+            lViz = rec.left >= 0 && rec.left < vpWidth + thresholdX,
+            rViz = rec.right > 0 && rec.right <= vpWidth + thresholdX,
+            vVisible = partial ? tViz || bViz : tViz && bViz,
+            hVisible = partial ? lViz || rViz : lViz && rViz;
+
+        return vVisible && hVisible;
+    }
+
+    return visibleInViewport;
+});

MediaBrowser.WebDashboard/dashboard-ui/bower_components/hls.js/.bower.json

@@ -1,6 +1,6 @@
 {
   "name": "hls.js",
-  "version": "0.3.15",
+  "version": "0.4.5",
   "description": "Media Source Extension - HLS library, by/for Dailymotion",
   "homepage": "https://github.com/dailymotion/hls.js",
   "authors": [
@@ -15,13 +15,14 @@
     "test",
     "tests"
   ],
-  "_release": "0.3.15",
+  "_release": "0.4.5",
   "_resolution": {
     "type": "version",
-    "tag": "v0.3.15",
-    "commit": "d3ecf55b89063d7ba3bd70800d5839755b0c7e63"
+    "tag": "v0.4.5",
+    "commit": "908ac4a44a182bdbede9c1830828983c18532ca0"
   },
   "_source": "git://github.com/dailymotion/hls.js.git",
-  "_target": "~0.3.11",
-  "_originalSource": "dailymotion/hls.js"
+  "_target": "~0.4.5",
+  "_originalSource": "dailymotion/hls.js",
+  "_direct": true
 }

MediaBrowser.WebDashboard/dashboard-ui/bower_components/hls.js/API.md

@@ -184,17 +184,21 @@ configuration parameters could be provided to hls.js upon instantiation of Hls O
       debug : false,
       autoStartLoad : true,
       maxBufferLength : 30,
+      maxMaxBufferLength : 600,
       maxBufferSize : 60*1000*1000,
       liveSyncDurationCount : 3,
       liveMaxLatencyDurationCount: 10,
       enableWorker : true,
       enableSoftwareAES: true,
-      fragLoadingTimeOut : 20000,
-      fragLoadingMaxRetry : 6,
-      fragLoadingRetryDelay : 500,
       manifestLoadingTimeOut : 10000,
       manifestLoadingMaxRetry : 6,
       manifestLoadingRetryDelay : 500,
+      levelLoadingTimeOut : 10000,
+      levelLoadingMaxRetry : 6,
+      levelLoadingRetryDelay : 500,
+      fragLoadingTimeOut : 20000,
+      fragLoadingMaxRetry : 6,
+      fragLoadingRetryDelay : 500,
       fpsDroppedMonitoringPeriod : 5000,
       fpsDroppedMonitoringThreshold : 0.2,
       appendErrorMaxRetry : 3,
@@ -209,6 +213,10 @@ configuration parameters could be provided to hls.js upon instantiation of Hls O
 var hls = new Hls(config);
 ```
 
+#### ```Hls.DefaultConfig get/set```
+this getter/setter allows to retrieve and override Hls default configuration.
+this configuration will be applied by default to all instances.
+
 #### ```debug```
 (default false)
 
@@ -225,10 +233,24 @@ a logger object could also be provided for custom logging : ```config.debug=cust
 (default 30s)
 
 maximum buffer Length in seconds. if buffer length is/become less than this value, a new fragment will be loaded.
+this is the guaranteed buffer length hls.js will try to reach, regardless of maxBufferSize.
+
 #### ```maxBufferSize```
 (default 60 MB)
 
-maximum buffer size in bytes. if buffer size upfront is bigger than this value, no fragment will be loaded.
+'minimum' maximum buffer size in bytes. if buffer size upfront is bigger than this value, no fragment will be loaded.
+
+#### ```maxMaxBufferLength```
+(default 600s)
+
+maximum buffer Length in seconds. hls.js will never exceed this value. even if maxBufferSize is not reached yet.
+
+hls.js tries to buffer up to a maximum number of bytes (60 MB by default) rather than to buffer up to a maximum nb of seconds.
+this is to mimic the browser behaviour (the buffer eviction algorithm is starting after the browser detects that video buffer size reaches a limit in bytes)
+
+config.maxBufferLength is the minimum guaranteed buffer length that hls.js will try to achieve, even if that value exceeds the amount of bytes 60 MB of memory.
+maxMaxBufferLength acts as a capping value, as if bitrate is really low, you could need more than one hour of buffer to fill 60 MB....
+
 
 #### ```liveSyncDurationCount```
 (default 3)
@@ -255,19 +277,19 @@ enable webworker (if available on browser) for TS demuxing/MP4 remuxing, to impr
 
 enable to use JavaScript version AES decryption for fallback of WebCrypto API.
 
-#### ```fragLoadingTimeOut```/```manifestLoadingTimeOut```
-(default 60000ms for fragment/10000ms for manifest)
+#### ```fragLoadingTimeOut```/```manifestLoadingTimeOut```/```levelLoadingTimeOut```
+(default 60000ms for fragment/10000ms for level and manifest)
 
 URL Loader timeout.
 A timeout callback will be triggered if loading duration exceeds this timeout.
 no further action will be done : the load operation will not be cancelled/aborted.
 It is up to the application to catch this event and treat it as needed.
-#### ```fragLoadingMaxRetry```/```manifestLoadingMaxRetry```
+#### ```fragLoadingMaxRetry```/```manifestLoadingMaxRetry```/```levelLoadingMaxRetry```
 (default 3)
 
 max nb of load retry
-#### ```fragLoadingRetryDelay```/```manifestLoadingRetryDelay```
-(default 500ms)
+#### ```fragLoadingRetryDelay```/```manifestLoadingRetryDelay```/```levelLoadingRetryDelay```
+(default 1000ms)
 
 initial delay between XmlHttpRequest error and first load retry (in ms)
 any I/O error will trigger retries every 500ms,1s,2s,4s,8s, ... capped to 64s (exponential backoff)
@@ -485,7 +507,7 @@ full list of Events available below :
   - `Hls.Events.FRAG_LOADING`  - fired when a fragment loading starts
     -  data: { frag : fragment object}
   - `Hls.Events.FRAG_LOAD_PROGRESS`  - fired when a fragment load is in progress
-    - data: { frag : fragment object, stats : progress event }
+    - data: { frag : fragment object with frag.loaded=stats.loaded, stats : { trequest, tfirst, loaded} }
   - `Hls.Events.FRAG_LOADED`  - fired when a fragment loading is completed
     -  data: { frag : fragment object, payload : fragment payload, stats : { trequest, tfirst, tload, length}}
   - `Hls.Events.FRAG_PARSING_INIT_SEGMENT` - fired when Init Segment has been extracted from fragment

MediaBrowser.WebDashboard/dashboard-ui/bower_components/hls.js/README.md

@@ -29,8 +29,7 @@ private demo accessible from Dailymotion network: [http://gdupontavice.dev.daily
 hls.js is (being) integrated in the following players:
 
  - [Clappr] (https://github.com/clappr/clappr), integrated since [0.2.14](https://github.com/clappr/clappr/releases)
- - [Flowplayer] (https://www.flowplayer.org)  through [flowplayer-hlsjs
-] (https://github.com/flowplayer/flowplayer-hlsjs)
+ - [Flowplayer] (https://www.flowplayer.org)  through [flowplayer-hlsjs] (https://github.com/flowplayer/flowplayer-hlsjs)
  - [Videojs] (http://videojs.com) through [Videojs-hlsjs] (https://github.com/benjipott/videojs-hlsjs)
 
  it might also be integrated in the following players if you push for it !
@@ -123,6 +122,7 @@ as of today, it is supported on:
   - `#EXT-X-DISCONTINUITY`
   - `#EXT-X-BYTERANGE`
   - `#EXT-X-KEY` (https://tools.ietf.org/html/draft-pantos-http-live-streaming-08#section-3.4.4)
+  - `#EXT-X-PROGRAM-DATE-TIME` (https://tools.ietf.org/html/draft-pantos-http-live-streaming-18#section-4.3.2.6)
 
 ## Getting Started
 

MediaBrowser.WebDashboard/dashboard-ui/bower_components/hls.js/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "hls.js",
-  "version": "0.3.15",
+  "version": "0.4.5",
   "description": "Media Source Extension - HLS library, by/for Dailymotion",
   "homepage": "https://github.com/dailymotion/hls.js",
   "authors": [