diff --git a/dashboard-ui/bower_components/doc-ready/.bower.json b/dashboard-ui/bower_components/doc-ready/.bower.json index adda4287b..d4d75eca6 100644 --- a/dashboard-ui/bower_components/doc-ready/.bower.json +++ b/dashboard-ui/bower_components/doc-ready/.bower.json @@ -39,6 +39,6 @@ "commit": "cec8e49744a1e18b14a711eea77e201bb70de544" }, "_source": "git://github.com/desandro/doc-ready.git", - "_target": "1.0.x", + "_target": "~1.0.4", "_originalSource": "doc-ready" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-drawer-panel/.bower.json b/dashboard-ui/bower_components/paper-drawer-panel/.bower.json index 86d20878f..8d510d3d7 100644 --- a/dashboard-ui/bower_components/paper-drawer-panel/.bower.json +++ b/dashboard-ui/bower_components/paper-drawer-panel/.bower.json @@ -1,6 +1,6 @@ { "name": "paper-drawer-panel", - "version": "1.0.3", + "version": "1.0.4", "description": "A responsive drawer panel", "authors": [ "The Polymer Authors" @@ -19,22 +19,25 @@ "license": "http://polymer.github.io/LICENSE.txt", "homepage": "https://github.com/PolymerElements/paper-drawer-panel", "dependencies": { - "polymer": "Polymer/polymer#^1.0.0", + "iron-media-query": "PolymerElements/iron-media-query#^1.0.0", + "iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^1.0.0", "iron-selector": "PolymerElements/iron-selector#^1.0.0", - "iron-media-query": "PolymerElements/iron-media-query#^1.0.0" + "polymer": "Polymer/polymer#^1.1.0" }, "devDependencies": { "iron-component-page": "PolymerElements/iron-component-page#^1.0.0", "paper-button": "PolymerElements/paper-button#^1.0.0", "paper-styles": "PolymerElements/paper-styles#^1.0.0", + "test-fixture": "PolymerElements/test-fixture#^1.0.0", "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "_release": "1.0.3", + "main": "paper-drawer-panel.html", + "_release": "1.0.4", "_resolution": { "type": "version", - "tag": "v1.0.3", - "commit": "92713b61eb8eec378db63af61b73341453b8180d" + "tag": "v1.0.4", + "commit": "9d4a4c737d8e2e5d23baee39128625e476f2b051" }, "_source": "git://github.com/PolymerElements/paper-drawer-panel.git", "_target": "~1.0.2", diff --git a/dashboard-ui/bower_components/paper-drawer-panel/bower.json b/dashboard-ui/bower_components/paper-drawer-panel/bower.json index 76a2f0c6e..dbfded02c 100644 --- a/dashboard-ui/bower_components/paper-drawer-panel/bower.json +++ b/dashboard-ui/bower_components/paper-drawer-panel/bower.json @@ -1,6 +1,6 @@ { "name": "paper-drawer-panel", - "version": "1.0.3", + "version": "1.0.4", "description": "A responsive drawer panel", "authors": [ "The Polymer Authors" @@ -19,15 +19,18 @@ "license": "http://polymer.github.io/LICENSE.txt", "homepage": "https://github.com/PolymerElements/paper-drawer-panel", "dependencies": { - "polymer": "Polymer/polymer#^1.0.0", + "iron-media-query": "PolymerElements/iron-media-query#^1.0.0", + "iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^1.0.0", "iron-selector": "PolymerElements/iron-selector#^1.0.0", - "iron-media-query": "PolymerElements/iron-media-query#^1.0.0" + "polymer": "Polymer/polymer#^1.1.0" }, "devDependencies": { "iron-component-page": "PolymerElements/iron-component-page#^1.0.0", "paper-button": "PolymerElements/paper-button#^1.0.0", "paper-styles": "PolymerElements/paper-styles#^1.0.0", + "test-fixture": "PolymerElements/test-fixture#^1.0.0", "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" - } + }, + "main": "paper-drawer-panel.html" } diff --git a/dashboard-ui/bower_components/paper-drawer-panel/paper-drawer-panel.css b/dashboard-ui/bower_components/paper-drawer-panel/paper-drawer-panel.css deleted file mode 100644 index 747f0bb77..000000000 --- a/dashboard-ui/bower_components/paper-drawer-panel/paper-drawer-panel.css +++ /dev/null @@ -1,152 +0,0 @@ -/** -@license -Copyright (c) 2015 The Polymer Project Authors. All rights reserved. -This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt -The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt -The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt -Code distributed by Google as part of the polymer project is also -subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt -*/ - -:host { - display: block; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - overflow: hidden; -} - -iron-selector > #drawer { - position: absolute; - top: 0; - left: 0; - height: 100%; - background-color: white; - - -moz-box-sizing: border-box; - box-sizing: border-box; - - @apply(--paper-drawer-panel-drawer-container); -} - -.transition > #drawer { - transition: -webkit-transform ease-in-out 0.3s, width ease-in-out 0.3s, visibility 0.3s; - transition: transform ease-in-out 0.3s, width ease-in-out 0.3s, visibility 0.3s; -} - -.left-drawer > #drawer { - @apply(--paper-drawer-panel-left-drawer-container); -} - -.right-drawer > #drawer { - left: auto; - right: 0; - - @apply(--paper-drawer-panel-right-drawer-container); -} - -iron-selector > #main { - position: absolute; - top: 0; - right: 0; - bottom: 0; - - @apply(--paper-drawer-panel-main-container); -} - -.transition > #main { - transition: left ease-in-out 0.3s, padding ease-in-out 0.3s; -} - -.right-drawer > #main { - left: 0; -} - -.right-drawer.transition > #main { - transition: right ease-in-out 0.3s, padding ease-in-out 0.3s; -} - -#main > ::content > [main] { - height: 100%; -} - -#drawer > ::content > [drawer] { - height: 100%; -} - -#scrim { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - visibility: hidden; - opacity: 0; - transition: opacity ease-in-out 0.38s, visibility ease-in-out 0.38s; - background-color: rgba(0, 0, 0, 0.3); -} - -.narrow-layout > #drawer { - will-change: transform; -} - -.narrow-layout > #drawer.iron-selected { - box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.15); -} - -.right-drawer.narrow-layout > #drawer.iron-selected { - box-shadow: -2px 2px 4px rgba(0, 0, 0, 0.15); -} - -.narrow-layout > #drawer > ::content > [drawer] { - border: 0; -} - -.left-drawer.narrow-layout > #drawer:not(.iron-selected) { - -webkit-transform: translateX(-100%); - transform: translateX(-100%); -} - -.right-drawer.narrow-layout > #drawer:not(.iron-selected) { - left: auto; - visibility: hidden; - - -webkit-transform: translateX(100%); - transform: translateX(100%); -} - -.right-drawer.narrow-layout.dragging > #drawer:not(.iron-selected), -.right-drawer.narrow-layout.peeking > #drawer:not(.iron-selected) { - visibility: visible; -} - -.narrow-layout > #main { - padding: 0; -} - -.right-drawer.narrow-layout > #main { - left: 0; - right: 0; -} - -.narrow-layout > #main:not(.iron-selected) > #scrim, -.dragging > #main > #scrim { - visibility: visible; - opacity: var(--paper-drawer-panel-scrim-opacity, 1); -} - -.narrow-layout > #main > * { - margin: 0; - min-height: 100%; - left: 0; - right: 0; - - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] { - display: none; -} \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-drawer-panel/paper-drawer-panel.html b/dashboard-ui/bower_components/paper-drawer-panel/paper-drawer-panel.html index 4fa6ab424..2ca5616de 100644 --- a/dashboard-ui/bower_components/paper-drawer-panel/paper-drawer-panel.html +++ b/dashboard-ui/bower_components/paper-drawer-panel/paper-drawer-panel.html @@ -10,8 +10,11 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN + - - - + + }); + }()); + + diff --git a/dashboard-ui/bower_components/paper-drawer-panel/test/index.html b/dashboard-ui/bower_components/paper-drawer-panel/test/index.html new file mode 100644 index 000000000..1090a4113 --- /dev/null +++ b/dashboard-ui/bower_components/paper-drawer-panel/test/index.html @@ -0,0 +1,26 @@ + + + + + + + paper-drawer-panel tests + + + + + + diff --git a/dashboard-ui/bower_components/paper-drawer-panel/test/positioning.html b/dashboard-ui/bower_components/paper-drawer-panel/test/positioning.html new file mode 100644 index 000000000..64f0ada87 --- /dev/null +++ b/dashboard-ui/bower_components/paper-drawer-panel/test/positioning.html @@ -0,0 +1,96 @@ + + + + + + paper-drawer-panel tests + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dashboard-ui/bower_components/paper-drawer-panel/test/small-devices.html b/dashboard-ui/bower_components/paper-drawer-panel/test/small-devices.html new file mode 100644 index 000000000..adaae88a7 --- /dev/null +++ b/dashboard-ui/bower_components/paper-drawer-panel/test/small-devices.html @@ -0,0 +1,141 @@ + + + + + + paper-drawer-panel tests + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dashboard-ui/bower_components/paper-tabs/.bower.json b/dashboard-ui/bower_components/paper-tabs/.bower.json index 3e05e2b96..d311764c8 100644 --- a/dashboard-ui/bower_components/paper-tabs/.bower.json +++ b/dashboard-ui/bower_components/paper-tabs/.bower.json @@ -1,6 +1,6 @@ { "name": "paper-tabs", - "version": "1.0.4", + "version": "1.0.5", "license": "http://polymer.github.io/LICENSE.txt", "description": "Material design tabs", "private": true, @@ -39,11 +39,11 @@ "web-component-tester": "*" }, "homepage": "https://github.com/PolymerElements/paper-tabs", - "_release": "1.0.4", + "_release": "1.0.5", "_resolution": { "type": "version", - "tag": "v1.0.4", - "commit": "b07b594cc08e7c97cda7e9b30b0bdd6c8969226c" + "tag": "v1.0.5", + "commit": "5c47302763d9cbb5fbbbf777a49b3ccc5f5a16bf" }, "_source": "git://github.com/PolymerElements/paper-tabs.git", "_target": "~1.0.0", diff --git a/dashboard-ui/bower_components/paper-tabs/CONTRIBUTING.md b/dashboard-ui/bower_components/paper-tabs/CONTRIBUTING.md new file mode 100644 index 000000000..7b1014156 --- /dev/null +++ b/dashboard-ui/bower_components/paper-tabs/CONTRIBUTING.md @@ -0,0 +1,72 @@ + + +# Polymer Elements +## Guide for Contributors + +Polymer Elements are built in the open, and the Polymer authors eagerly encourage any and all forms of community contribution. When contributing, please follow these guidelines: + +### Filing Issues + +**If you are filing an issue to request a feature**, please provide a clear description of the feature. It can be helpful to describe answers to the following questions: + + 1. **Who will use the feature?** _“As someone filling out a form…”_ + 2. **When will they use the feature?** _“When I enter an invalid value…”_ + 3. **What is the user’s goal?** _“I want to be visually notified that the value needs to be corrected…”_ + +**If you are filing an issue to report a bug**, please provide: + + 1. **A clear description of the bug and related expectations.** Consider using the following example template for reporting a bug: + + ```markdown + The `paper-foo` element causes the page to turn pink when clicked. + + ## Expected outcome + + The page stays the same color. + + ## Actual outcome + + The page turns pink. + + ## Steps to reproduce + + 1. Put a `paper-foo` element in the page. + 2. Open the page in a web browser. + 3. Click the `paper-foo` element. + ``` + + 2. **A reduced test case that demonstrates the problem.** If possible, please include the test case as a JSBin. Start with this template to easily import and use relevant Polymer Elements: [http://jsbin.com/cagaye](http://jsbin.com/cagaye/edit?html,output). + + 3. **A list of browsers where the problem occurs.** This can be skipped if the problem is the same across all browsers. + +### Submitting Pull Requests + +**Before creating a pull request**, please ensure that an issue exists for the corresponding change in the pull request that you intend to make. **If an issue does not exist, please create one per the guidelines above**. The goal is to discuss the design and necessity of the proposed change with Polymer authors and community before diving into a pull request. + +When submitting pull requests, please provide: + + 1. **A reference to the corresponding issue** or issues that will be closed by the pull request. Please refer to these issues using the following syntax: + + ```markdown + (For a single issue) + Fixes #20 + + (For multiple issues) + Fixes #32, #40 + ``` + + 2. **A succinct description of the design** used to fix any related issues. For example: + + ```markdown + This fixes #20 by removing styles that leaked which would cause the page to turn pink whenever `paper-foo` is clicked. + ``` + + 3. **At least one test for each bug fixed or feature added** as part of the pull request. Pull requests that fix bugs or add features without accompanying tests will not be considered. + +If a proposed change contains multiple commits, please [squash commits](https://www.google.com/url?q=http://blog.steveklabnik.com/posts/2012-11-08-how-to-squash-commits-in-a-github-pull-request) to as few as is necessary to succinctly express the change. A Polymer author can help you squash commits, so don’t be afraid to ask us if you need help with that! diff --git a/dashboard-ui/bower_components/paper-tabs/bower.json b/dashboard-ui/bower_components/paper-tabs/bower.json index d533fa1bb..2f3076a00 100644 --- a/dashboard-ui/bower_components/paper-tabs/bower.json +++ b/dashboard-ui/bower_components/paper-tabs/bower.json @@ -1,6 +1,6 @@ { "name": "paper-tabs", - "version": "1.0.4", + "version": "1.0.5", "license": "http://polymer.github.io/LICENSE.txt", "description": "Material design tabs", "private": true, diff --git a/dashboard-ui/bower_components/paper-tabs/paper-tabs.html b/dashboard-ui/bower_components/paper-tabs/paper-tabs.html index 7939ef0e3..b3927e079 100644 --- a/dashboard-ui/bower_components/paper-tabs/paper-tabs.html +++ b/dashboard-ui/bower_components/paper-tabs/paper-tabs.html @@ -131,8 +131,10 @@ Custom property | Description | Default } paper-icon-button { - width: 24px; - padding: 16px; + width: 48px; + height: 48px; + padding: 12px; + margin: 0 4px; } #selectionBar { diff --git a/dashboard-ui/cordova/iap.js b/dashboard-ui/cordova/iap.js index 04c0a36ec..9cf9e0f5c 100644 --- a/dashboard-ui/cordova/iap.js +++ b/dashboard-ui/cordova/iap.js @@ -77,27 +77,38 @@ amt: price }; + var promise; + if (enteredEmail) { postData.email = enteredEmail; postData.storeId = enteredEmail; postData.feature = "MBSClubMonthly"; + + promise = ApiClient.ajax({ + type: "POST", + url: ApiClient.getUrl("Appstore/Register"), + data: { + Parameters: JSON.stringify(postData) + } + }); + + } else { + + promise = ApiClient.ajax({ + type: "POST", + url: "http://mb3admin.com/admin/service/appstore/register", + data: JSON.stringify(postData), + contentType: "application/json" + }); } - ApiClient.ajax({ - - type: "POST", - url: ApiClient.getUrl("Appstore/Register"), - data: { - Parameters: JSON.stringify(postData) - } - }).done(function () { + promise.done(function () { callback(true, product); }).fail(function (e) { if (e.status == 402) { - alert('validate fail - expired'); callback(false, { code: store.PURCHASE_EXPIRED, @@ -105,6 +116,7 @@ message: "Subscription Expired" } }); + } else { alert('validate fail - other'); @@ -155,7 +167,7 @@ if (requiresVerification) { //product.verify(); if (product.owned) { - alert('sub owned!'); + //alert('sub owned!'); } } else { product.finish(); diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 84a66dbcc..8a7cb6f56 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -1220,6 +1220,8 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { background: #43A047; z-index: 1000; padding: 0 .75em 0 .25em; + display: flex; + align-items: center; } .selectionCommandsPanel paper-icon-button { @@ -1235,11 +1237,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { padding-top: 1px; } -.selectionCommandsPanel paper-icon-button { - height: 32px; - width: 32px; -} - @media all and (min-height: 480px) { .alphabetPicker { diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index 7572db256..d6b4cbc63 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -1139,7 +1139,7 @@ html += ''; html += ''; - html += ''; + html += ''; selectionCommandsPanel.innerHTML = html; diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 4a228d474..1e7a45ae3 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -223,15 +223,20 @@ document.querySelector('.mainDrawerPanel #drawer').classList.add('verticalScrollingDrawer'); } - function onMainDrawerClosed() { - - document.body.classList.remove('bodyWithPopupOpen'); - document.querySelector('.mainDrawerPanel #drawer').classList.remove('verticalScrollingDrawer'); - } function closeMainDrawer() { document.querySelector('.mainDrawerPanel').closeDrawer(); } + function onMainDrawerSelect() { + + if (this.selected == 'main') { + + document.body.classList.remove('bodyWithPopupOpen'); + document.querySelector('.mainDrawerPanel #drawer').classList.remove('verticalScrollingDrawer'); + } else { + onMainDrawerOpened(); + } + } function ensureDrawerStructure(drawer) { @@ -994,8 +999,7 @@ }); var mainDrawerPanel = document.querySelector('.mainDrawerPanel'); - Events.on(mainDrawerPanel, 'paper-drawer-panel-open', onMainDrawerOpened); - Events.on(mainDrawerPanel, 'paper-drawer-panel-close', onMainDrawerClosed); + Events.on(mainDrawerPanel, 'iron-select', onMainDrawerSelect); }); })(window, document, jQuery, window.devicePixelRatio); diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html index ecb86c68a..dcb3971a4 100644 --- a/dashboard-ui/vulcanize-out.html +++ b/dashboard-ui/vulcanize-out.html @@ -16214,168 +16214,160 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN - - - + + }); + }()); + + @@ -17034,8 +17026,10 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] { } paper-icon-button { - width: 24px; - padding: 16px; + width: 48px; + height: 48px; + padding: 12px; + margin: 0 4px; } #selectionBar {