From 7683c156ff11e0bc6e95288c08851e428d65f800 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 27 Oct 2015 13:26:04 -0400 Subject: [PATCH] update db retrieval --- .../bower_components/eventie/.bower.json | 2 +- .../get-style-property/.bower.json | 2 +- .../bower_components/iron-meta/.bower.json | 6 +-- dashboard-ui/cordova/iap.js | 39 ++----------------- dashboard-ui/css/card.css | 23 +++-------- dashboard-ui/css/librarymenu.css | 27 ++++--------- dashboard-ui/css/nowplayingbar.css | 7 +--- dashboard-ui/devices/ie/ie.css | 6 +-- 8 files changed, 22 insertions(+), 90 deletions(-) diff --git a/dashboard-ui/bower_components/eventie/.bower.json b/dashboard-ui/bower_components/eventie/.bower.json index 6b5b662fd..917d217ea 100644 --- a/dashboard-ui/bower_components/eventie/.bower.json +++ b/dashboard-ui/bower_components/eventie/.bower.json @@ -30,6 +30,6 @@ "commit": "14d2ca3df97da64c820829a8310f9198fbafbcfa" }, "_source": "git://github.com/desandro/eventie.git", - "_target": "~1.0.3", + "_target": "^1", "_originalSource": "eventie" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/get-style-property/.bower.json b/dashboard-ui/bower_components/get-style-property/.bower.json index 973f1966c..d943fa3b0 100644 --- a/dashboard-ui/bower_components/get-style-property/.bower.json +++ b/dashboard-ui/bower_components/get-style-property/.bower.json @@ -31,6 +31,6 @@ "commit": "34fc5e4a0f252964ed2790138b8d7d30d04b55c1" }, "_source": "git://github.com/desandro/get-style-property.git", - "_target": "1.x", + "_target": "~1.0.4", "_originalSource": "get-style-property" } \ 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 edc14e80a..b126aed1c 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.1.0", "_resolution": { "type": "version", "tag": "v1.1.0", "commit": "be7ccf8df650aef1446a4e23af33f5d4e9f3000f" }, - "_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/cordova/iap.js b/dashboard-ui/cordova/iap.js index 5f3ebe329..bf653dc36 100644 --- a/dashboard-ui/cordova/iap.js +++ b/dashboard-ui/cordova/iap.js @@ -59,44 +59,12 @@ store.refresh(); } - var transactionIds = {}; - - function updateOriginalTransactionInfo(transactionId, originalTransactionId) { - - if (!transactionId) { - return; - } - if (!originalTransactionId) { - return; - } - if (transactionId == 'null') { - return; - } - if (originalTransactionId == 'null') { - return; - } - - transactionIds[transactionId] = originalTransactionId; - } - function validateProduct(product, callback) { // product attributes: // https://github.com/j3k0/cordova-plugin-purchase/blob/master/doc/api.md#validation-error-codes - if (!product.transaction) { - Logger.log('Transaction info missing. Failing validateProduct'); - return; - } - - if (!product.transaction.id) { - Logger.log('Transaction id missing. Failing validateProduct'); - return; - } - var productId = product.id; - var transactionId = product.transaction.id; - transactionId = transactionIds[transactionId] || transactionId; var receipt = product.transaction.appStoreReceipt; var price = product.price; @@ -107,12 +75,12 @@ type: "Subscription", feature: "MBSClubMonthly", storeToken: receipt, - amt: price, - storeId: transactionId + amt: price }; if (enteredEmail) { postData.email = enteredEmail; + postData.storeId = enteredEmail; } ApiClient.ajax({ @@ -229,8 +197,7 @@ getProductInfo: getProduct, beginPurchase: beginPurchase, restorePurchase: restorePurchase, - getSubscriptionOptions: getSubscriptionOptions, - updateOriginalTransactionInfo: updateOriginalTransactionInfo + getSubscriptionOptions: getSubscriptionOptions }; initializeStore(); diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index 513fc2c09..45a42174c 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -70,30 +70,17 @@ border-radius: 5px; } -.cardOverlayPlayButton { +.cardOverlayMoreButton, .cardOverlayPlayButton { position: absolute; bottom: 0; right: 0; color: #333; - width: 20px; - height: 20px; background-color: rgba(210,210,210,.9); border-radius: 500px; - padding: 6px; - margin: 0 .5em .5em 0; -} - -.cardOverlayMoreButton { - position: absolute; - bottom: 0; - right: 0; - color: #333; - width: 20px; - height: 20px; - background-color: rgba(210,210,210,.9); - border-radius: 500px; - padding: 6px; - margin: 0 .5em .5em 0; + margin: 0 .3em .3em 0; + padding: 5px; + width: 36px; + height: 36px; } .grayscale { diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 8e0df0c75..2435f0ad9 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -16,12 +16,6 @@ margin: .5em 0; } -.headerButton { - height: 50px; - line-height: 50px; - display: inline-block; -} - .headerUserImage { background-size: contain; background-repeat: no-repeat; @@ -93,25 +87,14 @@ } .headerButton { - margin: 0; + margin: 0 5px; background-color: transparent; - top: 0; - bottom: 0; vertical-align: middle; text-align: center; border: 0 !important; outline: none; - padding: 0 20px; cursor: pointer; -} - - .headerButton img { - height: 26px !important; - vertical-align: middle; - } - -.headerButtonLeft { - padding: 0 15px; + display: inline-block; } .menuArrow { @@ -123,7 +106,6 @@ .headerButtonRight { border-width: 0 !important; - padding: 0 15px; display: inline-block; } @@ -182,6 +164,9 @@ z-index: 999; top: 0; border: 0; + height: 50px; + display: flex; + align-items: center; } .hiddenViewMenuBar .viewMenuBar { @@ -262,6 +247,8 @@ top: 0; bottom: 0; right: 0; + display: flex; + align-items: center; } .selectedMediaFolder { diff --git a/dashboard-ui/css/nowplayingbar.css b/dashboard-ui/css/nowplayingbar.css index 8a5b3a2eb..2c84eef4d 100644 --- a/dashboard-ui/css/nowplayingbar.css +++ b/dashboard-ui/css/nowplayingbar.css @@ -17,8 +17,7 @@ } .mediaButton { - height: 40px; - width: 40px; + box-sizing: content-box !important; } .mediaButton.remoteControlButton, .mediaButton.muteButton, .mediaButton.unmuteButton { @@ -157,10 +156,6 @@ z-index: 2; } -.mediaButton img { - height: 24px; -} - .nowPlayingBarCurrentTime { vertical-align: middle; font-weight: normal; diff --git a/dashboard-ui/devices/ie/ie.css b/dashboard-ui/devices/ie/ie.css index 40de0f08f..8187de940 100644 --- a/dashboard-ui/devices/ie/ie.css +++ b/dashboard-ui/devices/ie/ie.css @@ -1,7 +1,3 @@ -paper-icon-button { - height: 24px; -} - -paper-fab.keyboard-focus.paper-fab-0 { +paper-fab.keyboard-focus.paper-fab-0 { background: #444; } \ No newline at end of file