From 4b951f485f4f348e8276fbc75d1c329b5f530c46 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 10 Jul 2015 14:30:42 -0400 Subject: [PATCH] updated nuget --- .../bower_components/iron-meta/.bower.json | 6 ++-- .../bower_components/paper-styles/.bower.json | 4 +-- dashboard-ui/scripts/mediaplayer.js | 31 +++---------------- dashboard-ui/scripts/sections.js | 10 ++++-- 4 files changed, 16 insertions(+), 35 deletions(-) diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json index 9e650790be..8119ebcf41 100644 --- a/dashboard-ui/bower_components/iron-meta/.bower.json +++ b/dashboard-ui/bower_components/iron-meta/.bower.json @@ -25,14 +25,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-meta", + "homepage": "https://github.com/polymerelements/iron-meta", "_release": "1.0.3", "_resolution": { "type": "version", "tag": "v1.0.3", "commit": "91529259262b0d8f33fed44bc3fd47aedf35cb04" }, - "_source": "git://github.com/PolymerElements/iron-meta.git", + "_source": "git://github.com/polymerelements/iron-meta.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-meta" + "_originalSource": "polymerelements/iron-meta" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-styles/.bower.json b/dashboard-ui/bower_components/paper-styles/.bower.json index 32205aaa01..f16c89e87a 100644 --- a/dashboard-ui/bower_components/paper-styles/.bower.json +++ b/dashboard-ui/bower_components/paper-styles/.bower.json @@ -34,7 +34,7 @@ "tag": "v1.0.7", "commit": "c65f5ce6b898bb756fca35cedaa53c3e8011abeb" }, - "_source": "git://github.com/PolymerElements/paper-styles.git", + "_source": "git://github.com/polymerelements/paper-styles.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/paper-styles" + "_originalSource": "polymerelements/paper-styles" } \ No newline at end of file diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 3d053e7213..3969781f58 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -509,18 +509,7 @@ self.canPlayNativeHls = function () { - // Don't use HLS on android 4.x, regardless of what the browser reports - //if ($.browser.android) { - // var agent = navigator.userAgent.toLowerCase(); - - // for (var i = 0; i <= 4; i++) { - // if (agent.indexOf('android 4.' + i) != -1) { - // return false; - // } - // } - //} - - if ($.browser.android && AppInfo.isNativeApp) { + if (AppInfo.isNativeApp) { return true; } @@ -541,21 +530,9 @@ return true; } - if ($.browser.chrome) { - - // viblast can help us here - //return true; - return window.MediaSource != null; - } - - if ($.browser.msie) { - - // viblast can help us here - //return true; - return window.MediaSource != null; - } - - return false; + // viblast can help us here + //return true; + return window.MediaSource != null; }; self.changeStream = function (ticks, params) { diff --git a/dashboard-ui/scripts/sections.js b/dashboard-ui/scripts/sections.js index 0f899161ed..f12cd24edd 100644 --- a/dashboard-ui/scripts/sections.js +++ b/dashboard-ui/scripts/sections.js @@ -327,10 +327,14 @@ $('a', elem).on('click', function () { - var card = $(this).parents('.card'); - var textElem = $('.cardText', card); + var card = this; - var text = textElem.html(); + if (!this.classList.contains('card')) { + card = $(this).parents('.card')[0]; + } + + var textElem = $('.cardText', card); + var text = textElem.text(); LibraryMenu.setTitle(text); });