merge from dev

dashboard-ui/bower_components/emby-webcomponents/.bower.json

@@ -15,12 +15,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.0.14",
-  "_release": "1.0.14",
+  "version": "1.0.16",
+  "_release": "1.0.16",
   "_resolution": {
     "type": "version",
-    "tag": "1.0.14",
-    "commit": "a7a8baf260ab509c5f9b1750cbf6fe921883141c"
+    "tag": "1.0.16",
+    "commit": "8058a1a93ad995fd3b7f56019719c33654698df6"
   },
   "_source": "git://github.com/MediaBrowser/emby-webcomponents.git",
   "_target": "~1.0.0",

dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js

@@ -103,12 +103,23 @@
 
         profile.DirectPlayProfiles = [];
 
+        var videoAudioCodecs = [];
+        if (canPlayMp3) {
+            videoAudioCodecs.push('mp3');
+        }
+        if (canPlayAac) {
+            videoAudioCodecs.push('aac');
+        }
+        if (canPlayAc3) {
+            videoAudioCodecs.push('ac3');
+        }
+
         if (supportedFormats.indexOf('h264') != -1) {
             profile.DirectPlayProfiles.push({
                 Container: 'mp4,m4v',
                 Type: 'Video',
                 VideoCodec: 'h264',
-                AudioCodec: 'aac' + (canPlayMp3 ? ',mp3' : '') + (canPlayAc3 ? ',ac3' : '')
+                AudioCodec: videoAudioCodecs.join(',')
             });
         }
 
@@ -117,7 +128,7 @@
                 Container: 'mkv,mov',
                 Type: 'Video',
                 VideoCodec: 'h264',
-                AudioCodec: 'aac' + (canPlayMp3 ? ',mp3' : '') + (canPlayAc3 ? ',ac3' : '')
+                AudioCodec: videoAudioCodecs.join(',')
             });
         }
 
@@ -268,24 +279,6 @@
             ]
         });
 
-        profile.CodecProfiles.push({
-            Type: 'VideoAudio',
-            Codec: 'aac,mp3',
-            Conditions: [
-                {
-                    Condition: 'LessThanEqual',
-                    Property: 'AudioChannels',
-                    Value: videoAudioChannels
-                },
-                {
-                    Condition: 'Equals',
-                    Property: 'IsSecondaryAudio',
-                    Value: 'false',
-                    IsRequired: 'false'
-                }
-            ]
-        });
-
         profile.CodecProfiles.push({
             Type: 'VideoAudio',
             Conditions: [

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;
+});