From ec67431a0ebcc749a7c9e5508d42179b2c056cd6 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 7 Sep 2015 21:00:46 -0400 Subject: [PATCH] update live tv segments --- .../iron-behaviors/.bower.json | 6 +- .../bower_components/iron-meta/.bower.json | 6 +- .../paper-behaviors/.bower.json | 4 +- dashboard-ui/cordova/android/vlcplayer.js | 1 + dashboard-ui/scripts/librarybrowser.js | 35 ++- dashboard-ui/scripts/librarymenu.js | 76 +++-- dashboard-ui/scripts/site.js | 10 + dashboard-ui/themes/android.css | 4 +- dashboard-ui/themes/ios.css | 6 + dashboard-ui/thirdparty/browser.js | 2 + .../jquerymobile-1.4.5/jqm.popup.js | 6 +- .../jquery.mobile.custom.js | 261 +----------------- .../thirdparty/paper-button-style.css | 41 +-- 13 files changed, 118 insertions(+), 340 deletions(-) diff --git a/dashboard-ui/bower_components/iron-behaviors/.bower.json b/dashboard-ui/bower_components/iron-behaviors/.bower.json index f499351883..5d7b926afb 100644 --- a/dashboard-ui/bower_components/iron-behaviors/.bower.json +++ b/dashboard-ui/bower_components/iron-behaviors/.bower.json @@ -27,14 +27,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-behaviors", + "homepage": "https://github.com/polymerelements/iron-behaviors", "_release": "1.0.8", "_resolution": { "type": "version", "tag": "v1.0.8", "commit": "663ad706b43989f4961d945b8116cf4db346532f" }, - "_source": "git://github.com/PolymerElements/iron-behaviors.git", + "_source": "git://github.com/polymerelements/iron-behaviors.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-behaviors" + "_originalSource": "polymerelements/iron-behaviors" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json index 8119ebcf41..9e650790be 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-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json index 321be71437..26486f6c6d 100644 --- a/dashboard-ui/bower_components/paper-behaviors/.bower.json +++ b/dashboard-ui/bower_components/paper-behaviors/.bower.json @@ -42,7 +42,7 @@ "tag": "v1.0.3", "commit": "90b54de14264c19693601b9fc16af6b68a9d48e4" }, - "_source": "git://github.com/polymerelements/paper-behaviors.git", + "_source": "git://github.com/PolymerElements/paper-behaviors.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/paper-behaviors" + "_originalSource": "PolymerElements/paper-behaviors" } \ No newline at end of file diff --git a/dashboard-ui/cordova/android/vlcplayer.js b/dashboard-ui/cordova/android/vlcplayer.js index 27bc95fdc9..0c728891b3 100644 --- a/dashboard-ui/cordova/android/vlcplayer.js +++ b/dashboard-ui/cordova/android/vlcplayer.js @@ -140,6 +140,7 @@ if (tIndex != -1) { startPosMs = val.substring(tIndex + 3); startPosMs = parseFloat(startPosMs) * 1000; + val = val.split('#')[0]; } if (options.type == 'audio') { diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index bf19ba190e..829fcf82b9 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -123,8 +123,25 @@ elem.classList.add('hasrefreshtime'); }, + enableFullPaperTabs: function () { + return AppInfo.isNativeApp; + }, + animatePaperTabs: function () { - return !$.browser.safari; + + if (!LibraryBrowser.enableFullPaperTabs()) { + return false; + } + + if ($.browser.safari) { + return false; + } + + if (typeof ($.browser.androidVersion) == 'number' && !isNaN($.browser.androidVersion)) { + return $.browser.androidVersion >= 5; + } + + return true; }, configureSwipeTabs: function (ownerpage, tabs, pages) { @@ -174,8 +191,10 @@ if (allowSwipe(e)) { var selected = parseInt(pages.selected || '0'); if (selected < (pageCount - 1)) { - pages.entryAnimation = 'slide-from-right-animation'; - pages.exitAnimation = 'slide-left-animation'; + if (LibraryBrowser.animatePaperTabs()) { + pages.entryAnimation = 'slide-from-right-animation'; + pages.exitAnimation = 'slide-left-animation'; + } tabs.selectNext(); } } @@ -185,8 +204,10 @@ if (allowSwipe(e)) { var selected = parseInt(pages.selected || '0'); if (selected > 0) { - pages.entryAnimation = 'slide-from-left-animation'; - pages.exitAnimation = 'slide-right-animation'; + if (LibraryBrowser.animatePaperTabs()) { + pages.entryAnimation = 'slide-from-left-animation'; + pages.exitAnimation = 'slide-right-animation'; + } tabs.selectPrevious(); } } @@ -194,10 +215,6 @@ }); }, - enableFullPaperTabs: function () { - return AppInfo.isNativeApp; - }, - navigateOnLibraryTabSelect: function () { return !LibraryBrowser.enableFullPaperTabs(); }, diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 0dc61791f0..d507988033 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -2,7 +2,7 @@ function renderHeader() { - var html = '
'; + var html = ''; var backIcon = $.browser.safari ? 'chevron-left' : 'arrow-back'; @@ -38,9 +38,13 @@ html += '
'; - html += ''; + var viewMenuBar = document.createElement('div'); + viewMenuBar.classList.add('viewMenuBar'); + viewMenuBar.classList.add('ui-bar-b'); + viewMenuBar.innerHTML = html; + + document.body.appendChild(viewMenuBar); - $(document.body).append(html); ImageLoader.lazyChildren(document.querySelector('.viewMenuBar')); Events.trigger(document, 'headercreated'); @@ -114,17 +118,24 @@ function bindMenuEvents() { - if (AppInfo.isTouchPreferred) { + var mainDrawerButton = document.querySelector('.mainDrawerButton'); - $('.mainDrawerButton').on('click', openMainDrawer); + if (mainDrawerButton) { + if (AppInfo.isTouchPreferred) { - } else { - $('.mainDrawerButton').createHoverTouch().on('hovertouch', openMainDrawer); + Events.on(mainDrawerButton, 'click', openMainDrawer); + + } else { + $(mainDrawerButton).createHoverTouch().on('hovertouch', openMainDrawer); + } } - $('.headerBackButton').on('click', onBackClick); + var headerBackButton = document.querySelector('.headerBackButton'); + if (headerBackButton) { + Events.on(headerBackButton, 'click', onBackClick); + } - var viewMenuBar = document.getElementsByClassName("viewMenuBar")[0]; + var viewMenuBar = document.querySelector(".viewMenuBar"); initHeadRoom(viewMenuBar); } @@ -780,7 +791,7 @@ } } - $(document).on('pagebeforeshow', ".page", function () { + pageClassOn('pagebeforeshow', 'page', function () { var page = this; @@ -788,18 +799,23 @@ onPageBeforeShowDocumentReady(page); - }).on('pageshowready', ".page", function () { + }); + + pageClassOn('pageshowready', 'page', function () { var page = this; onPageShowDocumentReady(page); - }).on('pagebeforehide', ".page", function () { + }); + + pageClassOn('pagebeforehide', 'page', function () { var headroomEnabled = document.querySelectorAll('.headroomEnabled'); for (var i = 0, length = headroomEnabled.length; i < length; i++) { headroomEnabled[i].classList.add('headroomDisabled'); } + }); function onPageBeforeShowDocumentReady(page) { @@ -852,10 +868,10 @@ } else { - $('.libraryViewNav', page).each(function () { - - initHeadRoom(this); - }); + var navs = page.querySelectorAll('.libraryViewNav'); + for (var i = 0, length = navs.length; i < length; i++) { + initHeadRoom(navs[i]); + } } } else if (page.classList.contains('type-interior')) { @@ -906,35 +922,13 @@ backButton.classList.add('hide'); } } - - //Events.off(page, 'swiperight', onPageSwipeLeft); - - if (canGoBack) { - //Events.on(page, 'swiperight', onPageSwipeLeft); - } - } - - function onPageSwipeLeft(e) { - - var target = e.target; - - if (!target.classList.contains('hiddenScrollX') && !$(target).parents('.hiddenScrollX').length) { - history.back(); - } } function onPageShowDocumentReady(page) { if (!NavHelper.isBack()) { - var elems = page.querySelectorAll('.libraryViewNav .ui-btn-active'); - elems = $(elems).filter(':visible'); - - if (elems.length) { - elems[0].scrollIntoView(); - - // Scroll back up so in case vertical scroll was messed with - window.scrollTo(0, 0); - } + // Scroll back up so in case vertical scroll was messed with + window.scrollTo(0, 0); } } @@ -1059,7 +1053,7 @@ $.fn.createHoverTouch = function () { var backUrl; - $(document).on('pagebeforeshow', ".page", function () { + pageClassOn('pagebeforeshow', "page", function () { if (getWindowUrl() != backUrl) { backUrl = null; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 4acf1394fc..13d679fffe 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1551,6 +1551,16 @@ var Dashboard = { } } + if (typeof ($.browser.androidVersion) == 'number' && !isNaN($.browser.androidVersion)) { + if ($.browser.androidVersion < 5) { + quality -= 10; + + if ($.browser.androidVersion < 4.4) { + quality -= 10; + } + } + } + return quality; }, diff --git a/dashboard-ui/themes/android.css b/dashboard-ui/themes/android.css index d0bc40a84e..c4b4ee6204 100644 --- a/dashboard-ui/themes/android.css +++ b/dashboard-ui/themes/android.css @@ -1,5 +1,5 @@ .viewMenuBar, .libraryViewNav:not(.paperLibraryViewNav), paper-tabs { - background-color: #1b1b1b; + background-color: #1d1d1d; } .viewMenuBar.semiTransparent { @@ -7,7 +7,7 @@ } .background-theme-b { - background-color: #242424; + background-color: #2d2d2d; } .backdropContainer .pageBackground { diff --git a/dashboard-ui/themes/ios.css b/dashboard-ui/themes/ios.css index b8fff7197f..98caff29ea 100644 --- a/dashboard-ui/themes/ios.css +++ b/dashboard-ui/themes/ios.css @@ -32,10 +32,12 @@ .libraryViewNav paper-tabs { height: 58px !important; + flex-grow: 0 !important; } .libraryViewNav paper-tab { height: auto !important; + flex-grow: 0 !important; } .libraryViewNav iron-icon { @@ -53,6 +55,10 @@ background-color: transparent !important; } + .libraryViewNav #tabsContainer { + flex-grow: 0 !important; + } + @media all and (max-width: 600px) { .libraryViewNav a { diff --git a/dashboard-ui/thirdparty/browser.js b/dashboard-ui/thirdparty/browser.js index 41ee12f6e3..cda788ce6c 100644 --- a/dashboard-ui/thirdparty/browser.js +++ b/dashboard-ui/thirdparty/browser.js @@ -961,6 +961,8 @@ browser.tv = true; } + browser.androidVersion = md.version('Android'); + if (browser.ipad || browser.iphone) { if (userAgent.toLowerCase().indexOf('cpu os 9') != -1) { browser.iOSVersion = 9; diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.js b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.js index 0de3b9bd19..801056b352 100644 --- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.js +++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.js @@ -613,8 +613,7 @@ }, _openPrerequisitesComplete: function () { - var id = this.element.attr("id"), - firstFocus = this._ui.container.find(":focusable").first(); + var id = this.element.attr("id"); this._ui.container.addClass("ui-popup-active"); this._isOpen = true; @@ -624,9 +623,6 @@ if (!$.contains(this._ui.container[0], this.document[0].activeElement)) { this._safelyBlur(this.document[0].activeElement); } - if (firstFocus.length > 0) { - this._ui.focusElement = firstFocus; - } this._ignoreResizeEvents(); if (id) { this.document.find("[aria-haspopup='true'][aria-owns='" + id + "']").attr("aria-expanded", true); diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js index bbd8d82bd6..aeec989906 100644 --- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js +++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js @@ -2767,236 +2767,6 @@ $.widget( "mobile.page", { })( jQuery ); - - -(function( $, window, undefined ) { - - // TODO remove direct references to $.mobile and properties, we should - // favor injection with params to the constructor - $.mobile.Transition = function() { - this.init.apply( this, arguments ); - }; - - $.extend($.mobile.Transition.prototype, { - toPreClass: " ui-page-pre-in", - - init: function( name, reverse, $to, $from ) { - $.extend(this, { - name: name, - reverse: reverse, - $to: $to, - $from: $from, - deferred: new $.Deferred() - }); - }, - - cleanFrom: function() { - this.$from - .removeClass( $.mobile.activePageClass + " out in reverse " + this.name ) - .height( "" ); - }, - - // NOTE overridden by child object prototypes, noop'd here as defaults - beforeDoneIn: function() {}, - beforeDoneOut: function() {}, - beforeStartOut: function() {}, - - doneIn: function() { - this.beforeDoneIn(); - - this.$to.removeClass( "out in reverse " + this.name ).height( "" ); - - this.toggleViewportClass(); - - // In some browsers (iOS5), 3D transitions block the ability to scroll to the desired location during transition - // This ensures we jump to that spot after the fact, if we aren't there already. - if ( $.mobile.window.scrollTop() !== this.toScroll ) { - this.scrollPage(); - } - if ( !this.sequential ) { - this.$to.addClass( $.mobile.activePageClass ); - } - this.deferred.resolve( this.name, this.reverse, this.$to, this.$from, true ); - }, - - doneOut: function( screenHeight, reverseClass, none, preventFocus ) { - this.beforeDoneOut(); - this.startIn( screenHeight, reverseClass, none, preventFocus ); - }, - - hideIn: function( callback ) { - // Prevent flickering in phonegap container: see comments at #4024 regarding iOS - this.$to.css( "z-index", -10 ); - callback.call( this ); - this.$to.css( "z-index", "" ); - }, - - scrollPage: function() { - - //if we are hiding the url bar or the page was previously scrolled scroll to hide or return to position - if ( $.mobile.hideUrlBar || this.toScroll !== $.mobile.defaultHomeScroll ) { - window.scrollTo( 0, this.toScroll ); - } - }, - - startIn: function( screenHeight, reverseClass, none, preventFocus ) { - this.hideIn(function() { - this.$to.addClass( $.mobile.activePageClass + this.toPreClass ); - - // Send focus to page as it is now display: block - if ( !preventFocus ) { - $.mobile.focusPage( this.$to ); - } - - // Set to page height - this.$to.height( screenHeight + this.toScroll ); - - if ( !none ) { - this.scrollPage(); - } - }); - - this.$to - .removeClass( this.toPreClass ) - .addClass( this.name + " in " + reverseClass ); - - if ( !none ) { - this.$to.animationComplete( $.proxy(function() { - this.doneIn(); - }, this )); - } else { - this.doneIn(); - } - - }, - - startOut: function( screenHeight, reverseClass, none ) { - this.beforeStartOut( screenHeight, reverseClass, none ); - - // Set the from page's height and start it transitioning out - // Note: setting an explicit height helps eliminate tiling in the transitions - this.$from - .height( screenHeight + $.mobile.window.scrollTop() ) - .addClass( this.name + " out" + reverseClass ); - }, - - toggleViewportClass: function() { - $.mobile.pageContainer.toggleClass( "ui-mobile-viewport-transitioning viewport-" + this.name ); - }, - - transition: function() { - // NOTE many of these could be calculated/recorded in the constructor, it's my - // opinion that binding them as late as possible has value with regards to - // better transitions with fewer bugs. Ie, it's not guaranteed that the - // object will be created and transition will be run immediately after as - // it is today. So we wait until transition is invoked to gather the following - var none, - reverseClass = this.reverse ? " reverse" : "", - screenHeight = $.mobile.getScreenHeight(), - maxTransitionOverride = $.mobile.maxTransitionWidth !== false && - $.mobile.window.width() > $.mobile.maxTransitionWidth; - - this.toScroll = $.mobile.navigate.history.getActive().lastScroll || $.mobile.defaultHomeScroll; - - none = !$.support.cssTransitions || !$.support.cssAnimations || - maxTransitionOverride || !this.name || this.name === "none" || - Math.max( $.mobile.window.scrollTop(), this.toScroll ) > - $.mobile.getMaxScrollForTransition(); - - this.toggleViewportClass(); - - if ( this.$from && !none ) { - this.startOut( screenHeight, reverseClass, none ); - } else { - this.doneOut( screenHeight, reverseClass, none, true ); - } - - return this.deferred.promise(); - } - }); -})( jQuery, this ); - - -(function( $ ) { - - $.mobile.SerialTransition = function() { - this.init.apply(this, arguments); - }; - - $.extend($.mobile.SerialTransition.prototype, $.mobile.Transition.prototype, { - sequential: true, - - beforeDoneOut: function() { - if ( this.$from ) { - this.cleanFrom(); - } - }, - - beforeStartOut: function( screenHeight, reverseClass, none ) { - this.$from.animationComplete($.proxy(function() { - this.doneOut( screenHeight, reverseClass, none ); - }, this )); - } - }); - -})( jQuery ); - - -(function( $ ) { - - $.mobile.ConcurrentTransition = function() { - this.init.apply(this, arguments); - }; - - $.extend($.mobile.ConcurrentTransition.prototype, $.mobile.Transition.prototype, { - sequential: false, - - beforeDoneIn: function() { - if ( this.$from ) { - this.cleanFrom(); - } - }, - - beforeStartOut: function( screenHeight, reverseClass, none ) { - this.doneOut( screenHeight, reverseClass, none ); - } - }); - -})( jQuery ); - - -(function( $ ) { - - // generate the handlers from the above - var defaultGetMaxScrollForTransition = function() { - return $.mobile.getScreenHeight() * 3; - }; - - //transition handler dictionary for 3rd party transitions - $.mobile.transitionHandlers = { - "sequential": $.mobile.SerialTransition, - "simultaneous": $.mobile.ConcurrentTransition - }; - - // Make our transition handler the public default. - $.mobile.defaultTransitionHandler = $.mobile.transitionHandlers.sequential; - - $.mobile.transitionFallbacks = {}; - - // If transition is defined, check if css 3D transforms are supported, and if not, if a fallback is specified - $.mobile._maybeDegradeTransition = function( transition ) { - if ( transition && !$.support.cssTransform3d && $.mobile.transitionFallbacks[ transition ] ) { - transition = $.mobile.transitionFallbacks[ transition ]; - } - - return transition; - }; - - // Set the getMaxScrollForTransition to default if no implementation was set by user - $.mobile.getMaxScrollForTransition = $.mobile.getMaxScrollForTransition || defaultGetMaxScrollForTransition; - -})( jQuery ); - (function( $, undefined ) { var pageCache = {}; @@ -3788,8 +3558,7 @@ $.widget( "mobile.page", { active, activeIsInitialPage, historyDir, pageTitle, isDialog, alreadyThere, newPageTitle, - params, cssTransitionDeferred, - beforeTransition; + params; triggerData.prevPage = settings.fromPage; @@ -3830,8 +3599,7 @@ $.widget( "mobile.page", { // the developer that turns on the allowSamePageTransitiona option to // either turn off transition animations, or make sure that an appropriate // animation transition is used. - if ( fromPage && fromPage[0] === toPage[0] && - !settings.allowSamePageTransition ) { + if ( fromPage && fromPage[0] === toPage[0] ) { this._triggerWithDeprecated( "transition", triggerData ); this._triggerWithDeprecated( "change", triggerData ); @@ -3908,9 +3676,6 @@ $.widget( "mobile.page", { toPage.jqmData( "title", pageTitle ); } - // Make sure we have a transition defined. - settings.transition = "none"; - //add page to history stack if it's not back or forward if ( !historyDir && alreadyThere ) { $.mobile.navigate.history.getActive().pageUrl = pageUrl; @@ -3927,7 +3692,6 @@ $.widget( "mobile.page", { // TODO the property names here are just silly params = { - transition: settings.transition, title: pageTitle, pageUrl: pageUrl, role: settings.role @@ -3973,10 +3737,6 @@ $.widget( "mobile.page", { // the following deferred is resolved in the init file $.mobile.navreadyDeferred = $.Deferred(); - //these variables make all page containers use the same queue and only navigate one at a time - // queue to hold simultanious page transitions - var pageTransitionQueue = []; - })( jQuery ); (function( $, undefined ) { @@ -4043,11 +3803,6 @@ $.widget( "mobile.page", { $.mobile.focusPage = function ( page ) { }; - // No-op implementation of transition degradation - $.mobile._maybeDegradeTransition = $.mobile._maybeDegradeTransition || function( transition ) { - return transition; - }; - // Exposed $.mobile methods $.mobile.changePage = function( to, options ) { @@ -4055,7 +3810,6 @@ $.widget( "mobile.page", { }; $.mobile.changePage.defaults = { - transition: undefined, reverse: false, changeHash: true, fromHashChange: false, @@ -4064,8 +3818,7 @@ $.widget( "mobile.page", { pageContainer: undefined, showLoadMsg: true, //loading message shows by default when pages are being fetched during changePage dataUrl: undefined, - fromPage: undefined, - allowSamePageTransition: false + fromPage: undefined }; function parentWithTag(elem, tagName) { @@ -4095,7 +3848,7 @@ $.widget( "mobile.page", { baseUrl, href, useDefaultUrlHandling, isExternal, - transition, reverse, role; + reverse, role; // If there is no link associated with the click or its not a left // click we want to ignore the click @@ -4163,7 +3916,6 @@ $.widget( "mobile.page", { } //use ajax - transition = $link.jqmData( "transition" ); reverse = $link.jqmData( "direction" ) === "reverse" || // deprecated - remove by 1.0 $link.jqmData( "back" ); @@ -4171,7 +3923,7 @@ $.widget( "mobile.page", { //this may need to be more specific as we use data-rel more role = link.getAttribute("data-" + $.mobile.ns + "rel") || undefined; - $.mobile.changePage( href, { transition: transition, reverse: reverse, role: role, link: $link } ); + $.mobile.changePage( href, { reverse: reverse, role: role, link: $link } ); event.preventDefault(); }); @@ -4244,7 +3996,7 @@ $.widget( "mobile.page", { initializePage: function() { // find present pages var path = $.mobile.path, - $pages = $("div[data-role='page']"), + $pages = $(document.querySelectorAll("div[data-role='page']")), hash = path.stripHash( path.stripQueryParams(path.parseLocation().hash) ), theLocation = $.mobile.path.parseLocation(), hashPage = hash ? document.getElementById( hash ) : undefined; @@ -4290,7 +4042,6 @@ $.widget( "mobile.page", { } $.mobile.changePage( $.mobile.firstPage, { - transition: "none", reverse: true, changeHash: false, fromHashChange: true diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css index a10b350670..87bac1059c 100644 --- a/dashboard-ui/thirdparty/paper-button-style.css +++ b/dashboard-ui/thirdparty/paper-button-style.css @@ -281,20 +281,20 @@ paper-fab { vertical-align: middle; } -paper-fab.mini { - width: 22px; - height: 22px; -} - -paper-fab.subdued { - background: #484848; - color: #fff; -} - - paper-fab.subdued paper-material.keyboard-focus { - background: #686868 !important; + paper-fab.mini { + width: 22px; + height: 22px; } + paper-fab.subdued { + background: #484848; + color: #fff; + } + + paper-fab.subdued paper-material.keyboard-focus { + background: #686868 !important; + } + .ui-page-theme-b paper-fab[disabled].subdued { background: #222; } @@ -348,12 +348,13 @@ paper-menu-item { -webkit-flex: none; flex: none; flex-shrink: 0; + flex-grow: 1; } .libraryViewNav paper-tabs { flex: none; flex-shrink: 0; - flex-grow: 0; + flex-grow: 1; overflow-x: visible !important; } @@ -361,20 +362,20 @@ paper-menu-item { display: inline-block !important; flex: none; flex-shrink: 0; - flex-grow: 0; + flex-grow: 1; } .ui-page-theme-b paper-item-body [secondary] { color: #aaa; } - .ui-page-theme-b paper-checkbox paper-ripple { - color: #fff !important; - } +.ui-page-theme-b paper-checkbox paper-ripple { + color: #fff !important; +} - .ui-page-theme-b paper-checkbox #checkboxLabel.paper-checkbox { - color: inherit; - } +.ui-page-theme-b paper-checkbox #checkboxLabel.paper-checkbox { + color: inherit; +} .ui-page-theme-b .paperCheckboxFieldDescription { color: #ccc;