From 5bec78f61fd9c6e0abb8ccc1f8ec1c35da07a0c2 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 2 Jul 2014 14:34:08 -0400 Subject: [PATCH] update to jquery mobile 1.4.3 --- dashboard-ui/css/mediaplayer-video.css | 9 ++- dashboard-ui/encodingsettings.html | 8 +-- dashboard-ui/scripts/encodingsettings.js | 3 - dashboard-ui/scripts/extensions.js | 16 +++-- dashboard-ui/scripts/librarybrowser.js | 18 +++++- dashboard-ui/scripts/librarymenu.js | 8 +-- dashboard-ui/scripts/logpage.js | 11 ---- dashboard-ui/scripts/mediaplayer-video.js | 57 ++++++++++++------ dashboard-ui/scripts/mediaplayer.js | 8 ++- dashboard-ui/scripts/notificationsetting.js | 18 +++--- dashboard-ui/scripts/playlist.js | 14 ++--- dashboard-ui/scripts/site.js | 2 - .../jquery.mobile-1.4.2.min.js | 10 --- .../images/ajax-loader.gif | Bin .../images/icons-png/action-black.png | Bin .../images/icons-png/action-white.png | Bin .../images/icons-png/alert-black.png | Bin .../images/icons-png/alert-white.png | Bin .../images/icons-png/arrow-d-black.png | Bin .../images/icons-png/arrow-d-l-black.png | Bin .../images/icons-png/arrow-d-l-white.png | Bin .../images/icons-png/arrow-d-r-black.png | Bin .../images/icons-png/arrow-d-r-white.png | Bin .../images/icons-png/arrow-d-white.png | Bin .../images/icons-png/arrow-l-black.png | Bin .../images/icons-png/arrow-l-white.png | Bin .../images/icons-png/arrow-r-black.png | Bin .../images/icons-png/arrow-r-white.png | Bin .../images/icons-png/arrow-u-black.png | Bin .../images/icons-png/arrow-u-l-black.png | Bin .../images/icons-png/arrow-u-l-white.png | Bin .../images/icons-png/arrow-u-r-black.png | Bin .../images/icons-png/arrow-u-r-white.png | Bin .../images/icons-png/arrow-u-white.png | Bin .../images/icons-png/audio-black.png | Bin .../images/icons-png/audio-white.png | Bin .../images/icons-png/back-black.png | Bin .../images/icons-png/back-white.png | Bin .../images/icons-png/bars-black.png | Bin .../images/icons-png/bars-white.png | Bin .../images/icons-png/bullets-black.png | Bin .../images/icons-png/bullets-white.png | Bin .../images/icons-png/calendar-black.png | Bin .../images/icons-png/calendar-white.png | Bin .../images/icons-png/camera-black.png | Bin .../images/icons-png/camera-white.png | Bin .../images/icons-png/carat-d-black.png | Bin .../images/icons-png/carat-d-white.png | Bin .../images/icons-png/carat-l-black.png | Bin .../images/icons-png/carat-l-white.png | Bin .../images/icons-png/carat-r-black.png | Bin .../images/icons-png/carat-r-white.png | Bin .../images/icons-png/carat-u-black.png | Bin .../images/icons-png/carat-u-white.png | Bin .../images/icons-png/check-black.png | Bin .../images/icons-png/check-white.png | Bin .../images/icons-png/clock-black.png | Bin .../images/icons-png/clock-white.png | Bin .../images/icons-png/cloud-black.png | Bin .../images/icons-png/cloud-white.png | Bin .../images/icons-png/comment-black.png | Bin .../images/icons-png/comment-white.png | Bin .../images/icons-png/delete-black.png | Bin .../images/icons-png/delete-white.png | Bin .../images/icons-png/edit-black.png | Bin .../images/icons-png/edit-white.png | Bin .../images/icons-png/eye-black.png | Bin .../images/icons-png/eye-white.png | Bin .../images/icons-png/forbidden-black.png | Bin .../images/icons-png/forbidden-white.png | Bin .../images/icons-png/forward-black.png | Bin .../images/icons-png/forward-white.png | Bin .../images/icons-png/gear-black.png | Bin .../images/icons-png/gear-white.png | Bin .../images/icons-png/grid-black.png | Bin .../images/icons-png/grid-white.png | Bin .../images/icons-png/heart-black.png | Bin .../images/icons-png/heart-white.png | Bin .../images/icons-png/home-black.png | Bin .../images/icons-png/home-white.png | Bin .../images/icons-png/info-black.png | Bin .../images/icons-png/info-white.png | Bin .../images/icons-png/location-black.png | Bin .../images/icons-png/location-white.png | Bin .../images/icons-png/lock-black.png | Bin .../images/icons-png/lock-white.png | Bin .../images/icons-png/mail-black.png | Bin .../images/icons-png/mail-white.png | Bin .../images/icons-png/minus-black.png | Bin .../images/icons-png/minus-white.png | Bin .../images/icons-png/navigation-black.png | Bin .../images/icons-png/navigation-white.png | Bin .../images/icons-png/phone-black.png | Bin .../images/icons-png/phone-white.png | Bin .../images/icons-png/plus-black.png | Bin .../images/icons-png/plus-white.png | Bin .../images/icons-png/power-black.png | Bin .../images/icons-png/power-white.png | Bin .../images/icons-png/recycle-black.png | Bin .../images/icons-png/recycle-white.png | Bin .../images/icons-png/refresh-black.png | Bin .../images/icons-png/refresh-white.png | Bin .../images/icons-png/search-black.png | Bin .../images/icons-png/search-white.png | Bin .../images/icons-png/shop-black.png | Bin .../images/icons-png/shop-white.png | Bin .../images/icons-png/star-black.png | Bin .../images/icons-png/star-white.png | Bin .../images/icons-png/tag-black.png | Bin .../images/icons-png/tag-white.png | Bin .../images/icons-png/user-black.png | Bin .../images/icons-png/user-white.png | Bin .../images/icons-png/video-black.png | Bin .../images/icons-png/video-white.png | Bin .../images/icons-svg/action-black.svg | 0 .../images/icons-svg/action-white.svg | 0 .../images/icons-svg/alert-black.svg | 0 .../images/icons-svg/alert-white.svg | 0 .../images/icons-svg/arrow-d-black.svg | 0 .../images/icons-svg/arrow-d-l-black.svg | 0 .../images/icons-svg/arrow-d-l-white.svg | 0 .../images/icons-svg/arrow-d-r-black.svg | 0 .../images/icons-svg/arrow-d-r-white.svg | 0 .../images/icons-svg/arrow-d-white.svg | 0 .../images/icons-svg/arrow-l-black.svg | 0 .../images/icons-svg/arrow-l-white.svg | 0 .../images/icons-svg/arrow-r-black.svg | 0 .../images/icons-svg/arrow-r-white.svg | 0 .../images/icons-svg/arrow-u-black.svg | 0 .../images/icons-svg/arrow-u-l-black.svg | 0 .../images/icons-svg/arrow-u-l-white.svg | 0 .../images/icons-svg/arrow-u-r-black.svg | 0 .../images/icons-svg/arrow-u-r-white.svg | 0 .../images/icons-svg/arrow-u-white.svg | 0 .../images/icons-svg/audio-black.svg | 0 .../images/icons-svg/audio-white.svg | 0 .../images/icons-svg/back-black.svg | 0 .../images/icons-svg/back-white.svg | 0 .../images/icons-svg/bars-black.svg | 0 .../images/icons-svg/bars-white.svg | 0 .../images/icons-svg/bullets-black.svg | 0 .../images/icons-svg/bullets-white.svg | 0 .../images/icons-svg/calendar-black.svg | 0 .../images/icons-svg/calendar-white.svg | 0 .../images/icons-svg/camera-black.svg | 0 .../images/icons-svg/camera-white.svg | 0 .../images/icons-svg/carat-d-black.svg | 0 .../images/icons-svg/carat-d-white.svg | 0 .../images/icons-svg/carat-l-black.svg | 0 .../images/icons-svg/carat-l-white.svg | 0 .../images/icons-svg/carat-r-black.svg | 0 .../images/icons-svg/carat-r-white.svg | 0 .../images/icons-svg/carat-u-black.svg | 0 .../images/icons-svg/carat-u-white.svg | 0 .../images/icons-svg/check-black.svg | 0 .../images/icons-svg/check-white.svg | 0 .../images/icons-svg/clock-black.svg | 0 .../images/icons-svg/clock-white.svg | 0 .../images/icons-svg/cloud-black.svg | 0 .../images/icons-svg/cloud-white.svg | 0 .../images/icons-svg/comment-black.svg | 0 .../images/icons-svg/comment-white.svg | 0 .../images/icons-svg/delete-black.svg | 0 .../images/icons-svg/delete-white.svg | 0 .../images/icons-svg/edit-black.svg | 0 .../images/icons-svg/edit-white.svg | 0 .../images/icons-svg/eye-black.svg | 0 .../images/icons-svg/eye-white.svg | 0 .../images/icons-svg/forbidden-black.svg | 0 .../images/icons-svg/forbidden-white.svg | 0 .../images/icons-svg/forward-black.svg | 0 .../images/icons-svg/forward-white.svg | 0 .../images/icons-svg/gear-black.svg | 0 .../images/icons-svg/gear-white.svg | 0 .../images/icons-svg/grid-black.svg | 0 .../images/icons-svg/grid-white.svg | 0 .../images/icons-svg/heart-black.svg | 0 .../images/icons-svg/heart-white.svg | 0 .../images/icons-svg/home-black.svg | 0 .../images/icons-svg/home-white.svg | 0 .../images/icons-svg/info-black.svg | 0 .../images/icons-svg/info-white.svg | 0 .../images/icons-svg/location-black.svg | 0 .../images/icons-svg/location-white.svg | 0 .../images/icons-svg/lock-black.svg | 0 .../images/icons-svg/lock-white.svg | 0 .../images/icons-svg/mail-black.svg | 0 .../images/icons-svg/mail-white.svg | 0 .../images/icons-svg/minus-black.svg | 0 .../images/icons-svg/minus-white.svg | 0 .../images/icons-svg/navigation-black.svg | 0 .../images/icons-svg/navigation-white.svg | 0 .../images/icons-svg/phone-black.svg | 0 .../images/icons-svg/phone-white.svg | 0 .../images/icons-svg/plus-black.svg | 0 .../images/icons-svg/plus-white.svg | 0 .../images/icons-svg/power-black.svg | 0 .../images/icons-svg/power-white.svg | 0 .../images/icons-svg/recycle-black.svg | 0 .../images/icons-svg/recycle-white.svg | 0 .../images/icons-svg/refresh-black.svg | 0 .../images/icons-svg/refresh-white.svg | 0 .../images/icons-svg/search-black.svg | 0 .../images/icons-svg/search-white.svg | 0 .../images/icons-svg/shop-black.svg | 0 .../images/icons-svg/shop-white.svg | 0 .../images/icons-svg/star-black.svg | 0 .../images/icons-svg/star-white.svg | 0 .../images/icons-svg/tag-black.svg | 0 .../images/icons-svg/tag-white.svg | 0 .../images/icons-svg/user-black.svg | 0 .../images/icons-svg/user-white.svg | 0 .../images/icons-svg/video-black.svg | 0 .../images/icons-svg/video-white.svg | 0 .../jquery.mobile-1.4.3.min.css} | 4 +- .../jquery.mobile-1.4.3.min.js | 10 +++ .../jquery.mobile-1.4.3.min.map | 1 + .../thirdparty/mediabrowser.apiclient.js | 8 +-- 218 files changed, 116 insertions(+), 89 deletions(-) delete mode 100644 dashboard-ui/thirdparty/jquerymobile-1.4.2/jquery.mobile-1.4.2.min.js rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/ajax-loader.gif (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/action-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/action-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/alert-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/alert-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/arrow-d-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/arrow-d-l-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/arrow-d-l-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/arrow-d-r-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/arrow-d-r-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/arrow-d-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/arrow-l-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/arrow-l-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/arrow-r-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/arrow-r-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/arrow-u-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/arrow-u-l-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/arrow-u-l-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/arrow-u-r-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/arrow-u-r-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/arrow-u-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/audio-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/audio-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/back-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/back-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/bars-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/bars-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/bullets-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/bullets-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/calendar-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/calendar-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/camera-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/camera-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/carat-d-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/carat-d-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/carat-l-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/carat-l-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/carat-r-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/carat-r-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/carat-u-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/carat-u-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/check-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/check-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/clock-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/clock-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/cloud-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/cloud-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/comment-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/comment-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/delete-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/delete-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/edit-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/edit-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/eye-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/eye-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/forbidden-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/forbidden-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/forward-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/forward-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/gear-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/gear-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/grid-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/grid-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/heart-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/heart-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/home-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/home-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/info-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/info-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/location-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/location-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/lock-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/lock-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/mail-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/mail-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/minus-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/minus-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/navigation-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/navigation-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/phone-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/phone-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/plus-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/plus-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/power-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/power-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/recycle-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/recycle-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/refresh-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/refresh-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/search-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/search-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/shop-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/shop-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/star-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/star-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/tag-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/tag-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/user-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/user-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/video-black.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-png/video-white.png (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/action-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/action-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/alert-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/alert-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/arrow-d-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/arrow-d-l-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/arrow-d-l-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/arrow-d-r-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/arrow-d-r-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/arrow-d-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/arrow-l-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/arrow-l-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/arrow-r-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/arrow-r-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/arrow-u-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/arrow-u-l-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/arrow-u-l-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/arrow-u-r-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/arrow-u-r-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/arrow-u-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/audio-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/audio-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/back-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/back-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/bars-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/bars-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/bullets-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/bullets-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/calendar-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/calendar-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/camera-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/camera-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/carat-d-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/carat-d-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/carat-l-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/carat-l-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/carat-r-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/carat-r-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/carat-u-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/carat-u-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/check-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/check-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/clock-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/clock-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/cloud-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/cloud-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/comment-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/comment-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/delete-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/delete-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/edit-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/edit-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/eye-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/eye-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/forbidden-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/forbidden-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/forward-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/forward-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/gear-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/gear-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/grid-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/grid-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/heart-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/heart-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/home-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/home-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/info-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/info-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/location-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/location-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/lock-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/lock-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/mail-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/mail-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/minus-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/minus-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/navigation-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/navigation-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/phone-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/phone-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/plus-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/plus-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/power-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/power-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/recycle-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/recycle-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/refresh-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/refresh-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/search-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/search-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/shop-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/shop-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/star-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/star-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/tag-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/tag-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/user-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/user-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/video-black.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2 => jquerymobile-1.4.3}/images/icons-svg/video-white.svg (100%) rename dashboard-ui/thirdparty/{jquerymobile-1.4.2/jquery.mobile-1.4.2.min.css => jquerymobile-1.4.3/jquery.mobile-1.4.3.min.css} (62%) create mode 100644 dashboard-ui/thirdparty/jquerymobile-1.4.3/jquery.mobile-1.4.3.min.js create mode 100644 dashboard-ui/thirdparty/jquerymobile-1.4.3/jquery.mobile-1.4.3.min.map diff --git a/dashboard-ui/css/mediaplayer-video.css b/dashboard-ui/css/mediaplayer-video.css index 3cf00055b7..639278b001 100644 --- a/dashboard-ui/css/mediaplayer-video.css +++ b/dashboard-ui/css/mediaplayer-video.css @@ -24,6 +24,9 @@ background-color: #000; width: 100%; height: auto; + + /* Without this the buttons displayed over the video surface will not be clickable in safari. */ + -webkit-transform-style: preserve-3d } .videoControls { @@ -107,7 +110,7 @@ ***************************************/ #videoPlayer, -#videoPlayer .itemVideo { +.itemVideo { position: fixed !important; top: 0 !important; bottom: 0 !important; @@ -121,6 +124,10 @@ max-height: 100%; } +/* Hack for safari because it doesn't allow clickable content over the video surface. */ +.itemVideo { (;top: 60px!important;); } +.itemVideo { [;top: 60px!important;]; } + #mediaPlayer .ui-slider-track, .nowPlayingBar .ui-slider-track, .nowPlayingPage .ui-slider-track { border-color: #2ad !important; height: 2px!important; diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html index 0b50ae0f6d..626dfcebc8 100644 --- a/dashboard-ui/encodingsettings.html +++ b/dashboard-ui/encodingsettings.html @@ -1,4 +1,5 @@ - + + ${TitleAdvanced} @@ -46,11 +47,6 @@
${LabelDownMixAudioScaleHelp}
-
  • - - -
    ${OptionUpscalingHelp}
    -
  • diff --git a/dashboard-ui/scripts/encodingsettings.js b/dashboard-ui/scripts/encodingsettings.js index 9550606c71..ae2afc8c74 100644 --- a/dashboard-ui/scripts/encodingsettings.js +++ b/dashboard-ui/scripts/encodingsettings.js @@ -10,8 +10,6 @@ }).checkboxradio('refresh'); - $('#chkAllowUpscaling', page).checked(config.AllowVideoUpscaling).checkboxradio("refresh"); - $('#txtDownMixAudioBoost', page).val(config.DownMixAudioBoost); Dashboard.hideLoadingMsg(); @@ -40,7 +38,6 @@ ApiClient.getServerConfiguration().done(function (config) { - config.AllowVideoUpscaling = $('#chkAllowUpscaling', form).checked(); config.EnableDebugEncodingLogging = $('#chkEnableDebugEncodingLogging', form).checked(); config.MediaEncodingQuality = $('.radioEncodingQuality:checked', form).val(); config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val(); diff --git a/dashboard-ui/scripts/extensions.js b/dashboard-ui/scripts/extensions.js index b367344ea9..e3cc999f97 100644 --- a/dashboard-ui/scripts/extensions.js +++ b/dashboard-ui/scripts/extensions.js @@ -1,4 +1,4 @@ -function IsStorageEnabled() { +function IsStorageEnabled(skipRetry) { if (!window.localStorage) { return false; @@ -6,9 +6,15 @@ try { window.localStorage.setItem("__test", "data"); } catch (err) { - if ((err.name).toUpperCase() == 'QUOTA_EXCEEDED_ERR') { - return false; + + if (!skipRetry) { + if ((err.name).toUpperCase().indexOf('EXCEEDED') != -1) { + window.localStorage.clear(); + return IsStorageEnabled(true); + } } + + return false; } return true; } @@ -110,7 +116,7 @@ var WebNotifications = { }); } } - + else if (window.webkitNotifications) { if (!webkitNotifications.checkPermission()) { var notif = webkitNotifications.createNotification(data.icon, data.title, data.body); @@ -279,7 +285,7 @@ function replaceQueryString(url, param, value) { if (url.match(re)) return url.replace(re, '$1' + param + "=" + value + '$2'); else { - + if (url.indexOf('?') == -1) { return url + '?' + param + "=" + value; } diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 9d067222a7..a1fd2ac051 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -49,12 +49,20 @@ values.SortOrder = query.SortOrder; } - localStorage.setItem(key + '_' + Dashboard.getCurrentUserId(), JSON.stringify(values)); + try { + localStorage.setItem(key + '_' + Dashboard.getCurrentUserId(), JSON.stringify(values)); + } catch (e) { + + } }, saveViewSetting: function (key, value) { - localStorage.setItem(key + '_' + Dashboard.getCurrentUserId() + '_view', value); + try { + localStorage.setItem(key + '_' + Dashboard.getCurrentUserId() + '_view', value); + } catch (e) { + + } }, getSavedViewSetting: function (key) { @@ -1276,7 +1284,11 @@ getPagingHtml: function (query, totalRecordCount, updatePageSizeSetting, pageSizes, showLimit) { if (query.Limit && updatePageSizeSetting !== false) { - localStorage.setItem('pagesize_', query.Limit); + try { + localStorage.setItem('pagesize_', query.Limit); + } catch (e) { + + } } var html = ''; diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 2108eeea67..c277f9e4db 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -73,9 +73,9 @@ html += ''; return html; @@ -170,7 +170,7 @@ html += '
    '; - html += 'Home'; + html += '' + Globalize.translate('ButtonHome') + ''; html += '
    '; html += getViewsHtml(); diff --git a/dashboard-ui/scripts/logpage.js b/dashboard-ui/scripts/logpage.js index e9e5819322..38ffbe05e8 100644 --- a/dashboard-ui/scripts/logpage.js +++ b/dashboard-ui/scripts/logpage.js @@ -12,15 +12,6 @@ LogPage.startInterval(); - var autoScroll = localStorage.getItem("autoScrollLogPage"); - - if (autoScroll == "true") { - LogPage.updateAutoScroll(true); - } - else if (autoScroll == "false") { - LogPage.updateAutoScroll(false); - } - ApiClient.getSystemInfo().done(function(systemInfo) { $('#logPath', page).html(systemInfo.LogPath); @@ -86,8 +77,6 @@ $('#chkAutoScrollBottom', page).checked(value).checkboxradio('refresh'); $('#chkAutoScroll', page).checked(value).checkboxradio('refresh'); - - localStorage.setItem("autoScrollLogPage", value.toString()); } }; diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js index db6f255abe..3cfc332c93 100644 --- a/dashboard-ui/scripts/mediaplayer-video.js +++ b/dashboard-ui/scripts/mediaplayer-video.js @@ -85,40 +85,60 @@ return document.fullscreen || document.mozFullScreen || document.webkitIsFullScreen || document.msFullscreenElement ? true : false; }; + function onFlyoutClose() { + $('.itemVideo').css('visibility', 'visible'); + } + + function onPopupOpen(elem) { + elem.popup("open").parents(".ui-popup-container").css("margin-top", 30); + + if ($.browser.safari) { + $('.itemVideo').css('visibility', 'hidden'); + } + } + self.showSubtitleMenu = function () { var elem = $('.videoSubtitlePopup').html(getSubtitleTracksHtml()) .trigger('create') - .popup("option", "positionTo", $('.videoSubtitleButton')); + .popup("option", "positionTo", $('.videoSubtitleButton')) + .off('popupafterclose', onFlyoutClose) + .on('popupafterclose', onFlyoutClose); - elem.popup("open").parents(".ui-popup-container").css("margin-top", 30); + onPopupOpen(elem); }; self.showQualityFlyout = function () { var elem = $('.videoQualityPopup').html(getQualityFlyoutHtml()) .trigger('create') - .popup("option", "positionTo", $('.videoQualityButton')); + .popup("option", "positionTo", $('.videoQualityButton')) + .off('popupafterclose', onFlyoutClose) + .on('popupafterclose', onFlyoutClose); - elem.popup("open").parents(".ui-popup-container").css("margin-top", 30); + onPopupOpen(elem); }; self.showChaptersFlyout = function () { var elem = $('.videoChaptersPopup').html(getChaptersFlyoutHtml()) .trigger('create') - .popup("option", "positionTo", $('.videoChaptersButton')); + .popup("option", "positionTo", $('.videoChaptersButton')) + .off('popupafterclose', onFlyoutClose) + .on('popupafterclose', onFlyoutClose); - elem.popup("open").parents(".ui-popup-container").css("margin-top", 30); + onPopupOpen(elem); }; self.showAudioTracksFlyout = function () { var elem = $('.videoAudioPopup').html(getAudioTracksHtml()) .trigger('create') - .popup("option", "positionTo", $('.videoAudioButton')); + .popup("option", "positionTo", $('.videoAudioButton')) + .off('popupafterclose', onFlyoutClose) + .on('popupafterclose', onFlyoutClose); - elem.popup("open").parents(".ui-popup-container").css("margin-top", 30); + onPopupOpen(elem); }; self.setAudioStreamIndex = function (index) { @@ -512,7 +532,7 @@ var html = ''; html += '
    '; - html += '